[SCM] live-helper branch, debian-next, updated. debian/2.0_a7-1-8-gcdcb627

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit cdcb627bd6b43920cf266eaff35b5033a9f8a694
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Feb 18 17:12:59 2010 +0100

    Adding usb-zip as a binary flavour, part 1.

diff --git a/helpers/binary b/helpers/binary
index b0f81ae..234d898 100755
--- a/helpers/binary
+++ b/helpers/binary
@@ -78,7 +78,7 @@ fi
 lh binary_iso ${*}
 lh binary_net ${*}
 lh binary_tar ${*}
-lh binary_usb-hdd ${*}
+lh binary_usb ${*}
 lh binary_virtual-hdd ${*}
 
 if [ "${LH_CHROOT_BUILD}" = "true" ]
diff --git a/helpers/binary_usb-hdd b/helpers/binary_usb
similarity index 96%
rename from helpers/binary_usb-hdd
rename to helpers/binary_usb
index 53d9e37..59aae15 100755
--- a/helpers/binary_usb-hdd
+++ b/helpers/binary_usb
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# lh_binary_usb-hdd(1) - build binary usb-hdd image
+# lh_binary_usb(1) - build binary usb image
 # Copyright (C) 2006-2009 Daniel Baumann <daniel at debian.org>
 #
 # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -28,13 +28,13 @@ then
 	exit 0
 fi
 
-Echo_message "Begin building binary usb-hdd image..."
+Echo_message "Begin building binary usb image..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc
 
 # Checking stage file
-Check_stagefile .stage/binary_usb-hdd
+Check_stagefile .stage/binary_usb
 
 # Checking lock file
 Check_lockfile .lock
@@ -277,4 +277,4 @@ Save_cache cache/packages_binary
 Remove_package
 
 # Creating stage file
-Create_stagefile .stage/binary_usb-hdd
+Create_stagefile .stage/binary_usb
diff --git a/helpers/source b/helpers/source
index 8d11c44..1783216 100755
--- a/helpers/source
+++ b/helpers/source
@@ -44,7 +44,7 @@ lh source_md5sum ${*}
 lh source_iso ${*}
 lh source_net ${*}
 lh source_tar ${*}
-lh source_usb-hdd ${*}
+lh source_usb ${*}
 lh source_virtual-hdd ${*}
 
 # Deconfiguring chroot
diff --git a/helpers/source_usb-hdd b/helpers/source_usb
similarity index 93%
rename from helpers/source_usb-hdd
rename to helpers/source_usb
index e8cd8ca..6065382 100755
--- a/helpers/source_usb-hdd
+++ b/helpers/source_usb
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# lh_source_usb-hdd(1) - build source usb-hdd image
+# lh_source_usb(1) - build source usb image
 # Copyright (C) 2006-2009 Daniel Baumann <daniel at debian.org>
 #
 # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -33,13 +33,13 @@ then
 	exit 0
 fi
 
-Echo_message "Begin building source usb-hdd image..."
+Echo_message "Begin building source usb image..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/source_debian
 
 # Checking stage file
-Check_stagefile .stage/source_usb-hdd
+Check_stagefile .stage/source_usb
 
 # Checking lock file
 Check_lockfile .lock
@@ -136,4 +136,4 @@ fi
 Remove_package
 
 # Creating stage file
-Create_stagefile .stage/source_usb-hdd
+Create_stagefile .stage/source_usb
diff --git a/manpages/lh_binary_usb-hdd.en.1 b/manpages/lh_binary_usb.en.1
similarity index 100%
rename from manpages/lh_binary_usb-hdd.en.1
rename to manpages/lh_binary_usb.en.1
diff --git a/manpages/lh_source_usb-hdd.en.1 b/manpages/lh_source_usb.en.1
similarity index 100%
rename from manpages/lh_source_usb-hdd.en.1
rename to manpages/lh_source_usb.en.1
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index 1ef64c9..dba08f1 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -189,7 +189,7 @@ installs silo into binary
 installs syslinux into binary
 .IP "\fBlh_binary_tar\fR(1)" 4
 build harddisk binary image
-.IP "\fBlh_binary_usb-hdd\fR(1)" 4
+.IP "\fBlh_binary_usb\fR(1)" 4
 build binary usb-hdd image
 .IP "\fBlh_binary_virtual-hdd\fR(1)" 4
 build binary virtual-hdd image
@@ -212,7 +212,7 @@ create source md5sum
 build source net image
 .IP "\fBlh_source_tar\fR(1)" 4
 build source tarball
-.IP "\fBlh_source_usb-hdd\fR(1)" 4
+.IP "\fBlh_source_usb\fR(1)" 4
 build source usb-hdd image
 .IP "\fBlh_source_virtual-hdd\fR(1)" 4
 build source virtual-hdd image
diff --git a/manpages/po4a/de/lh_binary_usb-hdd.en.1.po b/manpages/po4a/de/lh_binary_usb.en.1.po
similarity index 100%
rename from manpages/po4a/de/lh_binary_usb-hdd.en.1.po
rename to manpages/po4a/de/lh_binary_usb.en.1.po
diff --git a/manpages/po4a/de/lh_source_usb-hdd.en.1.po b/manpages/po4a/de/lh_source_usb.en.1.po
similarity index 100%
rename from manpages/po4a/de/lh_source_usb-hdd.en.1.po
rename to manpages/po4a/de/lh_source_usb.en.1.po
diff --git a/manpages/po4a/fr/lh_binary_usb-hdd.en.1.po b/manpages/po4a/fr/lh_binary_usb.en.1.po
similarity index 100%
rename from manpages/po4a/fr/lh_binary_usb-hdd.en.1.po
rename to manpages/po4a/fr/lh_binary_usb.en.1.po
diff --git a/manpages/po4a/fr/lh_source_usb-hdd.en.1.po b/manpages/po4a/fr/lh_source_usb.en.1.po
similarity index 100%
rename from manpages/po4a/fr/lh_source_usb-hdd.en.1.po
rename to manpages/po4a/fr/lh_source_usb.en.1.po
diff --git a/manpages/po4a/pot/lh_binary_usb-hdd.en.1.pot b/manpages/po4a/pot/lh_binary_usb.en.1.pot
similarity index 100%
rename from manpages/po4a/pot/lh_binary_usb-hdd.en.1.pot
rename to manpages/po4a/pot/lh_binary_usb.en.1.pot
diff --git a/manpages/po4a/pot/lh_source_usb-hdd.en.1.pot b/manpages/po4a/pot/lh_source_usb.en.1.pot
similarity index 100%
rename from manpages/po4a/pot/lh_source_usb-hdd.en.1.pot
rename to manpages/po4a/pot/lh_source_usb.en.1.pot

-- 
live-helper