Adding live-helper 1.0~a26-1.

30 files changed, 60 insertions, 29 deletions

diff --git a/Makefile b/Makefile
index 476fde2e4..aadcf7cf8 100644
--- a/Makefile
+++ b/Makefile
@@ -91,9 +91,9 @@ uninstall:
 update:
 	set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.de.* manpages/*.en.*; \
 	do \
-		sed -i	-e 's/2007\\-08\\-27/2007\\-09\\-03/' \
-			-e 's/27.08.2007/03.09.2007/' \
-			-e 's/1.0~a25/1.0~a26/' \
+		sed -i	-e 's/2007\\-09\\-03/2007\\-09\\-10/' \
+			-e 's/03.09.2007/10.09.2007/' \
+			-e 's/1.0~a26/1.0~a27/' \
 		$$FILE; \
 	done
 
diff --git a/debian/changelog b/debian/changelog
index 1a2f21098..50cef1be3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a26-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon,  3 Sep 2007 00:00:00 +0200
+
 live-helper (1.0~a25-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/docs/ChangeLog b/docs/ChangeLog
index b5805321c..951f1df67 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-04  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_syslinux, lh_config:
+	  - Applied fixes from Peter Holik <peter@holik.at>.
+	* helpers/lh_chroot_local-packages:
+	  - Added check for actual packages as mentioned by Peter Holik
+	  <peter@holik.at>.
+	* helpers/lh_bootstrap_cache:
+	  - Added forgotten creation of the stagefile as mentioned by
+	    Peter Holik <peter@holik.at>.
+
 2007-08-28  Daniel Baumann  <daniel@debian.org>
 
 	* functions/defaults.sh:
diff --git a/functions/common.sh b/functions/common.sh
index efd7922c6..90f883ea2 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
 set -e
 
 PROGRAM="`basename ${0}`"
-VERSION="1.0~a25"
+VERSION="1.0~a26"
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 1f77ce8ca..968d25081 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -381,7 +381,7 @@ case "${LH_BINARY_IMAGES}" in
 			if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
 			then
 				rm -f binary/isolinux/splash.rle
-				sed -e "s/.*splash.*//" binary/isolinux/boot.txt
+				sed -i -e "s/.*splash.*//" binary/isolinux/boot.txt
 			else
 				cp -f "${LH_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
 			fi
diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache
index e6c8dcc9f..8d811a92f 100755
--- a/helpers/lh_bootstrap_cache
+++ b/helpers/lh_bootstrap_cache
@@ -90,6 +90,9 @@ do
 				then
 					${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap
 				fi
+
+				# Creating stage file
+				Create_stagefile .stage/bootstrap_cache.save
 			fi
 			;;
 	esac
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 1a084d519..96565a2fb 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -53,8 +53,15 @@ then
 	Restore_cache cache/packages_local-packages
 
 	# Copying packages
-	cp config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root
-	cp config/chroot_local-packages/*_all.deb chroot/root
+	if ls config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
+	then
+		cp config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root
+	fi
+
+	if ls config/chroot_local-packages/*_all.deb > /dev/null 2>&1
+	then
+		cp config/chroot_local-packages/*_all.deb chroot/root
+	fi
 
 	# Installing packages
         Chroot "find /root -name *.deb" > chroot/root/local-packages
diff --git a/helpers/lh_config b/helpers/lh_config
index 1f551f7dc..43633a066 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -899,6 +899,10 @@ LH_NET_SERVER="${LH_NET_SERVER}"
 # (Default: empty)
 LH_SYSLINUX_SPLASH="${LH_SYSLINUX_SPLASH}"
 
+# \$LH_SYSLINUX_TIMEOUT: set custom syslinux timeout
+# (Default: 0)
+LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT}"
+
 # \$LH_USERNAME: set username
 # (Default: ${LH_USERNAME})
 LH_USERNAME="${LH_USERNAME}"
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index feea3cb44..539dcec50 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_BINARY 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1
index d47e8e701..87daab4b6 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_BINARY 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_binary \- meta\-helper for lh_binary_*
diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1
index 5608c6b93..f7214b721 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_BOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1
index e6ed3c811..13df890f7 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- meta\-helper for lh_bootstrap_*
diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1
index 4413b008b..6981f7688 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1
index d85d4d0b5..ee8b2e0a1 100644
--- a/manpages/lh_bootstrap_cdebootstrap.en.1
+++ b/manpages/lh_bootstrap_cdebootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1
index f99caa4cb..401f6b3d7 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1
index bb7f88b43..aa1a488b5 100644
--- a/manpages/lh_bootstrap_debootstrap.en.1
+++ b/manpages/lh_bootstrap_debootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1
index 218734b98..431766232 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_BUILD 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_build \- erstellen eines Live-Systemes
diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1
index a226e6b90..1415fff18 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_BUILD 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_build \- building a live system
diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1
index d9e643402..7280156e6 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_CHROOT 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1
index 282ab84b5..6c4f457eb 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_CHROOT 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_chroot \- meta\-helper for lh_chroot_*
diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1
index 16c279ab0..0b862577a 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_CLEAN 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_clean \- r\[:a]umt das Build-Verzeichnis auf
diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1
index 09c2bdc31..121a6ddac 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_CLEAN 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_clean \- clean up system build directories
diff --git a/manpages/lh_config.de.1 b/manpages/lh_config.de.1
index b1d3a31ae..bfe9a40ee 100644
--- a/manpages/lh_config.de.1
+++ b/manpages/lh_config.de.1
@@ -1,4 +1,4 @@
-.TH LH_CONFIG 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_CONFIG 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_config \- erstellt live-helper(7) Konfiguration
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index fd5665255..95e76329d 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -1,4 +1,4 @@
-.TH LH_CONFIG 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_CONFIG 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_config \- create configuration for live-helper(7)
diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1
index c65721d4e..a5d5d3060 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_SOURCE 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_source \- Meta\-Helper f\[:u]r lh_source_*
diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1
index 2f2d86fc5..f6b61ecfd 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_SOURCE 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_source \- meta\-helper for lh_source_*
diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1
index 0e38567f5..ca994998c 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LH_TESTROOT 1 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_testroot \- stellt sicher dass das System als root gebaut wird
diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1
index 6899c4933..f1776e881 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 lh_testroot \- ensure that a system is built as root
diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7
index 1e3ddfdc5..303d5e472 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "27.08.2007" "1.0~a25" "live\-helper"
+.TH LIVE\-HELPER 7 "03.09.2007" "1.0~a26" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live Helper-Programme
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index a92628757..313104ea7 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-08\-27" "1.0~a25" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-09\-03" "1.0~a26" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live helper programs