tag 561712 + pending thanks Dear maintainer, I've prepared an NMU for live-magic (versioned as 1.7+nmu1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. http://info.comodo.priv.at/ -- GPG Key IDs: 0x00F3CFE4, 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Rod Steward: Maggie May
diff -Nru live-magic-1.7/DebianLive/__init__.py live-magic-1.7+nmu1/DebianLive/__init__.py
--- live-magic-1.7/DebianLive/__init__.py 2009-07-08 23:20:06.000000000 +0200
+++ live-magic-1.7+nmu1/DebianLive/__init__.py 2010-02-01 00:20:58.000000000 +0100
@@ -40,7 +40,7 @@
options = ["--%s='%s'" % (k.replace('_', '-'), v)
for k, v in kwargs.iteritems()]
- cmd = 'cd "%s"; lh_config --ignore-system-defaults %s' % (os.path.abspath(self.dir),
+ cmd = 'cd "%s"; lh config --ignore-system-defaults %s' % (os.path.abspath(self.dir),
' '.join(options))
result, out = commands.getstatusoutput(cmd)
diff -Nru live-magic-1.7/LiveMagic/controllers/build.py live-magic-1.7+nmu1/LiveMagic/controllers/build.py
--- live-magic-1.7/LiveMagic/controllers/build.py 2009-07-09 01:24:04.000000000 +0200
+++ live-magic-1.7+nmu1/LiveMagic/controllers/build.py 2010-02-01 00:20:58.000000000 +0100
@@ -100,7 +100,7 @@
def ok_clean():
set_cleaning_status()
- _exec('lh_clean --chroot --stage --source --cache',
+ _exec('lh clean --chroot --stage --source --cache',
'rm -rf config/ binary/ tftpboot/',
'chown -R %d:%d .' % (self.uid, self.gid))
return OK
@@ -112,7 +112,7 @@
def failed_clean():
set_cleaning_status()
- _exec('lh_clean --purge', 'rm -rvf config/',
+ _exec('lh clean --purge', 'rm -rvf config/',
'chown -R %d:%d .' % (self.uid, self.gid))
return FAILED
@@ -123,7 +123,7 @@
def cancelled_clean():
set_cleaning_status()
- _exec('lh_clean --purge', 'rm -rvf $(pwd)')
+ _exec('lh clean --purge', 'rm -rvf $(pwd)')
return CANCELLED
if self.state == BUILDING:
diff -Nru live-magic-1.7/debian/changelog live-magic-1.7+nmu1/debian/changelog
--- live-magic-1.7/debian/changelog 2009-07-09 01:55:37.000000000 +0200
+++ live-magic-1.7+nmu1/debian/changelog 2010-02-01 00:25:22.000000000 +0100
@@ -1,3 +1,12 @@
+live-magic (1.7+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "helpers now installed in /usr/share/live-helper/helpers and not
+ /usr/bin" by calling "lh $command" instead of "lh_$command"; patch from
+ Daniel Baumann (closes: #561712).
+
+ -- gregor herrmann <gregoa@debian.org> Mon, 01 Feb 2010 00:25:18 +0100
+
live-magic (1.7) unstable; urgency=low
* Only delete build directory if we created it. This is not only safer, but
diff -Nru live-magic-1.7/misc/live-magic-builder live-magic-1.7+nmu1/misc/live-magic-builder
--- live-magic-1.7/misc/live-magic-builder 2009-07-09 01:16:46.000000000 +0200
+++ live-magic-1.7+nmu1/misc/live-magic-builder 2010-02-01 00:20:58.000000000 +0100
@@ -36,7 +36,7 @@
}
Clean () {
- lh_clean --purge | tee -a ${LOG}
+ lh clean --purge | tee -a ${LOG}
}
Save_config () {
@@ -53,10 +53,10 @@
Clean
Save_config
Set_status building
-Echo_verbose "lh_build starting in $(pwd)"
+Echo_verbose "lh build starting in $(pwd)"
Echo_line
-lh_build 2>&1 | tee -a ${LOG}
+lh build 2>&1 | tee -a ${LOG}
Echo_line
-Echo_verbose "lh_build returned successfully"
+Echo_verbose "lh build returned successfully"
Set_status ok
exit 0
Attachment:
signature.asc
Description: Digital signature