[Debian-live-changes] r1731 - dists/sid dists/sid/live-helper dists/sid/live-helper/debian dists/sid/live-helper/docs dists/sid/live-helper/examples/cron dists/sid/live-helper/functions dists/sid/live-helper/helpers dists/sid/live-helper/manpages releases/live-helper releases/live-helper/1.0~a11-1 releases/live-helper/1.0~a11-1/debian releases/live-helper/1.0~a11-1/docs releases/live-helper/1.0~a11-1/examples/cron releases/live-helper/1.0~a11-1/functions releases/live-helper/1.0~a11-1/helpers releases/live-helper/1.0~a11-1/manpages

daniel at alioth.debian.org daniel at alioth.debian.org
Thu May 24 21:52:20 UTC 2007


Author: daniel
Date: 2007-05-24 21:52:20 +0000 (Thu, 24 May 2007)
New Revision: 1731

Added:
   dists/sid/live-helper/
   dists/sid/live-helper/Makefile
   dists/sid/live-helper/debian/changelog
   dists/sid/live-helper/debian/changelog.live-package
   dists/sid/live-helper/debian/rules
   dists/sid/live-helper/docs/ChangeLog
   dists/sid/live-helper/docs/ChangeLog.live-package
   dists/sid/live-helper/docs/NEWS
   dists/sid/live-helper/docs/TODO
   dists/sid/live-helper/examples/cron/daily.sh
   dists/sid/live-helper/examples/cron/etch+beryl.sh
   dists/sid/live-helper/examples/cron/etch.sh
   dists/sid/live-helper/examples/cron/weekly.sh
   dists/sid/live-helper/functions/common.sh
   dists/sid/live-helper/helpers/lh_binary_debian-installer
   dists/sid/live-helper/helpers/lh_binary_grub
   dists/sid/live-helper/helpers/lh_binary_includes
   dists/sid/live-helper/helpers/lh_binary_linux-image
   dists/sid/live-helper/helpers/lh_binary_memtest
   dists/sid/live-helper/helpers/lh_binary_syslinux
   dists/sid/live-helper/helpers/lh_binary_yaboot
   dists/sid/live-helper/helpers/make-live
   dists/sid/live-helper/manpages/lh_binary.de.1
   dists/sid/live-helper/manpages/lh_binary.en.1
   dists/sid/live-helper/manpages/lh_bootstrap.de.1
   dists/sid/live-helper/manpages/lh_bootstrap.en.1
   dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1
   dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1
   dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.de.1
   dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.en.1
   dists/sid/live-helper/manpages/lh_build.de.1
   dists/sid/live-helper/manpages/lh_build.en.1
   dists/sid/live-helper/manpages/lh_chroot.de.1
   dists/sid/live-helper/manpages/lh_chroot.en.1
   dists/sid/live-helper/manpages/lh_clean.de.1
   dists/sid/live-helper/manpages/lh_clean.en.1
   dists/sid/live-helper/manpages/lh_source.de.1
   dists/sid/live-helper/manpages/lh_source.en.1
   dists/sid/live-helper/manpages/lh_testroot.de.1
   dists/sid/live-helper/manpages/lh_testroot.en.1
   dists/sid/live-helper/manpages/live-helper.de.7
   dists/sid/live-helper/manpages/live-helper.en.7
   dists/sid/live-helper/manpages/make-live.de.1
   dists/sid/live-helper/manpages/make-live.en.1
   releases/live-helper/1.0~a11-1/
   releases/live-helper/1.0~a11-1/Makefile
   releases/live-helper/1.0~a11-1/debian/changelog
   releases/live-helper/1.0~a11-1/debian/changelog.live-package
   releases/live-helper/1.0~a11-1/debian/rules
   releases/live-helper/1.0~a11-1/docs/ChangeLog
   releases/live-helper/1.0~a11-1/docs/ChangeLog.live-package
   releases/live-helper/1.0~a11-1/docs/NEWS
   releases/live-helper/1.0~a11-1/docs/TODO
   releases/live-helper/1.0~a11-1/examples/cron/daily.sh
   releases/live-helper/1.0~a11-1/examples/cron/etch+beryl.sh
   releases/live-helper/1.0~a11-1/examples/cron/etch.sh
   releases/live-helper/1.0~a11-1/examples/cron/weekly.sh
   releases/live-helper/1.0~a11-1/functions/common.sh
   releases/live-helper/1.0~a11-1/helpers/lh_binary_debian-installer
   releases/live-helper/1.0~a11-1/helpers/lh_binary_grub
   releases/live-helper/1.0~a11-1/helpers/lh_binary_includes
   releases/live-helper/1.0~a11-1/helpers/lh_binary_linux-image
   releases/live-helper/1.0~a11-1/helpers/lh_binary_memtest
   releases/live-helper/1.0~a11-1/helpers/lh_binary_syslinux
   releases/live-helper/1.0~a11-1/helpers/lh_binary_yaboot
   releases/live-helper/1.0~a11-1/helpers/make-live
   releases/live-helper/1.0~a11-1/manpages/lh_binary.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_binary.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_build.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_build.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_chroot.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_chroot.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_clean.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_clean.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_source.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_source.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_testroot.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_testroot.en.1
   releases/live-helper/1.0~a11-1/manpages/live-helper.de.7
   releases/live-helper/1.0~a11-1/manpages/live-helper.en.7
   releases/live-helper/1.0~a11-1/manpages/make-live.de.1
   releases/live-helper/1.0~a11-1/manpages/make-live.en.1
Removed:
   dists/sid/live-helper/Makefile
   dists/sid/live-helper/debian/changelog
   dists/sid/live-helper/debian/changelog.old
   dists/sid/live-helper/debian/rules
   dists/sid/live-helper/docs/ChangeLog
   dists/sid/live-helper/docs/ChangeLog.old
   dists/sid/live-helper/docs/NEWS
   dists/sid/live-helper/docs/TODO
   dists/sid/live-helper/examples/cron/daily.sh
   dists/sid/live-helper/examples/cron/etch+beryl.sh
   dists/sid/live-helper/examples/cron/etch.sh
   dists/sid/live-helper/examples/cron/weekly.sh
   dists/sid/live-helper/functions/common.sh
   dists/sid/live-helper/helpers/lh_binary_debian-installer
   dists/sid/live-helper/helpers/lh_binary_grub
   dists/sid/live-helper/helpers/lh_binary_includes
   dists/sid/live-helper/helpers/lh_binary_linux-image
   dists/sid/live-helper/helpers/lh_binary_memtest
   dists/sid/live-helper/helpers/lh_binary_syslinux
   dists/sid/live-helper/helpers/lh_binary_yaboot
   dists/sid/live-helper/helpers/make-live
   dists/sid/live-helper/manpages/lh_binary.de.1
   dists/sid/live-helper/manpages/lh_binary.en.1
   dists/sid/live-helper/manpages/lh_bootstrap.de.1
   dists/sid/live-helper/manpages/lh_bootstrap.en.1
   dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1
   dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1
   dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.de.1
   dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.en.1
   dists/sid/live-helper/manpages/lh_build.de.1
   dists/sid/live-helper/manpages/lh_build.en.1
   dists/sid/live-helper/manpages/lh_chroot.de.1
   dists/sid/live-helper/manpages/lh_chroot.en.1
   dists/sid/live-helper/manpages/lh_clean.de.1
   dists/sid/live-helper/manpages/lh_clean.en.1
   dists/sid/live-helper/manpages/lh_source.de.1
   dists/sid/live-helper/manpages/lh_source.en.1
   dists/sid/live-helper/manpages/lh_testroot.de.1
   dists/sid/live-helper/manpages/lh_testroot.en.1
   dists/sid/live-helper/manpages/live-helper.de.7
   dists/sid/live-helper/manpages/live-helper.en.7
   dists/sid/live-helper/manpages/make-live.de.1
   dists/sid/live-helper/manpages/make-live.en.1
   releases/live-helper/1.0~a11-1/Makefile
   releases/live-helper/1.0~a11-1/debian/changelog
   releases/live-helper/1.0~a11-1/debian/changelog.old
   releases/live-helper/1.0~a11-1/debian/rules
   releases/live-helper/1.0~a11-1/docs/ChangeLog
   releases/live-helper/1.0~a11-1/docs/ChangeLog.old
   releases/live-helper/1.0~a11-1/docs/NEWS
   releases/live-helper/1.0~a11-1/docs/TODO
   releases/live-helper/1.0~a11-1/examples/cron/daily.sh
   releases/live-helper/1.0~a11-1/examples/cron/etch+beryl.sh
   releases/live-helper/1.0~a11-1/examples/cron/etch.sh
   releases/live-helper/1.0~a11-1/examples/cron/weekly.sh
   releases/live-helper/1.0~a11-1/functions/common.sh
   releases/live-helper/1.0~a11-1/helpers/lh_binary_debian-installer
   releases/live-helper/1.0~a11-1/helpers/lh_binary_grub
   releases/live-helper/1.0~a11-1/helpers/lh_binary_includes
   releases/live-helper/1.0~a11-1/helpers/lh_binary_linux-image
   releases/live-helper/1.0~a11-1/helpers/lh_binary_memtest
   releases/live-helper/1.0~a11-1/helpers/lh_binary_syslinux
   releases/live-helper/1.0~a11-1/helpers/lh_binary_yaboot
   releases/live-helper/1.0~a11-1/helpers/make-live
   releases/live-helper/1.0~a11-1/manpages/lh_binary.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_binary.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_build.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_build.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_chroot.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_chroot.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_clean.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_clean.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_source.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_source.en.1
   releases/live-helper/1.0~a11-1/manpages/lh_testroot.de.1
   releases/live-helper/1.0~a11-1/manpages/lh_testroot.en.1
   releases/live-helper/1.0~a11-1/manpages/live-helper.de.7
   releases/live-helper/1.0~a11-1/manpages/live-helper.en.7
   releases/live-helper/1.0~a11-1/manpages/make-live.de.1
   releases/live-helper/1.0~a11-1/manpages/make-live.en.1
Log:


Copied: dists/sid/live-helper (from rev 1670, dists/trunk/live-helper)

Deleted: dists/sid/live-helper/Makefile
===================================================================
--- dists/trunk/live-helper/Makefile	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/Makefile	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,106 +0,0 @@
-# Makefile
-
-TRANSLATIONS="de"
-
-all: build
-
-test:
-	set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \
-	do \
-		sh -n $$SCRIPT; \
-	done
-
-build:
-	@echo "Nothing to build."
-
-install: test
-	# Installing executables
-	mkdir -p $(DESTDIR)/usr/bin
-	cp helpers/lh_* helpers/make-live $(DESTDIR)/usr/bin
-
-	# Installing shared data
-	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
-
-	# Installing documentation
-	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
-	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-helper
-
-	# Installing manpages
-	set -e; for MANPAGE in manpages/*.en.1; \
-	do \
-		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
-	done
-
-	set -e; for MANPAGE in manpages/*.en.7; \
-	do \
-		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
-	done
-
-	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
-	do \
-		for MANPAGE in manpages/*.$$TRANSLATION.1; \
-		do \
-			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
-		done; \
-		for MANPAGE in manpages/*.$$TRANSLATION.7; \
-		do \
-			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .$$TRANSLATION.7`.7; \
-		done; \
-	done
-
-uninstall:
-	# Uninstalling executables
-	for HELPER in helpers/*; \
-	do \
-		rm -f $(DESTDIR)/usr/bin/`basename $$HELPER`; \
-	done
-
-	# Uninstalling shared data
-	rm -rf $(DESTDIR)/usr/share/live-helper
-
-	# Uninstalling documentation
-	rm -rf $(DESTDIR)/usr/share/doc/live-helper
-
-	# Uninstalling manpages
-	set -e; for MANPAGE in manpages/*.en.1; \
-	do \
-		rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
-	done
-
-	set -e; for MANPAGE in manpages/*.en.7; \
-	do \
-		rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
-	done
-
-	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
-	do \
-		for MANPAGE in manpages/*.$$TRANSLATION.1; \
-		do \
-			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
-		done; \
-		for MANPAGE in manpages/*.$$TRANSLATION.7; \
-		do \
-			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .de.7`.7; \
-		done; \
-	done
-
-update:
-	set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
-	do \
-		sed -i	-e 's/2007\\-05\\-07/2007\\-05\\-14/' \
-			-e 's/07.05.2007/14.05.2007/' \
-			-e 's/1.0~a9/1.0~a10/' \
-		$$MANPAGE; \
-	done
-
-	sed -i -e 's/1.0~a9/1.0~a10/' functions/common.sh
-
-	sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch.sh
-	sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch+beryl.sh
-
-clean:
-
-distclean:
-
-reinstall: uninstall install

Copied: dists/sid/live-helper/Makefile (from rev 1679, dists/trunk/live-helper/Makefile)
===================================================================
--- dists/sid/live-helper/Makefile	                        (rev 0)
+++ dists/sid/live-helper/Makefile	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,106 @@
+# Makefile
+
+TRANSLATIONS="de"
+
+all: build
+
+test:
+	set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \
+	do \
+		sh -n $$SCRIPT; \
+	done
+
+build:
+	@echo "Nothing to build."
+
+install: test
+	# Installing executables
+	mkdir -p $(DESTDIR)/usr/bin
+	cp helpers/lh_* helpers/make-live $(DESTDIR)/usr/bin
+
+	# Installing shared data
+	mkdir -p $(DESTDIR)/usr/share/live-helper
+	cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
+
+	# Installing documentation
+	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
+	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-helper
+
+	# Installing manpages
+	set -e; for MANPAGE in manpages/*.en.1; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
+	done
+
+	set -e; for MANPAGE in manpages/*.en.7; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
+	done
+
+	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
+	do \
+		for MANPAGE in manpages/*.$$TRANSLATION.1; \
+		do \
+			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
+		done; \
+		for MANPAGE in manpages/*.$$TRANSLATION.7; \
+		do \
+			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .$$TRANSLATION.7`.7; \
+		done; \
+	done
+
+uninstall:
+	# Uninstalling executables
+	for HELPER in helpers/*; \
+	do \
+		rm -f $(DESTDIR)/usr/bin/`basename $$HELPER`; \
+	done
+
+	# Uninstalling shared data
+	rm -rf $(DESTDIR)/usr/share/live-helper
+
+	# Uninstalling documentation
+	rm -rf $(DESTDIR)/usr/share/doc/live-helper
+
+	# Uninstalling manpages
+	set -e; for MANPAGE in manpages/*.en.1; \
+	do \
+		rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
+	done
+
+	set -e; for MANPAGE in manpages/*.en.7; \
+	do \
+		rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
+	done
+
+	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
+	do \
+		for MANPAGE in manpages/*.$$TRANSLATION.1; \
+		do \
+			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
+		done; \
+		for MANPAGE in manpages/*.$$TRANSLATION.7; \
+		do \
+			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .de.7`.7; \
+		done; \
+	done
+
+update:
+	set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
+	do \
+		sed -i	-e 's/2007\\-05\\-14/2007\\-05\\-21/' \
+			-e 's/14.05.2007/21.05.2007/' \
+			-e 's/1.0~a10/1.0~a11/' \
+		$$MANPAGE; \
+	done
+
+	sed -i -e 's/1.0~a10/1.0~a11/' functions/common.sh
+
+	sed -i -e 's/1.0~a10/1.0~a11/' examples/cron/etch.sh
+	sed -i -e 's/1.0~a10/1.0~a11/' examples/cron/etch+beryl.sh
+
+clean:
+
+distclean:
+
+reinstall: uninstall install

Deleted: dists/sid/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/debian/changelog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,83 +0,0 @@
-live-helper (1.0~a10-1) unstable; urgency=medium
-
-  * New upstream release:
-    - really removed forgotten set -x in the cron (Closes: #421105).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 14 May 2007 00:00:00 +0200
-
-live-helper (1.0~a9-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  7 May 2007 00:00:00 +0200
-
-live-helper (1.0~a8-1) unstable; urgency=medium
-
-  * New upstream release:
-    - updated syslinux templates (Closes: #399658).
-    - removed forgotten set -x in the cron (Closes: #421105).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 30 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a7-1) unstable; urgency=medium
-
-  * New upstream release:
-    - make-live unmounts proc and sys on exit and failures
-      (Closes: #394334, #410147).
-    - supporting sudo (Closes: #387069).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 23 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a6-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 16 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a5-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  9 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  2 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a3-2) unstable; urgency=low
-
-  * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 17:00:00 +0200
-
-live-helper (1.0~a3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 00:00:00 +0100
-
-live-helper (1.0~a2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 19 Mar 2007 00:00:00 +0100
-
-live-helper (1.0~a1-3) unstable; urgency=low
-
-  * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 21:00:00 +0100
-
-live-helper (1.0~a1-2) unstable; urgency=low
-
-  * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 18:00:00 +0100
-
-live-helper (1.0~a1-1) unstable; urgency=low
-
-  * Initial release, replacing live-package.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 12 Mar 2007 00:00:00 +0100

Copied: dists/sid/live-helper/debian/changelog (from rev 1728, dists/trunk/live-helper/debian/changelog)
===================================================================
--- dists/sid/live-helper/debian/changelog	                        (rev 0)
+++ dists/sid/live-helper/debian/changelog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,89 @@
+live-helper (1.0~a11-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 21 May 2007 00:00:00 +0200
+
+live-helper (1.0~a10-1) unstable; urgency=medium
+
+  * New upstream release:
+    - really removed forgotten set -x in the cron (Closes: #421105).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 14 May 2007 00:00:00 +0200
+
+live-helper (1.0~a9-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  7 May 2007 00:00:00 +0200
+
+live-helper (1.0~a8-1) unstable; urgency=medium
+
+  * New upstream release:
+    - updated syslinux templates (Closes: #399658).
+    - removed forgotten set -x in the cron (Closes: #421105).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 30 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a7-1) unstable; urgency=medium
+
+  * New upstream release:
+    - make-live unmounts proc and sys on exit and failures
+      (Closes: #394334, #410147).
+    - supporting sudo (Closes: #387069).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 23 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 16 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  9 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  2 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a3-2) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 17:00:00 +0200
+
+live-helper (1.0~a3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 00:00:00 +0100
+
+live-helper (1.0~a2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 19 Mar 2007 00:00:00 +0100
+
+live-helper (1.0~a1-3) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 21:00:00 +0100
+
+live-helper (1.0~a1-2) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 18:00:00 +0100
+
+live-helper (1.0~a1-1) unstable; urgency=low
+
+  * Initial release, replacing live-package.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 12 Mar 2007 00:00:00 +0100

Copied: dists/sid/live-helper/debian/changelog.live-package (from rev 1689, dists/trunk/live-helper/debian/changelog.live-package)
===================================================================
--- dists/sid/live-helper/debian/changelog.live-package	                        (rev 0)
+++ dists/sid/live-helper/debian/changelog.live-package	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,208 @@
+live-package (0.99.26-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 12:27:00 +0100
+
+live-package (0.99.25-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 01:49:00 +0100
+
+live-package (0.99.24-1) unstable; urgency=low
+
+  * New upstream release:
+    - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
+      Mathieu Geli <mathieu.geli at gmail.com> (Closes: #412325).
+
+ -- Daniel Baumann <daniel at debian.org>  Sun,  3 Mar 2007 12:25:00 +0100
+
+live-package (0.99.23-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 21 Feb 2007 22:08:00 +0100
+
+live-package (0.99.22-1) unstable; urgency=low
+
+  * New upstream release:
+    - updates manpage (Closes: #411008).
+
+ -- Daniel Baumann <daniel at debian.org>  Fri, 16 Feb 2007 20:38:00 +0100
+
+live-package (0.99.21-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 12 Feb 2007 15:06:00 +0100
+
+live-package (0.99.20-1) unstable; urgency=low
+
+  * New upstream release:
+    - Fixed manual pruning in minimal flavour as suggested by
+      Bas Wijnen <wijnen at debian.org> (Closes: #410040).
+
+ -- Daniel Baumann <daniel at debian.org>  Thu,  1 Feb 2007 17:35:00 +0100
+
+live-package (0.99.19-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 31 Jan 2007 12:38:00 +0100
+
+live-package (0.99.18-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Thu, 25 Jan 2007 08:29:00 +0100
+
+live-package (0.99.17-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 24 Jan 2007 22:18:00 +0100
+
+live-package (0.99.16-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Thu, 18 Jan 2007 16:25:00 +0100
+
+live-package (0.99.15-1) unstable; urgency=low
+
+  * New upstream release:
+    - switched default distribution back to unstable, as unstable is usable
+      again from the kernel point of view (Closes: #400457).
+    - added file to the minimal package list (Closes: #400485).
+
+ -- Daniel Baumann <daniel at debian.org>  Tue, 16 Jan 2007 21:24:00 +0100
+
+live-package (0.99.14-3) unstable; urgency=high
+
+  * Adding workaround for new xorg packages by including xserver-xorg-input-all
+    and xserver-xorg-video-all in all X11 package lists. See #405639 for more
+    information.
+  * Adding xdebconfigurator to all X11 package lists.
+
+ -- Daniel Baumann <daniel at debian.org>  Fri,  5 Jan 2007 22:34:00 +0100
+
+live-package (0.99.14-2) unstable; urgency=high
+
+  * Adding workaround for initrd backup files (Closes: #404314).
+
+ -- Daniel Baumann <daniel at debian.org>  Thu,  4 Jan 2007 20:52:00 +0100
+
+live-package (0.99.14-1) unstable; urgency=medium
+
+  * New upstream release:
+    - fixed typo for policy-rc.d hack (Closes: #396813), thanks to
+      Markus Bauer <bauer-markus at web.de>.
+    - corrected manpage section (Closes: #396083), thanks to
+      Sune Vuorela <reportbug at pusling.com>.
+    - fixes script sourcing to exclude files in .svn (Closes: #396861),
+      thanks to Markus Bauer <bauer-markus at web.de>.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  6 Nov 2006 00:00:00 +0200
+
+live-package (0.99.13-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 30 Oct 2006 00:00:00 +0200
+
+live-package (0.99.12-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation
+      (Closes: #394226).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 23 Oct 2006 00:00:00 +0200
+
+live-package (0.99.11-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 16 Oct 2006 00:00:00 +0200
+
+live-package (0.99.10-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  9 Oct 2006 00:00:00 +0200
+
+live-package (0.99.9-1) unstable; urgency=medium
+
+  * New upstream release:
+    - adds support for custom repositories (Closes: #387068).
+    - using proxy for chroot creating too (Closes: #390378).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  2 Oct 2006 00:00:00 +0200
+
+live-package (0.99.8-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 25 Sep 2006 00:00:00 +0200
+
+live-package (0.99.7-1) unstable; urgency=medium
+
+  * New upstream release:
+    - removes the now outdated handling of testing specific kernels
+      (Closes: #387562).
+    - added fix from Bas Wijnen <wijnen at debian.org> for space handling in
+      arguments (Closes: #388204).
+    - fixes package list handling similar to the fix suggested by Alex Owen
+      <r.alex.owen at gmail.com> (Closes: #388060).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 18 Sep 2006 00:00:00 +0200
+
+live-package (0.99.6-1) unstable; urgency=medium
+
+  * New upstream release:
+    - fixing netboot.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 11 Sep 2006 00:00:00 +0200
+
+live-package (0.99.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Set maintainer to the project list.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  4 Sep 2006 00:00:00 +0200
+
+live-package (0.99.4-1) unstable; urgency=low
+
+  * New upstream release:
+    - Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update pxelinux.cfg
+      for NFS root in casper (Closes: #380512).
+    - Temporarily hacks xorg configuration file to remove BusID and set
+      default driver to vesa (Closes: #382391).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 28 Aug 2006 00:00:00 +0200
+
+live-package (0.99.3-1) unstable; urgency=low
+
+  * New upstream release:
+    - fixed configuration file handling (Closes: #384598).
+  * Update long descriptiong (Closes: #382473).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 21 Aug 2006 00:00:00 +0200
+
+live-package (0.99.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 31 Jul 2006 00:00:00 +0200
+
+live-package (0.99.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 24 Jul 2006 00:00:00 +0200
+
+live-package (0.99-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 17 Jul 2006 00:00:00 +0200

Deleted: dists/sid/live-helper/debian/changelog.old
===================================================================
--- dists/trunk/live-helper/debian/changelog.old	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/debian/changelog.old	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,208 +0,0 @@
-live-package (0.99.26-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 12:27:00 +0100
-
-live-package (0.99.25-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 01:49:00 +0100
-
-live-package (0.99.24-1) unstable; urgency=low
-
-  * New upstream release:
-    - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
-      Mathieu Geli <mathieu.geli at gmail.com> (Closes: #412325).
-
- -- Daniel Baumann <daniel at debian.org>  Sun,  3 Mar 2007 12:25:00 +0100
-
-live-package (0.99.23-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 21 Feb 2007 22:08:00 +0100
-
-live-package (0.99.22-1) unstable; urgency=low
-
-  * New upstream release:
-    - updates manpage (Closes: #411008).
-
- -- Daniel Baumann <daniel at debian.org>  Fri, 16 Feb 2007 20:38:00 +0100
-
-live-package (0.99.21-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 12 Feb 2007 15:06:00 +0100
-
-live-package (0.99.20-1) unstable; urgency=low
-
-  * New upstream release:
-    - Fixed manual pruning in minimal flavour as suggested by
-      Bas Wijnen <wijnen at debian.org> (Closes: #410040).
-
- -- Daniel Baumann <daniel at debian.org>  Thu,  1 Feb 2007 17:35:00 +0100
-
-live-package (0.99.19-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 31 Jan 2007 12:38:00 +0100
-
-live-package (0.99.18-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Thu, 25 Jan 2007 08:29:00 +0100
-
-live-package (0.99.17-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 24 Jan 2007 22:18:00 +0100
-
-live-package (0.99.16-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Thu, 18 Jan 2007 16:25:00 +0100
-
-live-package (0.99.15-1) unstable; urgency=low
-
-  * New upstream release:
-    - switched default distribution back to unstable, as unstable is usable
-      again from the kernel point of view (Closes: #400457).
-    - added file to the minimal package list (Closes: #400485).
-
- -- Daniel Baumann <daniel at debian.org>  Tue, 16 Jan 2007 21:24:00 +0100
-
-live-package (0.99.14-3) unstable; urgency=high
-
-  * Adding workaround for new xorg packages by including xserver-xorg-input-all
-    and xserver-xorg-video-all in all X11 package lists. See #405639 for more
-    information.
-  * Adding xdebconfigurator to all X11 package lists.
-
- -- Daniel Baumann <daniel at debian.org>  Fri,  5 Jan 2007 22:34:00 +0100
-
-live-package (0.99.14-2) unstable; urgency=high
-
-  * Adding workaround for initrd backup files (Closes: #404314).
-
- -- Daniel Baumann <daniel at debian.org>  Thu,  4 Jan 2007 20:52:00 +0100
-
-live-package (0.99.14-1) unstable; urgency=medium
-
-  * New upstream release:
-    - fixed typo for policy-rc.d hack (Closes: #396813), thanks to
-      Markus Bauer <bauer-markus at web.de>.
-    - corrected manpage section (Closes: #396083), thanks to
-      Sune Vuorela <reportbug at pusling.com>.
-    - fixes script sourcing to exclude files in .svn (Closes: #396861),
-      thanks to Markus Bauer <bauer-markus at web.de>.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  6 Nov 2006 00:00:00 +0200
-
-live-package (0.99.13-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 30 Oct 2006 00:00:00 +0200
-
-live-package (0.99.12-1) unstable; urgency=medium
-
-  * New upstream release.
-    - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation
-      (Closes: #394226).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 23 Oct 2006 00:00:00 +0200
-
-live-package (0.99.11-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 16 Oct 2006 00:00:00 +0200
-
-live-package (0.99.10-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  9 Oct 2006 00:00:00 +0200
-
-live-package (0.99.9-1) unstable; urgency=medium
-
-  * New upstream release:
-    - adds support for custom repositories (Closes: #387068).
-    - using proxy for chroot creating too (Closes: #390378).
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  2 Oct 2006 00:00:00 +0200
-
-live-package (0.99.8-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 25 Sep 2006 00:00:00 +0200
-
-live-package (0.99.7-1) unstable; urgency=medium
-
-  * New upstream release:
-    - removes the now outdated handling of testing specific kernels
-      (Closes: #387562).
-    - added fix from Bas Wijnen <wijnen at debian.org> for space handling in
-      arguments (Closes: #388204).
-    - fixes package list handling similar to the fix suggested by Alex Owen
-      <r.alex.owen at gmail.com> (Closes: #388060).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 18 Sep 2006 00:00:00 +0200
-
-live-package (0.99.6-1) unstable; urgency=medium
-
-  * New upstream release:
-    - fixing netboot.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 11 Sep 2006 00:00:00 +0200
-
-live-package (0.99.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Set maintainer to the project list.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  4 Sep 2006 00:00:00 +0200
-
-live-package (0.99.4-1) unstable; urgency=low
-
-  * New upstream release:
-    - Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update pxelinux.cfg
-      for NFS root in casper (Closes: #380512).
-    - Temporarily hacks xorg configuration file to remove BusID and set
-      default driver to vesa (Closes: #382391).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 28 Aug 2006 00:00:00 +0200
-
-live-package (0.99.3-1) unstable; urgency=low
-
-  * New upstream release:
-    - fixed configuration file handling (Closes: #384598).
-  * Update long descriptiong (Closes: #382473).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 21 Aug 2006 00:00:00 +0200
-
-live-package (0.99.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 31 Jul 2006 00:00:00 +0200
-
-live-package (0.99.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 24 Jul 2006 00:00:00 +0200
-
-live-package (0.99-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 17 Jul 2006 00:00:00 +0200

Deleted: dists/sid/live-helper/debian/rules
===================================================================
--- dists/trunk/live-helper/debian/rules	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/debian/rules	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,55 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-upstream:
-	# Needs: subversion
-	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-helper || true
-	find . -type d -name .svn | xargs rm -rf
-
-build:
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Installing package
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
-
-	install -D -m 0644 debian/changelog.old debian/live-helper/usr/share/doc/live-helper/changelog.Debian.old
-
-	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
-
-	# Removing double files
-	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
-	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
-	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old debian/live-helper/usr/share/doc/live-helper/changelog.old
-
-binary-arch: build install
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs docs/ChangeLog
-	dh_installdocs
-	dh_install
-	dh_installcron
-	dh_installman
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Copied: dists/sid/live-helper/debian/rules (from rev 1689, dists/trunk/live-helper/debian/rules)
===================================================================
--- dists/sid/live-helper/debian/rules	                        (rev 0)
+++ dists/sid/live-helper/debian/rules	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,55 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+upstream:
+	# Needs: subversion
+	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-helper || true
+	find . -type d -name .svn | xargs rm -rf
+
+build:
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Installing package
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
+
+	install -D -m 0644 debian/changelog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.Debian.live-package
+
+	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
+
+	# Removing double files
+	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
+	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
+	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package
+
+binary-arch: build install
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs docs/ChangeLog
+	dh_installdocs
+	dh_install
+	dh_installcron
+	dh_installman
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Deleted: dists/sid/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/docs/ChangeLog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,558 +0,0 @@
-2007-05-18  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS.
-	  - Renamed LIVE_KERNEL_PACKAGES to LIVE_LINUX_PACKAGES.
-	  - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES.
-	  - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES.
-	  - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM.
-	  - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER.
-	  - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH.
-	* Uploaded 1.0~a10-1.
-
-2007-05-18  Mathieu Geli  <mathieu.geli at gmail.com>
-
-	* examples/hooks/*
-	  - Added new hooks for non-free/contrib drivers
-	    Intel  : ipw3945, ipw2100, ipw2200
-	    Nvidia : nvidia-legacy
-	    Ralink : rt2x00, rt2570
-	  - Changed behavior of beryl hook: autostart beryl
-	    if video driver allows it (minimal detection based on glxinfo)
-
-2007-05-17  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_md5sum, lh_source,md5sum:
-	  - Fixed accidentally inclusion of md5sum.txt itself into
-	    binary/md5sum.txt.
-
-2007-05-16  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Added check for local includes and templates.
-	  - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES.
-	  - Renamed lh_binary_localincludes to lh_binary_local-includes.
-	  - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
-	  - Renamed lh_chroot_localincludes to lh_chroot_local-includes.
-	  - Renamed lh_chroot_localpackages to lh_chroot_local-packages.
-	  - Renamed lh_chroot_localpackageslists to
-	    lh_chroot_local-packageslists.
-	  - Renamed lh_source_download to lh_source_debian.
-	  - Renamed lh_source_config to lh_source_debian-live.
-
-2007-05-09  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
-	  - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY.
-	* helpers/lh_chroot_sources:
-	  - Added aptitude overwrite for untrusted sources.
-	  - Changed checks for *.build/*.image to *.bootstrap/*.binary.
-
-2007-05-08  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Renamed lh_binary_linuximage to lh_binary_linux-image.
-	  - Renamed lh_chroot_linuximage to lh_chroot_linux-image.
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
-	  - Added missing cache directory when only caching stages.
-	* helpers/lh_binary_debian-installer, lh_binary_linux-image,
-	  lh_binary_memtest:
-	  - Changed kernel installation directories.
-
-2007-05-07  Daniel Baumann  <daniel at debian.org>
-
-	* examples/snapshot-build.sh, live-snapshot.sources.list:
-	  - Added.
-	* helpers/lh_binary_rootfs:
-	  - Fixed wrong order of squashfs options.
-
-2007-05-06  Daniel Baumann  <daniel at debian.org>
-
-	* templates/syslinux:
-	  - Updated again.
-	* helpers/lh_config:
-	  - Fixed overwriting of LH_* options.
-	* helpers/lh_binary_includes:
-	  - Fixed a quoting typo.
-	  - Working arround symlinks on usb-hdd binary images.
-	* Uploaded 1.0~a9-1.
-
-2007-04-31  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Added LH_INITRAMFS.
-	  - Splitted config/image into config/binary and config/source.
-	* Uploaded 1.0~a8-1.
-
-2007-04-26  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Implemented paranoid caching with LIVE_CACHE_INDICES,
-	    LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build
-	    images offline from the cache.
-
-2007-04-25  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_usb, lh_source_usb:
-	  - In preparation of adding support for usb-zip images, the usb binary
-	    type is renamed to usb-hdd.
-
-2007-04-24  Daniel Baumann  <daniel at debian.org>
-
-	* functions/stagefile.sh:
-	  - Requite_stagefile can require more than one stage.
-	* helpers/lh_binary_debian-installer:
-	  - Added.
-
-2007-04-23  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_includes, lh_binary_usb, lh_source_usb:
-	  - Added workaround for vfat limitations.
-
-2007-04-23  Daniel Baumann  <daniel at debian.org>
-
-	* Makefile:
-	  - Added simple test rule.
-	* functions/*, helpers/*:
-	  - Added LH_ROOT_COMMAND to support sudo.
-	* functions/package.sh:
-	  - Added. Helper dependencies in-chroot can now be handled by
-	    functions.
-	* helpers/make-live:
-	  - Added trap to unmount proc and sys on exit and failure.
-	* Uploaded 1.0~a7-1.
-
-2007-04-22  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - In ubuntu mode, setting default sections to main restricted.
-	* helpers/lh_binary_grub:
-	  - Making copy call of grub arch independent.
-	* helpers/lh_chroot_sources:
-	  - In debian mode, checking for non-sid rather than if-etch.
-	  - Fixed wrong Ubuntu security URL.
-
-2007-04-20  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_rootfs, lh_binary_iso:
-	  - Added mksquashfs/genisoimage quiet/verbose options.
-
-2007-04-19  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, lh_binary_syslinux:
-	  - Added check for splash in config directory.
-
-2007-04-18  Daniel Baumann  <daniel at debian.org>
-
-	* debian/cron.daily, default:
-	  - Added.
-	* doc/BUGS, DOWNLOAD:
-	  - Added.
-	* examples/edu.sources.list, fai.sources.list:
-	  - Added.
-	* manpages/*:
-	  - Added language suffix.
-	  - Added German translations.
-
-2007-04-17  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_chroot_hooks:
-	  - Also check for tasks specific hooks, not just for package lists.
-	* helpers/lh_chroot_tasks:
-	  - Allowing to use either aptitude or tasksel.
-	* hooks/kde-desktop:
-	  - Added.
-	* manpages/lh_build.1, lh_source.1:
-	  - Added.
-
-2007-04-16  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Using lsb_release, if existing, to set default mode to ubuntu on
-	    ubuntu systems.
-	  - Moved desktop task to the end, so that gdm doesn't take
-	    gnome-session as default.
-	* helpers/lh_chroot_hooks:
-	  - Added simple --hooks for easy testing.
-	* Uploaded 1.0~a6-1.
-
-2007-04-15  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Set LH_APT to apt-get when using mini or minimal.
-	* helpers/lh_chroot_sources:
-	  - Excluding comments from local sources lists.
-	* helpers/lh_bootstrap_cdebootstrap:
-	  - Removing imported configuration files by cdebootstrap.
-
-2007-04-13  Daniel Baumann  <daniel at debian.org>
-
-	* Moved examples from /usr/share/doc to /usr/share/live-helper.
-	* examples/bpo.sources.list:
-	  - Added.
-	* functions/defaults.sh:
-	  - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
-	* helpers/lh_clean:
-	  - Added missing removal of generic source.
-
-2007-04-12  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_config, make-live:
-	  - Adding --config.
-	* helpers/lh_binary_memtester86:
-	  - Renamed to lh_binary_memtest, made more generic.
-	* functions/defaults.sh:
-	  - Setting default distribution to etch until 2.6.20 has setteled in
-	    unstable.
-
-2007-04-11  Daniel Baumann  <daniel at debian.org>
-
-	* Merging from sidux fllbuilder 1.0.4:
-	  - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
-	  - helpers/lh_chroot_linuximage: Added additional options to
-	    kernel-img.conf.
-	  - helpers/lh_chroot_proc: Made binfmt umount conditional.
-	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
-	  - Added.
-	* helpers/lh_binary_grub, lh_binary_syslinux:
-	  - Added failsafe kernel entries.
-	* helpers/lh_chroot_apt:
-	  - Using apt.conf.d also for apt, not just for aptitude.
-	  - Minor code cleanup.
-	* helpers/lh_source_*:
-	  - Minor code cleanup.
-	* helpers/lh_source_download:
-	  - Added LIVE_BOOTLOADER to the list of source packages.
-	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
-	  - Added.
-
-2007-04-10  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_includes, includes/*:
-	  - Redone.
-
-2007-04-09  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_yaboot, templates/yaboot:
-	  - Added.
-
-2007-04-09  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_config, make-live, functions/defaults.sh:
-	  - Added mode to distinguish between Debian and Ubuntu.
-	* helpers/lh_chroot_sources:
-	  - Added check for LIVE_MIRROR_BUILD* to be equal to
-	    LIVE_MIRROR_IMAGE*.
-	* Uploaded 1.0~a5-1.
-
-2007-04-08  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_net:
-	  - Added check for namespace collision with LIVE_SERVER_PATH.
-	* helpers/lh_binary_grub:
-	  - Added functionality for usb|hdd images.
-
-2007-04-07  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_chroot_sources:
-	  - Moved check for local source lists from
-	    config/sources.lists.{build,image} to
-	    config/chroot_sources/*.{build,image}.
-	  - Added check for local gpg keys in
-	    config/chroot_sources/*.{build,image}.gpg.
-	  - Added check for local keyring packages in
-	    config/chroot_sources/*.deb.
-	  - Added LIVE_KEYRING_PACKAGES.
-
-2007-04-06  Daniel Baumann  <daniel at debian.org>
-
-	* functions/breakpoints.sh, helpers/*:
-	  - Added initial breakpoints.
-	* functions/chroot.sh:
-	  - Adding /usr/local to path.
-	* functions/lockfile.sh:
-	  - Added additional signals to the trap.
-	* helpers/lh_binary_includes:
-	  - Respect LIVE_INCLUDES=none.
-	* manpages/*:
-	  - Updated.
-
-2007-04-05  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, templates/grub/menu.lst:
-	  - Added splash functionality.
-	* Uploaded 1.0~a4-1.
-
-2007-04-03  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, lh_binary_grub:
-	  - Added check for LIVE_TEMPLATES to be existing.
-	* helpers/lh_binary_includes:
-	  - Added check for LIVE_INCLUDES to be existing.
-
-2007-04-02  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*:
-	  - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
-	* helpers/lh_binary_iso:
-	  - Added exclude for the bootloader from the iso image content.
-
-2007-04-01  Daniel Baumann  <daniel at debian.org>
-
-	* helper/lh_binary_grub:
-	  - Added.
-
-2007-03-30  Daniel Baumann  <daniel at debian.org>
-
-	* helper/lh_chroot_localincludes:
-	  - Fixed wrong path for hook removal.
-
-2007-03-29  Daniel Baumann  <daniel at debian.org>
-
-	* functions/common.sh, echo.sh:
-	  - Added.
-	* doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7:
-	  - Added forgotten helpers.
-	* doc/FAQ:
-	  - Added.
-	* lists/mini, minimal:
-	  - Added --yes to apt call to make them non-interactive.
-	* manpages/lh_chroot.1:
-	  - Added.
-
-2007-03-28  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
-	  - Added --debug, --quiet, and --verbose.
-
-2007-03-27  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_linuximage, lh_binary_memtest86:
-	  - Added missing Read_conffiles to fix foreign architecture builds.
-
-2007-03-26  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
-	  lh_clean:
-	  - Added routine to cache bootstrapped chroot as suggested by Kai
-	    Hendry <hendry at iki.fi>.
-	* helpers/lh_chroot_rootfs:
-	  - Fixed typo in net type.
-	* lists/gnome*, kde*, standard-x11, xfce*:
-	  - Added menu.
-
-2007-03-26  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Fixed handling of desktop list variable loop.
-	* Uploaded 1.0~a3-1.
-
-2007-03-25  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*:
-	  - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
-	  - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS.
-	* functions/cache.sh:
-	  - Added.
-	* helpers/lh_bootstrap_cdebootstrap:
-	  - Added removal of cdebootstrap-helper-diverts.
-	* helpers/lh_binary_chroot:
-	  - Added.
-	* helpers/lh_binary_rootfs:
-	  - Moved filesystem routines into chroot.
-	* helpers/lh_chroot_localization, lh_chroot_localpackages,
-	  lh_chroot_localpackageslists, lh_chroot_packages,
-	  lh_chroot_packageslists, lh_chroot_tasks:
-	  - Added check for LH_CACHE.
-	* helpers/lh_chroot_apt:
-	  - Removing old apt.conf if existing as suggested by Ben Armstrong
-	    <synrg at debian.org>.
-	* helpers/lh_chroot_hacks:
-	  - Added check for already installed smbfs.
-	  - Added check for already configured initramfs.conf as suggested by
-	    Ben Armstrong <synrg at debian.org>.
-	* helpers/lh_chroot_interactive:
-	  - Added.
-	* helpers/lh_chroot_tasks:
-	  - Added routine for LH_APT=apt.
-	* lists/minimal-net:
-	  - Minimized.
-
-2007-03-24  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*, hooks/*:
-	  - Added GPL blurb.
-	* functions/arguments.sh, helpers/*:
-	  - Added common arguments.
-	* functions/arguments.sh, stagefile.sh, helpers/*,
-	  manpages/live-helper.7:
-	  - Added --force option.
-	* functions/defaults.sh, helpers/lh_binary_syslinux, lh_config,
-	  make-live:
-	  - Added LIVE_USERNAME and LIVE_HOSTNAME.
-	* helpers/lh_binary_linuximage, lh_binary_memtest86,
-	  lh_binary_syslinux:
-	  - Moved kernel directory to live.
-	* helpers/lh_clean:
-	  - Added purge.
-
-2007-03-23  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/make-live:
-	  - Calling Arguments twice to catch case with non-default root.
-
-2007-03-22  Daniel Baumann  <daniel at debian.org>
-
-	* functions/default.sh, helpers/*:
-	  - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
-	    lh_chroot_localpackageslist to lh_chroot_localpackageslists
-	* helpers/lh_binary_includes:
-	  - Using LIVE_INCLUDES now.
-	* helpers/lh_chroot_apt:
-	  - Added LH_APT_SECURE.
-	* helpers/lh_chroot_linuximage:
-	  - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
-	    local packages.
-
-2007-03-21  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
-	  - Checking earlier if there is something todo.
-	* helpers/lh_binary_linuximage, lh_binary_syslinux,
-	  lh_chroot_linuximage, templates/syslinux/isolinux.cfg:
-	  - Extended to support multiple kernels at once.
-	* helpers/lh_binary_includes, lh_binary_localincludes,
-	  lh_chroot_localincludes:
-	  - Replaced path with variable as suggested Kai Hendry <hendry at iki.fi>.
-	* helpers/lh_source_md5sum:
-	  - Added.
-	* helpers/make-live:
-	  - Added short options in ARGUMENTS.
-	* functions/defaults.sh, helpers/*:
-	  - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR.
-	  - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
-	    LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
-
-2007-03-20  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/make-live:
-	  - Fixed typo in ARGUMENTS.
-
-2007-03-19  Daniel Baumann  <daniel at debian.org>
-
-	* lists/gnome*, kde*, standard-x11, xfce*:
-	  - Added alsa-base, alsa-oss, alsa-utils, and discover.
-
-2007-03-19  Daniel Baumann  <daniel at debian.org>
-
-	* Uploaded 1.0~a2-1.
-
-2007-03-18  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Quoted date call in LIVE_ISO_VOLUME.
-	* manpages/lh_clean.1:
-	  - Added.
-
-2007-03-17  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh, helpers/*:
-	  - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
-	    to LIVE_MIRROR_LOCAL_SECURITY.
-	* doc/examples/beryl-hook.sh:
-	  - Added, submitted by Inigo Tejedor Arrondo <inigo at navarrux.org>.
-	* helpers/lh_config, make-live:
-	  - Added check for newconfig to prevent overwriting of non-specified
-	    options to default values.
-	* helpers/lh_chroot_localhooks:
-	  - Added basename where needed.
-	* helpers/lh_chroot_sources:
-	  - Added check for local sources.list in config for custom
-	    repositories.
-	  - Replaced security check for etch with check for not-unstable.
-	* manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1,
-	  lh_bootstrap_debootstrap.1, lh_testroot.1:
-	  - Added.
-	* templates/syslinux/pxlinux.cfg:
-	  - Fixed path.
-
-2007-03-16  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_usb: Corrected stagefile creation.
-
-2007-03-15  Daniel Baumann  <daniel at debian.org>
-
-	* Makefile:
-	  - Replaced helper uninstall routine with a less intrusive one.
-	* doc/NEWS:
-	  - Updated.
-	* functions/conffile.sh:
-	  - Beautified.
-	* functions/defaults.sh:
-	  - Added LH_LOSETUP.
-	* functions/lockfile.sh:
-	  - Beautified.
-	* helpers/*:
-	  - Allowing apt-get, not just apt in LH_APT.
-	* helpers/lh_config:
-	  - Added check for existing configuration.
-	* helpers/lh_binary_md5sum:
-	  - Removed legacy code.
-	* helpers/lh_binary_manifest:
-	  - Added creation of packages.txt.
-	* helpers/lh_binary_usb, lh_source_usb:
-	  - Replaced loop device node workaround with a better one.
-	* helpers/lh_chroot_hooks, lh_chroot_localhooks:
-	  - Fixed executable check.
-	* helpers/lh_source_config:
-	  - Added.
-	* helpers/lh_source_download:
-	  - Separeted debian sources and debian-live configuration into
-	    different directories.
-	  - Added live-helper to the sources.
-	* helpers/lh_source_generic, lh_source_iso, lh_source_usb,
-	  lh_source_net:
-	  - Removed annyoing warning when sources are disabled.
-	* helpers/lh_source_net:
-	  - Beautified.
-	* helpers/make-live:
-	  - Fixed typo in ARGUMENTS.
-	  - Moved help, usage, version into functions.
-	  - Removed build pre-option.
-	* manpages/live-helper.7:
-	  - Added.
-	* templates/syslinux/f10.txt:
-	  - Added note about Debian Live project.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh, helpers/*:
-	  - Converted LIVE_ROOT to directory, not full path.
-	* functions/*, helpers/*:
-	  - Replaced LIVE_CHROOT with directory name.
-	* functions/conffile.sh:
-	  - Added warning if CONFFILE is not readable.
-	* helpers/lh_chroot_localization:
-	  - Completed check for koffice.
-	* helpers/lh_source_download:
-	  - Fixed typo in old source removal.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_chroot_hacks:
-	  - Added removal of udev persistent-net rule.
-	* Uploaded 1.0~a1-3.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Fixed setting of LIVE_SYSVINIT.
-	* helpers/lh_chroot_sysvinit:
-	  - Changed check for LIVE_SYSVINIT from disabled to enabled.
-	* Uploaded 1.0~a1-2.
-
-2007-03-12  Daniel Baumann  <daniel at debian.org>
-
-	* Rewritten live-package.
-	* Uploaded 1.0~a1-1.

Copied: dists/sid/live-helper/docs/ChangeLog (from rev 1728, dists/trunk/live-helper/docs/ChangeLog)
===================================================================
--- dists/sid/live-helper/docs/ChangeLog	                        (rev 0)
+++ dists/sid/live-helper/docs/ChangeLog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,567 @@
+2007-05-24  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_syslinux:
+	  - Added dedicated directory handling for syslinux (>= 3.36) on usb.
+	* helpers/lh_binary_debian-installer, lh_binary_linux-image,
+	  lh_binary_memtest, lh_binary_syslinux:
+	  - Added legacy support for syslinux (<< 3.36).
+	* Uploaded 1.0~a11-1.
+
+2007-05-18  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS.
+	  - Renamed LIVE_KERNEL_PACKAGES to LIVE_LINUX_PACKAGES.
+	  - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES.
+	  - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES.
+	  - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM.
+	  - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER.
+	  - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH.
+	* Uploaded 1.0~a10-1.
+
+2007-05-18  Mathieu Geli  <mathieu.geli at gmail.com>
+
+	* examples/hooks/*
+	  - Added new hooks for non-free/contrib drivers
+	    Intel  : ipw3945, ipw2100, ipw2200
+	    Nvidia : nvidia-legacy
+	    Ralink : rt2x00, rt2570
+	  - Changed behavior of beryl hook: autostart beryl
+	    if video driver allows it (minimal detection based on glxinfo)
+
+2007-05-17  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_md5sum, lh_source,md5sum:
+	  - Fixed accidentally inclusion of md5sum.txt itself into
+	    binary/md5sum.txt.
+
+2007-05-16  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Added check for local includes and templates.
+	  - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES.
+	  - Renamed lh_binary_localincludes to lh_binary_local-includes.
+	  - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
+	  - Renamed lh_chroot_localincludes to lh_chroot_local-includes.
+	  - Renamed lh_chroot_localpackages to lh_chroot_local-packages.
+	  - Renamed lh_chroot_localpackageslists to
+	    lh_chroot_local-packageslists.
+	  - Renamed lh_source_download to lh_source_debian.
+	  - Renamed lh_source_config to lh_source_debian-live.
+
+2007-05-09  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
+	  - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY.
+	* helpers/lh_chroot_sources:
+	  - Added aptitude overwrite for untrusted sources.
+	  - Changed checks for *.build/*.image to *.bootstrap/*.binary.
+
+2007-05-08  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Renamed lh_binary_linuximage to lh_binary_linux-image.
+	  - Renamed lh_chroot_linuximage to lh_chroot_linux-image.
+	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
+	  - Added missing cache directory when only caching stages.
+	* helpers/lh_binary_debian-installer, lh_binary_linux-image,
+	  lh_binary_memtest:
+	  - Changed kernel installation directories.
+
+2007-05-07  Daniel Baumann  <daniel at debian.org>
+
+	* examples/snapshot-build.sh, live-snapshot.sources.list:
+	  - Added.
+	* helpers/lh_binary_rootfs:
+	  - Fixed wrong order of squashfs options.
+
+2007-05-06  Daniel Baumann  <daniel at debian.org>
+
+	* templates/syslinux:
+	  - Updated again.
+	* helpers/lh_config:
+	  - Fixed overwriting of LH_* options.
+	* helpers/lh_binary_includes:
+	  - Fixed a quoting typo.
+	  - Working arround symlinks on usb-hdd binary images.
+	* Uploaded 1.0~a9-1.
+
+2007-04-31  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Added LH_INITRAMFS.
+	  - Splitted config/image into config/binary and config/source.
+	* Uploaded 1.0~a8-1.
+
+2007-04-26  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Implemented paranoid caching with LIVE_CACHE_INDICES,
+	    LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build
+	    images offline from the cache.
+
+2007-04-25  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_usb, lh_source_usb:
+	  - In preparation of adding support for usb-zip images, the usb binary
+	    type is renamed to usb-hdd.
+
+2007-04-24  Daniel Baumann  <daniel at debian.org>
+
+	* functions/stagefile.sh:
+	  - Requite_stagefile can require more than one stage.
+	* helpers/lh_binary_debian-installer:
+	  - Added.
+
+2007-04-23  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_includes, lh_binary_usb, lh_source_usb:
+	  - Added workaround for vfat limitations.
+
+2007-04-23  Daniel Baumann  <daniel at debian.org>
+
+	* Makefile:
+	  - Added simple test rule.
+	* functions/*, helpers/*:
+	  - Added LH_ROOT_COMMAND to support sudo.
+	* functions/package.sh:
+	  - Added. Helper dependencies in-chroot can now be handled by
+	    functions.
+	* helpers/make-live:
+	  - Added trap to unmount proc and sys on exit and failure.
+	* Uploaded 1.0~a7-1.
+
+2007-04-22  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - In ubuntu mode, setting default sections to main restricted.
+	* helpers/lh_binary_grub:
+	  - Making copy call of grub arch independent.
+	* helpers/lh_chroot_sources:
+	  - In debian mode, checking for non-sid rather than if-etch.
+	  - Fixed wrong Ubuntu security URL.
+
+2007-04-20  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_rootfs, lh_binary_iso:
+	  - Added mksquashfs/genisoimage quiet/verbose options.
+
+2007-04-19  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added check for splash in config directory.
+
+2007-04-18  Daniel Baumann  <daniel at debian.org>
+
+	* debian/cron.daily, default:
+	  - Added.
+	* doc/BUGS, DOWNLOAD:
+	  - Added.
+	* examples/edu.sources.list, fai.sources.list:
+	  - Added.
+	* manpages/*:
+	  - Added language suffix.
+	  - Added German translations.
+
+2007-04-17  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_hooks:
+	  - Also check for tasks specific hooks, not just for package lists.
+	* helpers/lh_chroot_tasks:
+	  - Allowing to use either aptitude or tasksel.
+	* hooks/kde-desktop:
+	  - Added.
+	* manpages/lh_build.1, lh_source.1:
+	  - Added.
+
+2007-04-16  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Using lsb_release, if existing, to set default mode to ubuntu on
+	    ubuntu systems.
+	  - Moved desktop task to the end, so that gdm doesn't take
+	    gnome-session as default.
+	* helpers/lh_chroot_hooks:
+	  - Added simple --hooks for easy testing.
+	* Uploaded 1.0~a6-1.
+
+2007-04-15  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Set LH_APT to apt-get when using mini or minimal.
+	* helpers/lh_chroot_sources:
+	  - Excluding comments from local sources lists.
+	* helpers/lh_bootstrap_cdebootstrap:
+	  - Removing imported configuration files by cdebootstrap.
+
+2007-04-13  Daniel Baumann  <daniel at debian.org>
+
+	* Moved examples from /usr/share/doc to /usr/share/live-helper.
+	* examples/bpo.sources.list:
+	  - Added.
+	* functions/defaults.sh:
+	  - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
+	* helpers/lh_clean:
+	  - Added missing removal of generic source.
+
+2007-04-12  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_config, make-live:
+	  - Adding --config.
+	* helpers/lh_binary_memtester86:
+	  - Renamed to lh_binary_memtest, made more generic.
+	* functions/defaults.sh:
+	  - Setting default distribution to etch until 2.6.20 has setteled in
+	    unstable.
+
+2007-04-11  Daniel Baumann  <daniel at debian.org>
+
+	* Merging from sidux fllbuilder 1.0.4:
+	  - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
+	  - helpers/lh_chroot_linuximage: Added additional options to
+	    kernel-img.conf.
+	  - helpers/lh_chroot_proc: Made binfmt umount conditional.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added failsafe kernel entries.
+	* helpers/lh_chroot_apt:
+	  - Using apt.conf.d also for apt, not just for aptitude.
+	  - Minor code cleanup.
+	* helpers/lh_source_*:
+	  - Minor code cleanup.
+	* helpers/lh_source_download:
+	  - Added LIVE_BOOTLOADER to the list of source packages.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+
+2007-04-10  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_includes, includes/*:
+	  - Redone.
+
+2007-04-09  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_yaboot, templates/yaboot:
+	  - Added.
+
+2007-04-09  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_config, make-live, functions/defaults.sh:
+	  - Added mode to distinguish between Debian and Ubuntu.
+	* helpers/lh_chroot_sources:
+	  - Added check for LIVE_MIRROR_BUILD* to be equal to
+	    LIVE_MIRROR_IMAGE*.
+	* Uploaded 1.0~a5-1.
+
+2007-04-08  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_net:
+	  - Added check for namespace collision with LIVE_SERVER_PATH.
+	* helpers/lh_binary_grub:
+	  - Added functionality for usb|hdd images.
+
+2007-04-07  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_sources:
+	  - Moved check for local source lists from
+	    config/sources.lists.{build,image} to
+	    config/chroot_sources/*.{build,image}.
+	  - Added check for local gpg keys in
+	    config/chroot_sources/*.{build,image}.gpg.
+	  - Added check for local keyring packages in
+	    config/chroot_sources/*.deb.
+	  - Added LIVE_KEYRING_PACKAGES.
+
+2007-04-06  Daniel Baumann  <daniel at debian.org>
+
+	* functions/breakpoints.sh, helpers/*:
+	  - Added initial breakpoints.
+	* functions/chroot.sh:
+	  - Adding /usr/local to path.
+	* functions/lockfile.sh:
+	  - Added additional signals to the trap.
+	* helpers/lh_binary_includes:
+	  - Respect LIVE_INCLUDES=none.
+	* manpages/*:
+	  - Updated.
+
+2007-04-05  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, templates/grub/menu.lst:
+	  - Added splash functionality.
+	* Uploaded 1.0~a4-1.
+
+2007-04-03  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, lh_binary_grub:
+	  - Added check for LIVE_TEMPLATES to be existing.
+	* helpers/lh_binary_includes:
+	  - Added check for LIVE_INCLUDES to be existing.
+
+2007-04-02  Daniel Baumann  <daniel at debian.org>
+
+	* functions/*, helpers/*:
+	  - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
+	* helpers/lh_binary_iso:
+	  - Added exclude for the bootloader from the iso image content.
+
+2007-04-01  Daniel Baumann  <daniel at debian.org>
+
+	* helper/lh_binary_grub:
+	  - Added.
+
+2007-03-30  Daniel Baumann  <daniel at debian.org>
+
+	* helper/lh_chroot_localincludes:
+	  - Fixed wrong path for hook removal.
+
+2007-03-29  Daniel Baumann  <daniel at debian.org>
+
+	* functions/common.sh, echo.sh:
+	  - Added.
+	* doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7:
+	  - Added forgotten helpers.
+	* doc/FAQ:
+	  - Added.
+	* lists/mini, minimal:
+	  - Added --yes to apt call to make them non-interactive.
+	* manpages/lh_chroot.1:
+	  - Added.
+
+2007-03-28  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
+	  - Added --debug, --quiet, and --verbose.
+
+2007-03-27  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_linuximage, lh_binary_memtest86:
+	  - Added missing Read_conffiles to fix foreign architecture builds.
+
+2007-03-26  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
+	  lh_clean:
+	  - Added routine to cache bootstrapped chroot as suggested by Kai
+	    Hendry <hendry at iki.fi>.
+	* helpers/lh_chroot_rootfs:
+	  - Fixed typo in net type.
+	* lists/gnome*, kde*, standard-x11, xfce*:
+	  - Added menu.
+
+2007-03-26  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Fixed handling of desktop list variable loop.
+	* Uploaded 1.0~a3-1.
+
+2007-03-25  Daniel Baumann  <daniel at debian.org>
+
+	* functions/*, helpers/*:
+	  - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
+	  - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS.
+	* functions/cache.sh:
+	  - Added.
+	* helpers/lh_bootstrap_cdebootstrap:
+	  - Added removal of cdebootstrap-helper-diverts.
+	* helpers/lh_binary_chroot:
+	  - Added.
+	* helpers/lh_binary_rootfs:
+	  - Moved filesystem routines into chroot.
+	* helpers/lh_chroot_localization, lh_chroot_localpackages,
+	  lh_chroot_localpackageslists, lh_chroot_packages,
+	  lh_chroot_packageslists, lh_chroot_tasks:
+	  - Added check for LH_CACHE.
+	* helpers/lh_chroot_apt:
+	  - Removing old apt.conf if existing as suggested by Ben Armstrong
+	    <synrg at debian.org>.
+	* helpers/lh_chroot_hacks:
+	  - Added check for already installed smbfs.
+	  - Added check for already configured initramfs.conf as suggested by
+	    Ben Armstrong <synrg at debian.org>.
+	* helpers/lh_chroot_interactive:
+	  - Added.
+	* helpers/lh_chroot_tasks:
+	  - Added routine for LH_APT=apt.
+	* lists/minimal-net:
+	  - Minimized.
+
+2007-03-24  Daniel Baumann  <daniel at debian.org>
+
+	* functions/*, helpers/*, hooks/*:
+	  - Added GPL blurb.
+	* functions/arguments.sh, helpers/*:
+	  - Added common arguments.
+	* functions/arguments.sh, stagefile.sh, helpers/*,
+	  manpages/live-helper.7:
+	  - Added --force option.
+	* functions/defaults.sh, helpers/lh_binary_syslinux, lh_config,
+	  make-live:
+	  - Added LIVE_USERNAME and LIVE_HOSTNAME.
+	* helpers/lh_binary_linuximage, lh_binary_memtest86,
+	  lh_binary_syslinux:
+	  - Moved kernel directory to live.
+	* helpers/lh_clean:
+	  - Added purge.
+
+2007-03-23  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/make-live:
+	  - Calling Arguments twice to catch case with non-default root.
+
+2007-03-22  Daniel Baumann  <daniel at debian.org>
+
+	* functions/default.sh, helpers/*:
+	  - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
+	    lh_chroot_localpackageslist to lh_chroot_localpackageslists
+	* helpers/lh_binary_includes:
+	  - Using LIVE_INCLUDES now.
+	* helpers/lh_chroot_apt:
+	  - Added LH_APT_SECURE.
+	* helpers/lh_chroot_linuximage:
+	  - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
+	    local packages.
+
+2007-03-21  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
+	  - Checking earlier if there is something todo.
+	* helpers/lh_binary_linuximage, lh_binary_syslinux,
+	  lh_chroot_linuximage, templates/syslinux/isolinux.cfg:
+	  - Extended to support multiple kernels at once.
+	* helpers/lh_binary_includes, lh_binary_localincludes,
+	  lh_chroot_localincludes:
+	  - Replaced path with variable as suggested Kai Hendry <hendry at iki.fi>.
+	* helpers/lh_source_md5sum:
+	  - Added.
+	* helpers/make-live:
+	  - Added short options in ARGUMENTS.
+	* functions/defaults.sh, helpers/*:
+	  - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR.
+	  - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
+	    LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
+
+2007-03-20  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/make-live:
+	  - Fixed typo in ARGUMENTS.
+
+2007-03-19  Daniel Baumann  <daniel at debian.org>
+
+	* lists/gnome*, kde*, standard-x11, xfce*:
+	  - Added alsa-base, alsa-oss, alsa-utils, and discover.
+
+2007-03-19  Daniel Baumann  <daniel at debian.org>
+
+	* Uploaded 1.0~a2-1.
+
+2007-03-18  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Quoted date call in LIVE_ISO_VOLUME.
+	* manpages/lh_clean.1:
+	  - Added.
+
+2007-03-17  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh, helpers/*:
+	  - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
+	    to LIVE_MIRROR_LOCAL_SECURITY.
+	* doc/examples/beryl-hook.sh:
+	  - Added, submitted by Inigo Tejedor Arrondo <inigo at navarrux.org>.
+	* helpers/lh_config, make-live:
+	  - Added check for newconfig to prevent overwriting of non-specified
+	    options to default values.
+	* helpers/lh_chroot_localhooks:
+	  - Added basename where needed.
+	* helpers/lh_chroot_sources:
+	  - Added check for local sources.list in config for custom
+	    repositories.
+	  - Replaced security check for etch with check for not-unstable.
+	* manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1,
+	  lh_bootstrap_debootstrap.1, lh_testroot.1:
+	  - Added.
+	* templates/syslinux/pxlinux.cfg:
+	  - Fixed path.
+
+2007-03-16  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_usb: Corrected stagefile creation.
+
+2007-03-15  Daniel Baumann  <daniel at debian.org>
+
+	* Makefile:
+	  - Replaced helper uninstall routine with a less intrusive one.
+	* doc/NEWS:
+	  - Updated.
+	* functions/conffile.sh:
+	  - Beautified.
+	* functions/defaults.sh:
+	  - Added LH_LOSETUP.
+	* functions/lockfile.sh:
+	  - Beautified.
+	* helpers/*:
+	  - Allowing apt-get, not just apt in LH_APT.
+	* helpers/lh_config:
+	  - Added check for existing configuration.
+	* helpers/lh_binary_md5sum:
+	  - Removed legacy code.
+	* helpers/lh_binary_manifest:
+	  - Added creation of packages.txt.
+	* helpers/lh_binary_usb, lh_source_usb:
+	  - Replaced loop device node workaround with a better one.
+	* helpers/lh_chroot_hooks, lh_chroot_localhooks:
+	  - Fixed executable check.
+	* helpers/lh_source_config:
+	  - Added.
+	* helpers/lh_source_download:
+	  - Separeted debian sources and debian-live configuration into
+	    different directories.
+	  - Added live-helper to the sources.
+	* helpers/lh_source_generic, lh_source_iso, lh_source_usb,
+	  lh_source_net:
+	  - Removed annyoing warning when sources are disabled.
+	* helpers/lh_source_net:
+	  - Beautified.
+	* helpers/make-live:
+	  - Fixed typo in ARGUMENTS.
+	  - Moved help, usage, version into functions.
+	  - Removed build pre-option.
+	* manpages/live-helper.7:
+	  - Added.
+	* templates/syslinux/f10.txt:
+	  - Added note about Debian Live project.
+
+2007-03-14  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh, helpers/*:
+	  - Converted LIVE_ROOT to directory, not full path.
+	* functions/*, helpers/*:
+	  - Replaced LIVE_CHROOT with directory name.
+	* functions/conffile.sh:
+	  - Added warning if CONFFILE is not readable.
+	* helpers/lh_chroot_localization:
+	  - Completed check for koffice.
+	* helpers/lh_source_download:
+	  - Fixed typo in old source removal.
+
+2007-03-14  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_hacks:
+	  - Added removal of udev persistent-net rule.
+	* Uploaded 1.0~a1-3.
+
+2007-03-14  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Fixed setting of LIVE_SYSVINIT.
+	* helpers/lh_chroot_sysvinit:
+	  - Changed check for LIVE_SYSVINIT from disabled to enabled.
+	* Uploaded 1.0~a1-2.
+
+2007-03-12  Daniel Baumann  <daniel at debian.org>
+
+	* Rewritten live-package.
+	* Uploaded 1.0~a1-1.

Copied: dists/sid/live-helper/docs/ChangeLog.live-package (from rev 1689, dists/trunk/live-helper/docs/ChangeLog.live-package)
===================================================================
--- dists/sid/live-helper/docs/ChangeLog.live-package	                        (rev 0)
+++ dists/sid/live-helper/docs/ChangeLog.live-package	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,474 @@
+2007-03-10 Daniel Baumann <daniel at debian.org>
+
+	* Added knoppix and knoppix-dvd package lists.
+
+2007-03-09 Daniel Baumann <daniel at debian.org>
+
+	* Getting free loopdevice from inside the chroot, not outside.
+
+2007-03-09 Daniel Baumann <daniel at debian.org>
+
+	* Added kbd to all !minimal lists.
+	* Uploaded 0.99.25.
+
+2007-03-08 Otavio Salvador <otavio at debian.org>
+
+	* helpers/lh_configapt: Fix aptitude configuration to really avoid
+	  recommended packages to get installed.
+	* src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
+
+2007-03-04 Daniel Baumann <daniel at debian.org>
+
+	* Replaced removal of kernel on minimal flavours with excludes on the
+	  mksquashfs call.
+	* Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported
+	  by Mathieu Geli <mathieu.geli at gmail.com>.
+	* Exported CODENAME_* manually as reported by Cédric Lucantis
+	  <omer at no-log.org>.
+	* Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry
+	  <hendry at iki.fi>.
+	* Uploaded 0.99.24.
+
+2007-02-22 Daniel Baumann <daniel at debian.org>
+
+	* Added xresprobe to all x11 lists.
+
+2007-02-22 Daniel Baumann <daniel at debian.org>
+
+	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  - add and cleanup variable exporting in defaults.
+	  - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
+	* Uploaded 0.99.23.
+
+2007-02-21 Daniel Baumann <daniel at debian.org>
+
+	* Added gnome-junior, kde-junior and xfce-junior lists.
+	* Uploaded 0.99.22.
+
+2007-02-19 Daniel Baumann <daniel at debian.org>
+
+	* Fixed manifest.
+
+2007-02-15 Daniel Baumann <daniel at debian.org>
+
+	* Applied patch from Sebastian Raveau <sebastien.raveau at epita.fr> to
+	  add support for filesystem images encrypted with loop-aes.
+
+2007-02-13 Daniel Baumann <daniel at debian.org>
+
+	* Broken out scripts into modularized lh_* subscripts.
+
+2007-02-12 Daniel Baumann <daniel at debian.org>
+
+	* Added some code as suggested by Alex Owen <r.a.owen at qmul.ac.uk> to
+	  check if the depends (syslinux, memtest etc.) are intentionally
+	  installed in the chroot, and hence, don't remove them.
+	* Moved some depends into the chroot.
+	* Uploaded 0.99.21.
+
+2007-02-11 Daniel Baumann <daniel at debian.org>
+
+	* Added mini flavour.
+
+2007-02-10 Daniel Baumann <daniel at debian.org>
+
+	* Added legacy code for genisoimage.
+	* Uploaded 0.99.20.
+
+2007-02-09 Daniel Baumann <daniel at debian.org>
+
+	* Added usb type.
+
+2007-02-08 Daniel Baumann <daniel at debian.org>
+
+	* Added desktop task to the *-desktop flavours.
+
+2007-02-07 Daniel Baumann <daniel at debian.org>
+
+	* Extended cron job a bit.
+	* Fixed manual pruning in minimal flavour as suggested by Bas Wijnen
+	  <wijnen at debian.org>
+
+2007-02-02 Daniel Baumann <daniel at debian.org>
+
+	* Added "--without-daemons".
+
+2007-02-01 Daniel Baumann <daniel at debian.org>
+
+	* Added "--tasks".
+	* Added desktop-base to all desktop package lists.
+
+2007-01-31 Daniel Baumann <daniel at debian.org>
+
+	* Changed vars in autobuilding script to be able to source
+	  make-live.conf.
+	* Uploaded 0.99.19.
+
+2007-01-30 Daniel Baumann <daniel at debian.org>
+
+	* Added cron job for autobuilding images.
+
+2007-01-25 Daniel Baumann <daniel at debian.org>
+
+	* Added additional pruning to minimal flavour.
+	* Using interactive frontend while processing --hook.
+	* Uploaded 0.99.18.
+
+2007-01-24 Daniel Baumann <daniel at debian.org>
+
+	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  - adding "--keyring" flag.
+	  - adding LIVE_DISK_VOLUME.
+	  - adding start-stop-daemon wrapper to avoid daemons to be started.
+	  - adding workaround to prevent binfmt locking /proc.
+	  - adding LIVE_ISOLINUX_SPLASH.
+	* Uploaded 0.99.17.
+
+2007-01-19 Daniel Baumann <daniel at debian.org>
+
+	* Replacing mkisofs with genisoimage.
+
+2007-01-18 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups.
+	* Uploaded 0.99.16.
+
+2007-01-16 Daniel Baumann <daniel at debian.org>
+
+	* Switched default distribution back to unstable, as unstable is usable
+	  again from the kernel point of view.
+	* Added file to the minimal package list.
+	* Uploaded 0.99.15.
+
+2007-01-04 Daniel Baumann <daniel at debian.org>
+
+	* Added workaround for new xorg packages by including
+	  xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
+	  lists. See #405639 for more information.
+	* Added xdebconfigurator to all X11 package lists.
+	* Adding workaround for initrd backup files.
+
+2006-11-06 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.14.
+
+2006-11-05 Daniel Baumann <daniel at debian.org>
+
+	* Applied patch from Markus Bauer <bauer-markus at web.de>:
+	  - fixing script sourcing to exclude files in .svn
+
+2006-11-03 Daniel Baumann <daniel at debian.org>
+
+	* Fixed typo in the policy-rc.d hack.
+
+2006-11-02 Daniel Baumann <daniel at debian.org>
+
+	* Using aptitude instead of apt-get.
+	* Added '--with-recommends' and '--without-recommends'.
+
+2006-11-01 Daniel Baumann <daniel at debian.org>
+
+	* Fixed regression when using -d ${CODENAME} wrt/ kernel packages.
+
+2006-10-30 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.13.
+
+2006-10-29 Daniel Baumann <daniel at debian.org>
+
+	* Added minimal-net flavour.
+
+2006-10-28 Daniel Baumann <daniel at debian.org>
+
+	* Added console-common to standard selection.
+
+2006-10-27 Daniel Baumann <daniel at debian.org>
+
+	* Added patch from Otavio Salvador <otavio at debian.org>:
+	  - fixing preseeding error-handling.
+
+2006-10-26 Daniel Baumann <daniel at debian.org>
+
+	* Added gnustep package selection based on the suggestion of
+	  Guerkan Senguen <gurkan at linuks.mine.nu>.
+
+2006-10-25 Daniel Baumann <daniel at debian.org>
+
+	* Applied patch from Marcelo D. Re <mdre at rectorado.unl.edu.ar>:
+	  - skip deb-src source-list entries when building images with
+	    --without-source.
+	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  - adding '--bootstrap-config' to support cdebootstraps
+	    '--suite-config'.
+	  - allowing override of ${BASE}.
+	  - adjust sourcing of scripts, so that only the real scripts are
+	    sourced and not other (backup) files.
+	  - allowing override of kernel-packages.
+	* Reverted mangling of LIVE_DISTRIBUTION for sources.list generation.
+
+2006-10-23 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.12.
+
+2006-10-18 Daniel Baumann <daniel at debian.org>
+
+	* Autodetecting proxy now.
+
+2006-10-16 Daniel Baumann <daniel at debian.org>
+
+	* Readded and slightly changed --clone and --preseed.
+	* Uploaded 0.99.11.
+
+2006-10-09 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups.
+	* Uploaded 0.99.10.
+
+2006-10-02 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.9.
+
+2006-10-01 Daniel Baumann <daniel at debian.org>
+
+	* Added multiple repositories.
+	* Using LIVE_PROXY_* also for bootstraping.
+
+2006-09-27 Daniel Baumann <daniel at debian.org>
+
+	* Changing manpage section.
+
+2006-09-26 Daniel Baumann <daniel at debian.org>
+
+	* Added default flavour hooks.
+	* minimal flavour does not install debian-archive-keyring to save space.
+	* Adjusted network patch.
+
+2006-09-25 Daniel Baumann <daniel at debian.org>
+
+	* Removed now unused initramfs-tools hack.
+	* Simplified xorg check based on distribution rather than version.
+	* Added fix from Bas Wijnen <wijnen at debian.org> for space handling in
+	  arguments.
+	* Fixed package list handling similar to the fix suggested by Alex Owen
+	  <r.alex.owen at gmail.com>.
+	* Uploaded 0.99.8.
+
+2006-09-24 Marco Amadori <marco.amadori at gmail.com>
+
+	* 13hack.sh: initramfs-tools hack, check added for xorg.
+
+2006-09-18 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.7.
+
+2006-09-15 Daniel Baumann <daniel at debian.org>
+
+	* Added eject to minimal package selection.
+
+2006-09-14 Daniel Baumann <daniel at debian.org>
+
+	* Adjustements for linux 2.6.17 testing propagation.
+
+2006-09-11 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.6.
+
+2006-09-08 Marco Amadori <marco.amadori at gmail.com>
+
+	* 23net.sh: Fixed binary missing directory creation.
+	* templates/iso: Moved common files to templates/common.
+
+2006-09-07 Daniel Baumann <daniel at debian.org>
+
+	* Minor cleanups.
+	* Fixed dist target.
+
+2006-09-06 Marco Amadori <marco.amadori at gmail.com>
+
+	* 14chroot.sh, main.sh: Added manifest support.
+	* 23net.sh: Added 2 variables for basenames to ease readability.
+	* main.sh, 02default.sh: Modified Usage() uses.
+
+2006-09-04 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.5.
+
+2006-09-03 Daniel Baumann <daniel at debian.org>
+
+	* Added dist parameter to easily pull images for live.debian.net.
+	* Added "--output" to specify the image name prefix.
+	* Exclude iso templates for minimal flavour.
+
+2006-09-02 Daniel Baumann <daniel at debian.org>
+
+	* Added experimental as distribution.
+	* Added source image generation.
+	* Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency.
+
+2006-08-31 Daniel Baumann <daniel at debian.org>
+
+	* Added "--disable-generic-indices" and "--enable-generic-indices".
+	* Fixed i18n lists.
+	* Rewritten all lists, comments are now possible.
+	* Lists must be now explicitly given with --package-list, no longer as
+	  last argument of the make-live call.
+	* Setting default sources.list while the image generation, restoring
+	  customized ones afterwards.
+
+2006-08-30 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups:
+	  - moved 14patch_packages.sh to 13hack.sh.
+	  - simplified 13hack.sh.
+
+2006-08-29 Marco Amadori <marco.amadori at gmail.com>
+
+	* pxelinux.cfg: Updated to right defaults, first cifs then nfs or
+	  select your favorite way. Rationale: /dev/nfs is for kernel
+	  discovering, not for initramfs discover, casper will be just fine
+	  with "netboot".
+	* 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
+	  packages, mainly for xserver-xorg so far.
+
+2006-08-28 Daniel Baumann <daniel at debian.org>
+
+	* Updated documentation.
+	* Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update
+	  pxelinux.cfg for NFS root in casper.
+	* Uploaded 0.99.4.
+
+2006-08-27 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups.
+
+2006-08-27 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added sysv init blocking policy.
+
+2006-08-22 Daniel Baumann <daniel at debian.org>
+
+	* Reorganised sources.
+	* Added staging support.
+	* Cleaned up parameter names.
+	* testing is now supported.
+
+2006-08-21 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.3.
+
+2006-08-02 Marco Amadori <marco.amadori at gmail.com>
+
+	* Rewrote netboot support.
+	* Added support for pure directory rootfs images.
+
+2006-07-31 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.2.
+
+2006-07-28 Daniel Baumann <daniel at debian.org>
+
+	* Added DEBIAN_FRONTEND to chroots(), now completely non-interactive.
+	* Fixed wrong chroot patch.
+
+2006-07-27 Marco Amadori <marco.amadori at gmail.com>
+
+	* Changed amd64 kernel naming scheme.
+
+2006-07-24 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.1.
+
+2006-07-19 Daniel Baumann <daniel at debian.org>
+
+	* Bugfixes.
+
+2006-07-18 Daniel Baumann <daniel at debian.org>
+
+	* Added iso templates.
+
+2006-07-17 Daniel Baumann <daniel at debian.org>
+
+	* Added chroot to 01-patch.sh.
+	* Added "--logfile".
+	* Uploaded 0.99.
+
+2006-07-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added "--flavour".
+
+2006-06-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added "--debug" and "--verbose".
+
+2006-06-23 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Rewritten manpages.
+
+2006-06-19 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added "--templates" options.
+	* Fixed some typos.
+
+2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* General fixes.
+
+2006-06-18 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added "-a|--architecture" and "-p|--package-list" options.
+	* Reworked how lists works.
+
+2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* General cleanup.
+
+2006-06-14 Marco Amadori <marco.amadori at gmail.com>
+
+	* Re-added "-f|--filesystem".
+
+2006-06-12 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added "--conffile", "--preseed", "--clone", and "--rootfs" options.
+
+2006-06-12 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added new splash.rle.
+	* Added memtest86+.
+	* Added "--distribution", and "--section" options.
+	* Moved /etc/default/make-live to /etc/make-live.conf.
+
+2006-06-11 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added handling of md5sums.
+
+2006-06-09 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added splashy support.
+	* Added ext2 rootfs support.
+	* Added external hook and path support.
+	* Swiched to getopt.
+
+2006-06-02 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added patch from Jason D. Clinton <me at jasonclinton.com>:
+	  - Added netboot flavour.
+	  - Thanks to SafeDesk Solutions <http://www.safedesk.com/>.
+
+2006-06-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Moved syslinux inside the chroot.
+
+2006-05-31 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added kde-*i18n and standard-i18n lists.
+
+2006-05-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added patch from Frederic Lehobey <Frederic.Lehobey at free.fr>:
+	  - Added locales to LIVE_PACKAGES.
+	  - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and
+	    LIVE_BOOTAPPEND.
+
+2006-05-27 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Initial release.

Deleted: dists/sid/live-helper/docs/ChangeLog.old
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog.old	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/docs/ChangeLog.old	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,474 +0,0 @@
-2007-03-10 Daniel Baumann <daniel at debian.org>
-
-	* Added knoppix and knoppix-dvd package lists.
-
-2007-03-09 Daniel Baumann <daniel at debian.org>
-
-	* Getting free loopdevice from inside the chroot, not outside.
-
-2007-03-09 Daniel Baumann <daniel at debian.org>
-
-	* Added kbd to all !minimal lists.
-	* Uploaded 0.99.25.
-
-2007-03-08 Otavio Salvador <otavio at debian.org>
-
-	* helpers/lh_configapt: Fix aptitude configuration to really avoid
-	  recommended packages to get installed.
-	* src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
-
-2007-03-04 Daniel Baumann <daniel at debian.org>
-
-	* Replaced removal of kernel on minimal flavours with excludes on the
-	  mksquashfs call.
-	* Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported
-	  by Mathieu Geli <mathieu.geli at gmail.com>.
-	* Exported CODENAME_* manually as reported by Cédric Lucantis
-	  <omer at no-log.org>.
-	* Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry
-	  <hendry at iki.fi>.
-	* Uploaded 0.99.24.
-
-2007-02-22 Daniel Baumann <daniel at debian.org>
-
-	* Added xresprobe to all x11 lists.
-
-2007-02-22 Daniel Baumann <daniel at debian.org>
-
-	* Applied patches from Otavio Salvador <otavio at debian.org>:
-	  - add and cleanup variable exporting in defaults.
-	  - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
-	* Uploaded 0.99.23.
-
-2007-02-21 Daniel Baumann <daniel at debian.org>
-
-	* Added gnome-junior, kde-junior and xfce-junior lists.
-	* Uploaded 0.99.22.
-
-2007-02-19 Daniel Baumann <daniel at debian.org>
-
-	* Fixed manifest.
-
-2007-02-15 Daniel Baumann <daniel at debian.org>
-
-	* Applied patch from Sebastian Raveau <sebastien.raveau at epita.fr> to
-	  add support for filesystem images encrypted with loop-aes.
-
-2007-02-13 Daniel Baumann <daniel at debian.org>
-
-	* Broken out scripts into modularized lh_* subscripts.
-
-2007-02-12 Daniel Baumann <daniel at debian.org>
-
-	* Added some code as suggested by Alex Owen <r.a.owen at qmul.ac.uk> to
-	  check if the depends (syslinux, memtest etc.) are intentionally
-	  installed in the chroot, and hence, don't remove them.
-	* Moved some depends into the chroot.
-	* Uploaded 0.99.21.
-
-2007-02-11 Daniel Baumann <daniel at debian.org>
-
-	* Added mini flavour.
-
-2007-02-10 Daniel Baumann <daniel at debian.org>
-
-	* Added legacy code for genisoimage.
-	* Uploaded 0.99.20.
-
-2007-02-09 Daniel Baumann <daniel at debian.org>
-
-	* Added usb type.
-
-2007-02-08 Daniel Baumann <daniel at debian.org>
-
-	* Added desktop task to the *-desktop flavours.
-
-2007-02-07 Daniel Baumann <daniel at debian.org>
-
-	* Extended cron job a bit.
-	* Fixed manual pruning in minimal flavour as suggested by Bas Wijnen
-	  <wijnen at debian.org>
-
-2007-02-02 Daniel Baumann <daniel at debian.org>
-
-	* Added "--without-daemons".
-
-2007-02-01 Daniel Baumann <daniel at debian.org>
-
-	* Added "--tasks".
-	* Added desktop-base to all desktop package lists.
-
-2007-01-31 Daniel Baumann <daniel at debian.org>
-
-	* Changed vars in autobuilding script to be able to source
-	  make-live.conf.
-	* Uploaded 0.99.19.
-
-2007-01-30 Daniel Baumann <daniel at debian.org>
-
-	* Added cron job for autobuilding images.
-
-2007-01-25 Daniel Baumann <daniel at debian.org>
-
-	* Added additional pruning to minimal flavour.
-	* Using interactive frontend while processing --hook.
-	* Uploaded 0.99.18.
-
-2007-01-24 Daniel Baumann <daniel at debian.org>
-
-	* Applied patches from Otavio Salvador <otavio at debian.org>:
-	  - adding "--keyring" flag.
-	  - adding LIVE_DISK_VOLUME.
-	  - adding start-stop-daemon wrapper to avoid daemons to be started.
-	  - adding workaround to prevent binfmt locking /proc.
-	  - adding LIVE_ISOLINUX_SPLASH.
-	* Uploaded 0.99.17.
-
-2007-01-19 Daniel Baumann <daniel at debian.org>
-
-	* Replacing mkisofs with genisoimage.
-
-2007-01-18 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups.
-	* Uploaded 0.99.16.
-
-2007-01-16 Daniel Baumann <daniel at debian.org>
-
-	* Switched default distribution back to unstable, as unstable is usable
-	  again from the kernel point of view.
-	* Added file to the minimal package list.
-	* Uploaded 0.99.15.
-
-2007-01-04 Daniel Baumann <daniel at debian.org>
-
-	* Added workaround for new xorg packages by including
-	  xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
-	  lists. See #405639 for more information.
-	* Added xdebconfigurator to all X11 package lists.
-	* Adding workaround for initrd backup files.
-
-2006-11-06 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.14.
-
-2006-11-05 Daniel Baumann <daniel at debian.org>
-
-	* Applied patch from Markus Bauer <bauer-markus at web.de>:
-	  - fixing script sourcing to exclude files in .svn
-
-2006-11-03 Daniel Baumann <daniel at debian.org>
-
-	* Fixed typo in the policy-rc.d hack.
-
-2006-11-02 Daniel Baumann <daniel at debian.org>
-
-	* Using aptitude instead of apt-get.
-	* Added '--with-recommends' and '--without-recommends'.
-
-2006-11-01 Daniel Baumann <daniel at debian.org>
-
-	* Fixed regression when using -d ${CODENAME} wrt/ kernel packages.
-
-2006-10-30 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.13.
-
-2006-10-29 Daniel Baumann <daniel at debian.org>
-
-	* Added minimal-net flavour.
-
-2006-10-28 Daniel Baumann <daniel at debian.org>
-
-	* Added console-common to standard selection.
-
-2006-10-27 Daniel Baumann <daniel at debian.org>
-
-	* Added patch from Otavio Salvador <otavio at debian.org>:
-	  - fixing preseeding error-handling.
-
-2006-10-26 Daniel Baumann <daniel at debian.org>
-
-	* Added gnustep package selection based on the suggestion of
-	  Guerkan Senguen <gurkan at linuks.mine.nu>.
-
-2006-10-25 Daniel Baumann <daniel at debian.org>
-
-	* Applied patch from Marcelo D. Re <mdre at rectorado.unl.edu.ar>:
-	  - skip deb-src source-list entries when building images with
-	    --without-source.
-	* Applied patches from Otavio Salvador <otavio at debian.org>:
-	  - adding '--bootstrap-config' to support cdebootstraps
-	    '--suite-config'.
-	  - allowing override of ${BASE}.
-	  - adjust sourcing of scripts, so that only the real scripts are
-	    sourced and not other (backup) files.
-	  - allowing override of kernel-packages.
-	* Reverted mangling of LIVE_DISTRIBUTION for sources.list generation.
-
-2006-10-23 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.12.
-
-2006-10-18 Daniel Baumann <daniel at debian.org>
-
-	* Autodetecting proxy now.
-
-2006-10-16 Daniel Baumann <daniel at debian.org>
-
-	* Readded and slightly changed --clone and --preseed.
-	* Uploaded 0.99.11.
-
-2006-10-09 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups.
-	* Uploaded 0.99.10.
-
-2006-10-02 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.9.
-
-2006-10-01 Daniel Baumann <daniel at debian.org>
-
-	* Added multiple repositories.
-	* Using LIVE_PROXY_* also for bootstraping.
-
-2006-09-27 Daniel Baumann <daniel at debian.org>
-
-	* Changing manpage section.
-
-2006-09-26 Daniel Baumann <daniel at debian.org>
-
-	* Added default flavour hooks.
-	* minimal flavour does not install debian-archive-keyring to save space.
-	* Adjusted network patch.
-
-2006-09-25 Daniel Baumann <daniel at debian.org>
-
-	* Removed now unused initramfs-tools hack.
-	* Simplified xorg check based on distribution rather than version.
-	* Added fix from Bas Wijnen <wijnen at debian.org> for space handling in
-	  arguments.
-	* Fixed package list handling similar to the fix suggested by Alex Owen
-	  <r.alex.owen at gmail.com>.
-	* Uploaded 0.99.8.
-
-2006-09-24 Marco Amadori <marco.amadori at gmail.com>
-
-	* 13hack.sh: initramfs-tools hack, check added for xorg.
-
-2006-09-18 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.7.
-
-2006-09-15 Daniel Baumann <daniel at debian.org>
-
-	* Added eject to minimal package selection.
-
-2006-09-14 Daniel Baumann <daniel at debian.org>
-
-	* Adjustements for linux 2.6.17 testing propagation.
-
-2006-09-11 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.6.
-
-2006-09-08 Marco Amadori <marco.amadori at gmail.com>
-
-	* 23net.sh: Fixed binary missing directory creation.
-	* templates/iso: Moved common files to templates/common.
-
-2006-09-07 Daniel Baumann <daniel at debian.org>
-
-	* Minor cleanups.
-	* Fixed dist target.
-
-2006-09-06 Marco Amadori <marco.amadori at gmail.com>
-
-	* 14chroot.sh, main.sh: Added manifest support.
-	* 23net.sh: Added 2 variables for basenames to ease readability.
-	* main.sh, 02default.sh: Modified Usage() uses.
-
-2006-09-04 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.5.
-
-2006-09-03 Daniel Baumann <daniel at debian.org>
-
-	* Added dist parameter to easily pull images for live.debian.net.
-	* Added "--output" to specify the image name prefix.
-	* Exclude iso templates for minimal flavour.
-
-2006-09-02 Daniel Baumann <daniel at debian.org>
-
-	* Added experimental as distribution.
-	* Added source image generation.
-	* Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency.
-
-2006-08-31 Daniel Baumann <daniel at debian.org>
-
-	* Added "--disable-generic-indices" and "--enable-generic-indices".
-	* Fixed i18n lists.
-	* Rewritten all lists, comments are now possible.
-	* Lists must be now explicitly given with --package-list, no longer as
-	  last argument of the make-live call.
-	* Setting default sources.list while the image generation, restoring
-	  customized ones afterwards.
-
-2006-08-30 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups:
-	  - moved 14patch_packages.sh to 13hack.sh.
-	  - simplified 13hack.sh.
-
-2006-08-29 Marco Amadori <marco.amadori at gmail.com>
-
-	* pxelinux.cfg: Updated to right defaults, first cifs then nfs or
-	  select your favorite way. Rationale: /dev/nfs is for kernel
-	  discovering, not for initramfs discover, casper will be just fine
-	  with "netboot".
-	* 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
-	  packages, mainly for xserver-xorg so far.
-
-2006-08-28 Daniel Baumann <daniel at debian.org>
-
-	* Updated documentation.
-	* Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update
-	  pxelinux.cfg for NFS root in casper.
-	* Uploaded 0.99.4.
-
-2006-08-27 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups.
-
-2006-08-27 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added sysv init blocking policy.
-
-2006-08-22 Daniel Baumann <daniel at debian.org>
-
-	* Reorganised sources.
-	* Added staging support.
-	* Cleaned up parameter names.
-	* testing is now supported.
-
-2006-08-21 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.3.
-
-2006-08-02 Marco Amadori <marco.amadori at gmail.com>
-
-	* Rewrote netboot support.
-	* Added support for pure directory rootfs images.
-
-2006-07-31 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.2.
-
-2006-07-28 Daniel Baumann <daniel at debian.org>
-
-	* Added DEBIAN_FRONTEND to chroots(), now completely non-interactive.
-	* Fixed wrong chroot patch.
-
-2006-07-27 Marco Amadori <marco.amadori at gmail.com>
-
-	* Changed amd64 kernel naming scheme.
-
-2006-07-24 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.1.
-
-2006-07-19 Daniel Baumann <daniel at debian.org>
-
-	* Bugfixes.
-
-2006-07-18 Daniel Baumann <daniel at debian.org>
-
-	* Added iso templates.
-
-2006-07-17 Daniel Baumann <daniel at debian.org>
-
-	* Added chroot to 01-patch.sh.
-	* Added "--logfile".
-	* Uploaded 0.99.
-
-2006-07-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added "--flavour".
-
-2006-06-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added "--debug" and "--verbose".
-
-2006-06-23 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Rewritten manpages.
-
-2006-06-19 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added "--templates" options.
-	* Fixed some typos.
-
-2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* General fixes.
-
-2006-06-18 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added "-a|--architecture" and "-p|--package-list" options.
-	* Reworked how lists works.
-
-2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* General cleanup.
-
-2006-06-14 Marco Amadori <marco.amadori at gmail.com>
-
-	* Re-added "-f|--filesystem".
-
-2006-06-12 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added "--conffile", "--preseed", "--clone", and "--rootfs" options.
-
-2006-06-12 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added new splash.rle.
-	* Added memtest86+.
-	* Added "--distribution", and "--section" options.
-	* Moved /etc/default/make-live to /etc/make-live.conf.
-
-2006-06-11 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added handling of md5sums.
-
-2006-06-09 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added splashy support.
-	* Added ext2 rootfs support.
-	* Added external hook and path support.
-	* Swiched to getopt.
-
-2006-06-02 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added patch from Jason D. Clinton <me at jasonclinton.com>:
-	  - Added netboot flavour.
-	  - Thanks to SafeDesk Solutions <http://www.safedesk.com/>.
-
-2006-06-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Moved syslinux inside the chroot.
-
-2006-05-31 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added kde-*i18n and standard-i18n lists.
-
-2006-05-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added patch from Frederic Lehobey <Frederic.Lehobey at free.fr>:
-	  - Added locales to LIVE_PACKAGES.
-	  - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and
-	    LIVE_BOOTAPPEND.
-
-2006-05-27 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Initial release.

Deleted: dists/sid/live-helper/docs/NEWS
===================================================================
--- dists/trunk/live-helper/docs/NEWS	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/docs/NEWS	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,40 +0,0 @@
-News:
-
-  * 2006-02-14: Project announcement.
-    http://blog.daniel-baumann.ch/2006/02/14#20060214_debian-live-initiative
-
-  * 2006-02-28: Setup project resources.
-    http://blog.daniel-baumann.ch/2006/02/28#20060228_debian-live-resources
-
-  * 2006-03-16: Added support for ISO image generation.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-March/000048.html
-
-  * 2006-06-02: Added support for netboot image generation.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-May/000185.html
-
-  * 2006-07-17: Uploaded first live-package to Debian unstable.
-    http://packages.debian.org/changelogs/pool/main/l/live-package/current/changelog#versionversion0.99-1
-
-  * 2007-02-05: Setup image autobuild server.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000764.html
-
-  * 2007-02-10: Added support for USB image generation.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000790.html
-
-  * 2007-02-17: Added support for encrypted live filesystem.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html
-
-  * 2007-03-12: Uploaded first live-helper to Debian unstable.
-    http://packages.debian.org/changelogs/pool/main/l/live-helper/current/changelog#versionversion1.0_a1-1
-
-  * 2007-03-14: live-package is dead, long lives live-helper
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-March/000998.html
-
-  * 2007-04-19: Google Summer of Code 2007
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html
-
-  * 2007-04-26: New website design
-    http://www.chris-lamb.co.uk/blog/2007/04/26/pimp-your-webpage/
-
-  * 2007-04-30: Uploaded first live-initramfs to Debian unstable.
-    http://packages.debian.org/changelogs/pool/main/l/live-initramfs/current/changelog#versionversion1.87.1-1

Copied: dists/sid/live-helper/docs/NEWS (from rev 1690, dists/trunk/live-helper/docs/NEWS)
===================================================================
--- dists/sid/live-helper/docs/NEWS	                        (rev 0)
+++ dists/sid/live-helper/docs/NEWS	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,44 @@
+News:
+
+  * 2006-02-14: Project announcement.
+    http://blog.daniel-baumann.ch/2006/02/14#20060214_debian-live-initiative
+
+  * 2006-02-28: Setup project resources.
+    http://blog.daniel-baumann.ch/2006/02/28#20060228_debian-live-resources
+
+  * 2006-03-16: Added support for ISO image generation.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-March/000048.html
+
+  * 2006-06-02: Added support for netboot image generation.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-May/000185.html
+
+  * 2006-07-17: Uploaded first live-package to Debian unstable.
+    http://packages.debian.org/changelogs/pool/main/l/live-package/current/changelog#versionversion0.99-1
+
+  * 2007-02-05: Setup image autobuild server.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000764.html
+
+  * 2007-02-10: Added support for USB image generation.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000790.html
+
+  * 2007-02-17: Added support for encrypted live filesystem.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html
+
+  * 2007-03-12: Uploaded first live-helper to Debian unstable.
+    http://packages.debian.org/changelogs/pool/main/l/live-helper/current/changelog#versionversion1.0_a1-1
+
+  * 2007-03-14: live-package is dead, long lives live-helper
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-March/000998.html
+
+  * 2007-04-19: Google Summer of Code 2007
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html
+
+  * 2007-04-26: New website design
+    http://www.chris-lamb.co.uk/blog/2007/04/26/pimp-your-webpage/
+
+  * 2007-04-30: Uploaded first live-initramfs to Debian unstable.
+    http://packages.debian.org/changelogs/pool/main/l/live-initramfs/current/changelog#versionversion1.87.1-1
+
+  * 2007-05-24: casper is dead, long lives live-initramfs.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-May/001392.html
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-May/001393.html

Deleted: dists/sid/live-helper/docs/TODO
===================================================================
--- dists/trunk/live-helper/docs/TODO	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/docs/TODO	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,54 +0,0 @@
-TODO list for live-helper
--------------------------
-
-This file lists only outstanding tasks. Any additions/comments/questions and
-help is welcome. Write to <debian-live-devel at lists.alioth.debian.org>.
-
-
-1.0~a10-1:
-  * add compat code for old syslinux
-
-1.0~a10-1:
-  * reordering content of configuration files
-
-ALPHA series:
-
-FIXME
-  * xfce flavours seem to be damaged again
-  * multi-kernel syslinux fuckup
-  * d-i/g-i pool generation on the media
-  * yaboot (powerpc) boot support
-  * grub (i386/amd64) boot support on usb* binary images
-  * grub (i386/amd64) boot support on net binary images
-  * multi-binary builds in one shot
-  * vmlinu[xz]
-  * breakpoints (yes/no/all/type)
-  * check unset variables
-
-ADDME
-  * vmware binary image flavour
-  * usb-zip binary image flavour
-  * support splitted/partial squashfs images
-  * a fetch everything, then build option
-  * introduce package groups
-  * multi-arch for amd64/i386/powerpc on one medium
-  * logfiles
-  * re-import lh_clone/lh_preseed
-  * Add win32 loader
-
-BETA series:
-
-FIXME
-  * check all Require_stagefile calls
-  * make helpers call required stages when needed
-  * integrate lh_chroot_hacks
-  * cleanup variable names
-  * write manpage and documentation/manual
-
-POST 1.0:
-
-  * Add win32 autorun like
-    http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/cdrom-misc/autorun/
-  * Add loadlin or qemu batch
-  * Adding colinux?
-  * exec wrapper for output hiding/handling

Copied: dists/sid/live-helper/docs/TODO (from rev 1728, dists/trunk/live-helper/docs/TODO)
===================================================================
--- dists/sid/live-helper/docs/TODO	                        (rev 0)
+++ dists/sid/live-helper/docs/TODO	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,50 @@
+TODO list for live-helper
+-------------------------
+
+This file lists only outstanding tasks. Any additions/comments/questions and
+help is welcome. Write to <debian-live-devel at lists.alioth.debian.org>.
+
+1.0~a12-1:
+  * reordering content of configuration files
+
+ALPHA series:
+
+FIXME
+  * xfce flavours seem to be damaged again
+  * multi-kernel syslinux fuckup
+  * d-i/g-i pool generation on the media
+  * yaboot (powerpc) boot support
+  * grub (i386/amd64) boot support on usb* binary images
+  * grub (i386/amd64) boot support on net binary images
+  * multi-binary builds in one shot
+  * vmlinu[xz]
+  * breakpoints (yes/no/all/type)
+  * check unset variables
+
+ADDME
+  * vmware binary image flavour
+  * usb-zip binary image flavour
+  * support splitted/partial squashfs images
+  * a fetch everything, then build option
+  * introduce package groups
+  * multi-arch for amd64/i386/powerpc on one medium
+  * logfiles
+  * re-import lh_clone/lh_preseed
+  * Add win32 loader
+
+BETA series:
+
+FIXME
+  * check all Require_stagefile calls
+  * make helpers call required stages when needed
+  * integrate lh_chroot_hacks
+  * cleanup variable names
+  * write manpage and documentation/manual
+
+POST 1.0:
+
+  * Add win32 autorun like
+    http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/cdrom-misc/autorun/
+  * Add loadlin or qemu batch
+  * Adding colinux?
+  * exec wrapper for output hiding/handling

Deleted: dists/sid/live-helper/examples/cron/daily.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/daily.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/examples/cron/daily.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,166 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="daily"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="`date +%Y%m%d`"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="sid"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: dists/sid/live-helper/examples/cron/daily.sh (from rev 1681, dists/trunk/live-helper/examples/cron/daily.sh)
===================================================================
--- dists/sid/live-helper/examples/cron/daily.sh	                        (rev 0)
+++ dists/sid/live-helper/examples/cron/daily.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,166 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="daily"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="`date +%Y%m%d`"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs live-initramfs"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="sid"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: dists/sid/live-helper/examples/cron/etch+beryl.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/etch+beryl.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/examples/cron/etch+beryl.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,175 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="etch+beryl"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="r0_1.0~a10-1"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="etch"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Beryl hook
-				mkdir -p debian-live/config/chroot_local-hooks
-				cp /usr/share/live-helper/examples/hooks/beryl.sh debian-live/config/chroot_local-hooks/beryl.sh
-				mkdir -p debian-live/config/chroot_sources
-				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg
-				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg
-				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.build
-				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.image
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: dists/sid/live-helper/examples/cron/etch+beryl.sh (from rev 1681, dists/trunk/live-helper/examples/cron/etch+beryl.sh)
===================================================================
--- dists/sid/live-helper/examples/cron/etch+beryl.sh	                        (rev 0)
+++ dists/sid/live-helper/examples/cron/etch+beryl.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,175 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="etch+beryl"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="r0_1.0~a11-1"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs casper"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="etch"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Beryl hook
+				mkdir -p debian-live/config/chroot_local-hooks
+				cp /usr/share/live-helper/examples/hooks/beryl.sh debian-live/config/chroot_local-hooks/beryl.sh
+				mkdir -p debian-live/config/chroot_sources
+				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg
+				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg
+				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.build
+				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.image
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: dists/sid/live-helper/examples/cron/etch.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/etch.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/examples/cron/etch.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,166 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="etch"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="r0_1.0~a10-1"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="etch"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: dists/sid/live-helper/examples/cron/etch.sh (from rev 1681, dists/trunk/live-helper/examples/cron/etch.sh)
===================================================================
--- dists/sid/live-helper/examples/cron/etch.sh	                        (rev 0)
+++ dists/sid/live-helper/examples/cron/etch.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,166 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="etch"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="r0_1.0~a11-1"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs casper"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="etch"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: dists/sid/live-helper/examples/cron/weekly.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/weekly.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/examples/cron/weekly.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,166 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="weekly"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="`date +%Y%m%d`"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="lenny"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: dists/sid/live-helper/examples/cron/weekly.sh (from rev 1681, dists/trunk/live-helper/examples/cron/weekly.sh)
===================================================================
--- dists/sid/live-helper/examples/cron/weekly.sh	                        (rev 0)
+++ dists/sid/live-helper/examples/cron/weekly.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,166 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="weekly"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="`date +%Y%m%d`"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs casper"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="lenny"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: dists/sid/live-helper/functions/common.sh
===================================================================
--- dists/trunk/live-helper/functions/common.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/functions/common.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# common.sh - common things for all live-helpers
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-PROGRAM="`basename ${0}`"
-VERSION="1.0~a10"

Copied: dists/sid/live-helper/functions/common.sh (from rev 1679, dists/trunk/live-helper/functions/common.sh)
===================================================================
--- dists/sid/live-helper/functions/common.sh	                        (rev 0)
+++ dists/sid/live-helper/functions/common.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# common.sh - common things for all live-helpers
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+PROGRAM="`basename ${0}`"
+VERSION="1.0~a11"

Deleted: dists/sid/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/lh_binary_debian-installer	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,250 +0,0 @@
-#!/bin/sh
-
-# lh_binary_debian-installer(1) - install debian-installer into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install debian-installer into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_debian-installer: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_debian-installer
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/install"
-		DESTDIR_INSTALLER="cdrom"
-		;;
-
-	net)
-		DESTDIR="tftpboot"
-		DESTDIR_INSTALLER="netboot"
-
-		Echo_error "Not supported yet (FIXME)"
-		exit 1
-		;;
-
-	usb-hdd|hdd)
-		DESTDIR="binary/install"
-		DESTDIR_INSTALLER="hd-media"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR="${DESTDIR}.amd"
-				;;
-
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-
-			powerpc)
-				DESTDIR="${DESTDIR}.ppc"
-				;;
-		esac
-	fi
-fi
-
-# Downloading debian-installer
-mkdir -p "${DESTDIR}"
-
-wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
-
-# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-then
-	mkdir -p "${DESTDIR}"/gtk
-
-	wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
-	wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
-fi
-
-FIXME ()
-{
-# Downloading udebs
-mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-cd "${OLDPWD}"
-
-for DISTRIBUTION in frozen stable testing unstable
-do
-	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
-
-DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
-UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
-
-rm -f packages.di
-
-for UDEB in ${UDEBS}
-do
-	mkdir -p binary/`dirname ${UDEB}`
-	cd binary/`dirname ${UDEB}`
-	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
-	cd "${OLDPWD}"
-done
-
-# Downloading debs
-if [ -d cache/packages_bootstrap ]
-then
-	for FILE in cache/packages_bootstrap/*.deb
-	do
-		SOURCE="`dpkg -f ${FILE} Source`"
-
-		if [ -z "${SOURCE}" ]
-		then
-			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
-		fi
-
-		case "${SOURCE}" in
-			lib?*)
-				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
-				;;
-
-			*)
-				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
-				;;
-		esac
-
-		# Install directory
-		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
-		# Move files
-		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
-	done
-fi
-
-mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
-
-cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
-Archive: ${LIVE_DISTRIBUTION}
-Component: main
-Origin: Debian
-Label: Debian
-Architecture: ${LIVE_ARCHITECTURE}
-EOF
-
-mkdir -p cache/indices_debian-installer
-
-cat > cache/indices_debian-installer/archive << EOF
-Dir
-{
-	ArchiveDir	"binary";
-	// OverrideDir	"";
-	// CacheDir	"";
-	FileListDir	"cache/indices_debian-installer";
-};
-
-Default
-{
-	Packages::Compress	". gzip";
-	// Packages::Extension	".deb";
-	// Sources::Extensions	".dsc";
-	// Contents::Compress	"gzip";
-	// DeLinkLimit		"0";
-	// FileMode		"0644";
-};
-
-TreeDefault
-{
-	// MaxContentsChange
-	// ContentsAge
-	Directory		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
-	Packages		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
-	InternalPrefix		"dists/\$(DIST)/\$(SECTION)/";
-	Contents		"dists/\$(DIST)/Contents-\$(ARCH)";
-	// Contents::Header
-	// BinCacheDB		"cache.\$(DIST).\$(SECTION).\$(ARCH)";
-	// FileList		"filelist.\$(DIST).\$(SECTION).\$(ARCH)";
-	FileList		"filelist";
-	// BinOverride		"override.\$(DIST).\$(SECTION)";
-};
-
-tree "${LIVE_DISTRIBUTION}"
-{
-	Sections	"main";
-	Architectures	"${LIVE_ARCHITECTURE}";
-};
-EOF
-
-cd binary
-find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
-cd "${OLDPWD}"
-
-cat > cache/indices_debian-installer/release << EOF
-APT::FTPArchive::Release::Origin	"Debian";
-APT::FTPArchive::Release::Label		"Debian";
-APT::FTPArchive::Release::Suite		"${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Version	"4.0";
-APT::FTPArchive::Release::Codename	"${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Date		"`date -R`";
-APT::FTPArchive::Release::Architectures	"${LIVE_ARCHITECTURE}";
-APT::FTPArchive::Release::Components	"main";
-EOF
-
-apt-ftparchive generate cache/indices_debian-installer/archive
-apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-}
-
-mkdir binary/.disk
-echo "main" > binary/.disk/base_components
-touch binary/.disk/base_installable
-echo "not_complete" > binary/.disk/cd_type
-#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
-touch binary/.disk/mkisofs
-
-# Creating stage file
-Create_stagefile .stage/binary_debian-installer

Copied: dists/sid/live-helper/helpers/lh_binary_debian-installer (from rev 1730, dists/trunk/live-helper/helpers/lh_binary_debian-installer)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_debian-installer	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_debian-installer	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,304 @@
+#!/bin/sh
+
+# lh_binary_debian-installer(1) - install debian-installer into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="install debian-installer into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_debian-installer: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_debian-installer
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/install"
+		DESTDIR_INSTALLER="cdrom"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		DESTDIR_INSTALLER="netboot"
+
+		Echo_error "Not supported yet (FIXME)"
+		exit 1
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				DESTDIR="binary"
+			else
+				DESTDIR="binary/install"
+			fi
+		else
+			DESTDIR="binary/install"
+		fi
+
+		DESTDIR_INSTALLER="hd-media"
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+
+			powerpc)
+				DESTDIR="${DESTDIR}.ppc"
+				;;
+		esac
+	fi
+fi
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR}"
+
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+then
+	if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+	then
+		if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+		then
+			wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+		else
+			wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+		fi
+	else
+		wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+		wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+	fi
+else
+	wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+fi
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+	then
+		if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+				wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+			else
+				mkdir -p "${DESTDIR}"/gtk
+
+				wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+				wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+			fi
+		else
+			mkdir -p "${DESTDIR}"/gtk
+
+			wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+		fi
+	else
+		mkdir -p "${DESTDIR}"/gtk
+
+		wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+		wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+	fi
+fi
+
+FIXME ()
+{
+# Downloading udebs
+mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+cd "${OLDPWD}"
+
+for DISTRIBUTION in frozen stable testing unstable
+do
+	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
+
+DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
+UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
+
+rm -f packages.di
+
+for UDEB in ${UDEBS}
+do
+	mkdir -p binary/`dirname ${UDEB}`
+	cd binary/`dirname ${UDEB}`
+	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+	cd "${OLDPWD}"
+done
+
+# Downloading debs
+if [ -d cache/packages_bootstrap ]
+then
+	for FILE in cache/packages_bootstrap/*.deb
+	do
+		SOURCE="`dpkg -f ${FILE} Source`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+	done
+fi
+
+mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+
+cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
+Archive: ${LIVE_DISTRIBUTION}
+Component: main
+Origin: Debian
+Label: Debian
+Architecture: ${LIVE_ARCHITECTURE}
+EOF
+
+mkdir -p cache/indices_debian-installer
+
+cat > cache/indices_debian-installer/archive << EOF
+Dir
+{
+	ArchiveDir	"binary";
+	// OverrideDir	"";
+	// CacheDir	"";
+	FileListDir	"cache/indices_debian-installer";
+};
+
+Default
+{
+	Packages::Compress	". gzip";
+	// Packages::Extension	".deb";
+	// Sources::Extensions	".dsc";
+	// Contents::Compress	"gzip";
+	// DeLinkLimit		"0";
+	// FileMode		"0644";
+};
+
+TreeDefault
+{
+	// MaxContentsChange
+	// ContentsAge
+	Directory		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
+	Packages		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
+	InternalPrefix		"dists/\$(DIST)/\$(SECTION)/";
+	Contents		"dists/\$(DIST)/Contents-\$(ARCH)";
+	// Contents::Header
+	// BinCacheDB		"cache.\$(DIST).\$(SECTION).\$(ARCH)";
+	// FileList		"filelist.\$(DIST).\$(SECTION).\$(ARCH)";
+	FileList		"filelist";
+	// BinOverride		"override.\$(DIST).\$(SECTION)";
+};
+
+tree "${LIVE_DISTRIBUTION}"
+{
+	Sections	"main";
+	Architectures	"${LIVE_ARCHITECTURE}";
+};
+EOF
+
+cd binary
+find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
+cd "${OLDPWD}"
+
+cat > cache/indices_debian-installer/release << EOF
+APT::FTPArchive::Release::Origin	"Debian";
+APT::FTPArchive::Release::Label		"Debian";
+APT::FTPArchive::Release::Suite		"${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Version	"4.0";
+APT::FTPArchive::Release::Codename	"${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Date		"`date -R`";
+APT::FTPArchive::Release::Architectures	"${LIVE_ARCHITECTURE}";
+APT::FTPArchive::Release::Components	"main";
+EOF
+
+apt-ftparchive generate cache/indices_debian-installer/archive
+apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+}
+
+mkdir binary/.disk
+echo "main" > binary/.disk/base_components
+touch binary/.disk/base_installable
+echo "not_complete" > binary/.disk/cd_type
+#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
+touch binary/.disk/mkisofs
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer

Deleted: dists/sid/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/lh_binary_grub	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,252 +0,0 @@
-#!/bin/sh
-
-# lh_binary_grub(1) - installs grub into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs grub into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "grub" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_grub: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_grub
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_grub, foreign architecture."
-	exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Check local templates
-if [ -d config/templates/grub ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/sbin/grub grub
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso|usb-hdd|hdd)
-		DESTDIR_LIVE="binary/live"
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	net)
-		Echo_error "not supported, aborting (FIXME)."
-		exit 1
-	;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
-				;;
-
-			i386)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR_LIVE}" ]
-then
-	mkdir -p "${DESTDIR_LIVE}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
-
-# Assembling kernel configuration
-DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-
-LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz*
-	do
-		if [ -z "${LINUX}" ]
-		then
-			LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-		else
-			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-		fi
-	done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
-	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
-
-	LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-fi
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
-	MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
-	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-fi
-
-# Copying templates
-mkdir -p binary/boot/grub
-cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
-
-# Copyring grub
-case ${LIVE_BINARY_IMAGES} in
-	iso)
-		cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
-		;;
-
-	usb-hdd|hdd)
-		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
-		;;
-esac
-
-# Copying splash screen
-if [ -f config/binary_grub/splash.xpm.gz ]
-then
-	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
-fi
-
-if [ -n "${LIVE_GRUB_SPLASH}" ]
-then
-	if [ "${LIVE_GRUB_SPLASH}" = "none" ]
-	then
-		# Removing splash file
-		rm -f binary/boot/grub/splash.xpm.gz
-
-		# Removing splash entry
-		sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
-	else
-		# Overwriting splash file
-		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
-	fi
-fi
-
-# Configure grub templates
-cat >> binary/boot/grub/menu.lst << EOF
-
-title		Other:
-root
-
-LIVE_MEMTEST
-EOF
-
-sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
-sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_grub

Copied: dists/sid/live-helper/helpers/lh_binary_grub (from rev 1726, dists/trunk/live-helper/helpers/lh_binary_grub)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_grub	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_grub	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,293 @@
+#!/bin/sh
+
+# lh_binary_grub(1) - installs grub into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs grub into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "grub" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_grub: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_grub
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_grub, foreign architecture."
+	exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+	if [ -d ../"${LIVE_TEMPLATES}" ]
+	then
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+fi
+
+# Check local templates
+if [ -d config/templates/grub ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/sbin/grub grub
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso|usb-hdd|hdd)
+		DESTDIR_LIVE="binary/live"
+		DESTDIR_INSTALL="binary/install"
+		;;
+
+	net)
+		Echo_error "not supported, aborting (FIXME)."
+		exit 1
+	;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+				;;
+
+			i386)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR_LIVE}" ]
+then
+	mkdir -p "${DESTDIR_LIVE}"
+fi
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_USERNAME}" != "user" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	case "${LIVE_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_HOSTNAME}" != "debian" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+
+# Assembling kernel configuration
+DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+
+LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
+LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+		else
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+		fi
+	done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
+
+	LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+fi
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+	MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
+	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+# Copying templates
+mkdir -p binary/boot/grub
+cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
+
+# Copyring grub
+case ${LIVE_BINARY_IMAGES} in
+	iso)
+		cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
+		;;
+
+	usb-hdd|hdd)
+		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
+		;;
+esac
+
+# Copying splash screen
+if [ -f config/binary_grub/splash.xpm.gz ]
+then
+	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+fi
+
+if [ -n "${LIVE_GRUB_SPLASH}" ]
+then
+	if [ "${LIVE_GRUB_SPLASH}" = "none" ]
+	then
+		# Removing splash file
+		rm -f binary/boot/grub/splash.xpm.gz
+
+		# Removing splash entry
+		sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
+	else
+		# Overwriting splash file
+		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
+	fi
+fi
+
+# Configure grub templates
+cat >> binary/boot/grub/menu.lst << EOF
+
+title		Other:
+root
+
+LIVE_MEMTEST
+EOF
+
+sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_grub

Deleted: dists/sid/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/lh_binary_includes	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# lh_binary_includes(1) - copy files into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="copy files into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_INCLUDES}" = "none" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_includes: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check user includes
-if [ ! -d "${LIVE_INCLUDES}" ]
-then
-	if [ -d ../"${LIVE_INCLUDES}" ]
-	then
-		LIVE_INCLUDES="../${LIVE_INCLUDES}"
-	else
-		Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
-		exit 1
-	fi
-fi
-
-# Checking local includes
-if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
-then
-	LIVE_INCLUDES="config/includes"
-fi
-
-# Assemble architecture
-case "${LIVE_ARCHITECTURE}" in
-	amd64)
-		ARCH="amd"
-		;;
-
-	i386)
-		ARCH="386"
-		;;
-
-	powerpc)
-		ARCH="ppc"
-		;;
-esac
-
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
-	# Working arround vfat limitations
-	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
-	then
-		CP_OPTIONS="-L"
-	fi
-
-	# Copying d-i templates
-	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
-	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
-	then
-		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
-	fi
-
-	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
-	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
-	then
-		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
-	fi
-
-	# Adjusting d-i templates
-	DEBIAN_NAME="/Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
-	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
-
-	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
-	then
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
-		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
-	else
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
-		DEBIAN_TOOLS_TXT="/tools/"
-	fi
-
-	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
-	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_includes

Copied: dists/sid/live-helper/helpers/lh_binary_includes (from rev 1727, dists/trunk/live-helper/helpers/lh_binary_includes)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_includes	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_includes	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# lh_binary_includes(1) - copy files into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="copy files into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_INCLUDES}" = "none" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_includes: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check user includes
+if [ ! -d "${LIVE_INCLUDES}" ]
+then
+	if [ -d ../"${LIVE_INCLUDES}" ]
+	then
+		LIVE_INCLUDES="../${LIVE_INCLUDES}"
+	else
+		Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
+		exit 1
+	fi
+fi
+
+# Checking local includes
+if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
+then
+	LIVE_INCLUDES="config/includes"
+fi
+
+# Assemble architecture
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		ARCH="amd"
+		;;
+
+	i386)
+		ARCH="386"
+		;;
+
+	powerpc)
+		ARCH="ppc"
+		;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+	# Working arround vfat limitations
+	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+	then
+		CP_OPTIONS="-L"
+	fi
+
+	# Copying d-i templates
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+	then
+		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+	fi
+
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+	then
+		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+	fi
+
+	# Adjusting d-i templates
+	DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+	then
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
+	else
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+		DEBIAN_TOOLS_TXT="/tools/"
+	fi
+
+	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
+	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_includes

Deleted: dists/sid/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/lh_binary_linux-image	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# lh_binary_linux-image(1) - install linux-image into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install linux-image into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "binary_linux-image: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_linux-image
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Removing initrd backup files
-rm -f chroot/boot/initrd*bak*
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/live"
-		;;
-
-	net)
-		DESTDIR="tftpboot"
-		;;
-
-	usb-hdd|hdd)
-		DESTDIR="binary/live"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR="${DESTDIR}.amd"
-				;;
-
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-
-			powerpc)
-				DESTDIR="${DESTDIR}.ppc"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
-	mkdir -p "${DESTDIR}"
-fi
-
-# Installing linux-image
-cp chroot/boot/vmlinuz* "${DESTDIR}"
-cp chroot/boot/initrd.img* "${DESTDIR}"
-
-# Creating stage file
-Create_stagefile .stage/binary_linux-image

Copied: dists/sid/live-helper/helpers/lh_binary_linux-image (from rev 1720, dists/trunk/live-helper/helpers/lh_binary_linux-image)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_linux-image	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_linux-image	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# lh_binary_linux-image(1) - install linux-image into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="install linux-image into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "binary_linux-image: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_linux-image
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Removing initrd backup files
+rm -f chroot/boot/initrd*bak*
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				DESTDIR="binary"
+			else
+				DESTDIR="binary/live"
+			fi
+		else
+			DESTDIR="binary/live"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+
+			powerpc)
+				DESTDIR="${DESTDIR}.ppc"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Installing linux-image
+cp chroot/boot/vmlinuz* "${DESTDIR}"
+cp chroot/boot/initrd.img* "${DESTDIR}"
+
+# Creating stage file
+Create_stagefile .stage/binary_linux-image

Deleted: dists/sid/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/lh_binary_memtest	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-# lh_binary_memtest(1) - installs a memtest into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs a memtest into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_MEMTEST}" = "disabled" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_memtest: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_memtest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_memtest, foreign architecture."
-	exit 0
-fi
-
-# Checking depends
-case "${LIVE_MEMTEST}" in
-	memtest86)
-		Check_package chroot/boot/memtest86.bin memtest86
-		;;
-
-	memtest86+)
-		Check_package chroot/boot/memtest86+.bin memtest86+
-		;;
-esac
-
-# Installing depends
-Install_package
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/live"
-		;;
-
-	net)
-		DESTDIR="tftpboot"
-		;;
-
-	usb-hdd|hdd)
-		DESTDIR="binary/live"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR="${DESTDIR}.amd"
-				;;
-
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
-	mkdir -p "${DESTDIR}"
-fi
-
-# Installing memtest
-case "${LIVE_MEMTEST}" in
-	memtest86)
-		cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
-		;;
-
-	memtest86+)
-		cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
-		;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_memtest

Copied: dists/sid/live-helper/helpers/lh_binary_memtest (from rev 1720, dists/trunk/live-helper/helpers/lh_binary_memtest)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_memtest	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_memtest	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# lh_binary_memtest(1) - installs a memtest into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs a memtest into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_MEMTEST}" = "disabled" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_memtest: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_memtest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_memtest, foreign architecture."
+	exit 0
+fi
+
+# Checking depends
+case "${LIVE_MEMTEST}" in
+	memtest86)
+		Check_package chroot/boot/memtest86.bin memtest86
+		;;
+
+	memtest86+)
+		Check_package chroot/boot/memtest86+.bin memtest86+
+		;;
+esac
+
+# Installing depends
+Install_package
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				DESTDIR="binary"
+			else
+				DESTDIR="binary/live"
+			fi
+		else
+			DESTDIR="binary/live"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Installing memtest
+case "${LIVE_MEMTEST}" in
+	memtest86)
+		cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
+		;;
+
+	memtest86+)
+		cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
+		;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_memtest

Deleted: dists/sid/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/lh_binary_syslinux	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,388 +0,0 @@
-#!/bin/sh
-
-# lh_binary_syslinux(1) - installs syslinux into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs syslinux into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_syslinux: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_syslinux
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_syslinux, foreign architecture."
-	exit 0
-fi
-
-# Checking user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Check local templates
-if [ -d config/templates/syslinux ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/bin/syslinux syslinux
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR_LIVE="binary/live"
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	net)
-		DESTDIR_LIVE="tftpboot"
-		DESTDIR_INSTALL="tftpboot"
-	;;
-
-	usb-hdd|hdd)
-		DESTDIR_LIVE="binary/live"
-		DESTDIR_INSTALL="binary/install"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assembling multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
-				;;
-
-			i386)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR_LIVE}" ]
-then
-	mkdir -p "${DESTDIR_LIVE}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
-then
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-	LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-else
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-	LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-fi
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz*
-	do
-		if [ -z "${LINUX}" ]
-		then
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			else
-				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			fi
-		else
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			else
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			fi
-		fi
-	done
-fi
-
-# Removing '//'
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
-	LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
-	LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
-fi
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
-	if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-	then
-		MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
-		MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-	else
-		MEMTEST="LABEL memtest\n\tkernel memtest"
-	fi
-fi
-
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		# Copying syslinux
-		mkdir -p binary/isolinux
-		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
-		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
-
-		# Copying splash screen
-		if [ -f config/binary_syslinux/splash.rle ]
-		then
-			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
-		fi
-
-		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
-		then
-			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
-			then
-				rm -f binary/isolinux/splash.rle
-				sed -e "s/.*splash.*//" binary/isolinux/boot.txt
-			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
-			fi
-		fi
-
-		# Configure syslinux templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
-		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
-
-		# Remove unused files
-		rm -f binary/isolinux/pxelinux.cfg
-
-		# Working arround syslinux 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
-				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
-			done
-		else
-			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
-			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
-			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
-		fi
-		;;
-
-	net)
-		# Copying syslinux
-		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
-
-		# Install syslinux templates
-		mkdir -p tftpboot/pxelinux.cfg
-		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
-		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
-		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
-
-		# Copying splash screen
-		if [ -f config/binary_syslinux/splash.rle ]
-		then
-			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
-		fi
-
-		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
-		then
-			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
-			then
-				rm -f tftpboot/pxelinux.cfg/splash.rle
-				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
-			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
-			fi
-		fi
-
-		# Configure syslinux templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
-		sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
-
-		# Remove unused files
-		rm -f tftpboot/pxelinux.cfg/isolinux.cfg
-
-		# Working arround syslinux 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
-				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
-			done
-		else
-			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
-			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
-			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
-		fi
-		;;
-
-	usb-hdd|hdd)
-		# Copying syslinux
-		mkdir -p binary
-		cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
-		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
-		mv binary/isolinux.cfg binary/syslinux.cfg
-
-		# Copying splash screen
-		if [ -f config/binary_syslinux/splash.rle ]
-		then
-			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
-		fi
-
-		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
-		then
-			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
-			then
-				rm -f binary/splash.rle
-				sed -e "s/.*splash.*//" binary/syslinux.txt
-			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
-			fi
-		fi
-
-		# Configure syslinux templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
-		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
-
-		# Remove unused files
-		rm -f binary/pxelinux.cfg
-
-		# Working arround syslinux 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
-				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/syslinux.cfg
-			done
-		else
-			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
-			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
-			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/syslinux.cfg
-		fi
-		;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux

Copied: dists/sid/live-helper/helpers/lh_binary_syslinux (from rev 1725, dists/trunk/live-helper/helpers/lh_binary_syslinux)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_syslinux	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_syslinux	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,522 @@
+#!/bin/sh
+
+# lh_binary_syslinux(1) - installs syslinux into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs syslinux into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_syslinux: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_syslinux
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_syslinux, foreign architecture."
+	exit 0
+fi
+
+# Checking user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+	if [ -d ../"${LIVE_TEMPLATES}" ]
+	then
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+fi
+
+# Check local templates
+if [ -d config/templates/syslinux ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/bin/syslinux syslinux
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR_LIVE="binary/live"
+		DESTDIR_INSTALL="binary/install"
+		;;
+
+	net)
+		DESTDIR_LIVE="tftpboot"
+		DESTDIR_INSTALL="tftpboot"
+	;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			DESTDIR_LIVE="binary"
+			DESTDIR_INSTALL="binary"
+		else
+			DESTDIR_LIVE="binary/live"
+			DESTDIR_INSTALL="binary/install"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assembling multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+				;;
+
+			i386)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR_LIVE}" ]
+then
+	mkdir -p "${DESTDIR_LIVE}"
+fi
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_USERNAME}" != "user" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	case "${LIVE_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_HOSTNAME}" != "debian" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+then
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+	then
+		LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+		LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+	else
+		LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+		LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+	fi
+else
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+	LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+	LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+fi
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+			then
+				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			else
+				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			fi
+		else
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+			then
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			else
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			fi
+		fi
+	done
+fi
+
+# Removing '//'
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+	then
+		if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+		then
+			VMLINUZ_DI="vmlinuz.di"
+			INITRD_DI="initrddi.gz"
+
+			VMLINUZ_GI="vmlinuz.gi"
+			INITRD_GI="initrdgi.gz"
+		else
+			VMLINUZ_DI="vmlinuz"
+			INITRD_DI="initrd.gz"
+
+			VMLINUZ_GI="gtk/vmlinuz"
+			INITRD_GI="gtk/initrd.gz"
+		fi
+	else
+		VMLINUZ_DI="vmlinuz"
+		INITRD_DI="initrd.gz"
+
+		VMLINUZ_GI="gtk/vmlinuz"
+		INITRD_GI="gtk/initrd.gz"
+	fi
+
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+	then
+		LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+		fi
+
+		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+		fi
+	else
+		LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+		fi
+
+		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+		fi
+	fi
+fi
+
+LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+	then
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+		then
+			MEMTEST="LABEL memtest\n\tkernel memtest"
+		else
+			MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
+		fi
+	else
+		MEMTEST="LABEL memtest\n\tkernel memtest"
+	fi
+
+	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		# Copying syslinux
+		mkdir -p binary/isolinux
+		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
+
+		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f binary/isolinux/splash.rle
+				sed -e "s/.*splash.*//" binary/isolinux/boot.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
+			fi
+		fi
+
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
+
+		# Remove unused files
+		rm -f binary/isolinux/pxelinux.cfg
+
+		# Working arround syslinux 8.3 limitation
+		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+			do
+				NUMBER=$(($NUMBER + 1))
+
+				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
+			done
+		else
+			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
+		fi
+		;;
+
+	net)
+		# Copying syslinux
+		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
+
+		# Install syslinux templates
+		mkdir -p tftpboot/pxelinux.cfg
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
+		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
+		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
+
+		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f tftpboot/pxelinux.cfg/splash.rle
+				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+			fi
+		fi
+
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
+
+		# Remove unused files
+		rm -f tftpboot/pxelinux.cfg/isolinux.cfg
+
+		# Working arround syslinux 8.3 limitation
+		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+			do
+				NUMBER=$(($NUMBER + 1))
+
+				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
+			done
+		else
+			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
+		fi
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			DESTDIR="binary"
+		else
+			DESTDIR="binary/syslinux"
+		fi
+
+		# Copying syslinux
+		mkdir -p "${DESTDIR}"
+		cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
+		mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
+
+		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f "${DESTDIR}"/splash.rle
+				sed -e "s/.*splash.*//" "${DESTDIR}"/boot.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
+			fi
+		fi
+
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+
+		# Remove unused files
+		rm -f "${DESTDIR}"/pxelinux.cfg
+
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+			then
+				for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+				do
+					NUMBER=$(($NUMBER + 1))
+
+					mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+					mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+					sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
+				done
+			else
+				mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+				mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+				sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+			fi
+		fi
+		;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux

Deleted: dists/sid/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/lh_binary_yaboot	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,210 +0,0 @@
-#!/bin/sh
-
-# lh_binary_yaboot(1) - installs yaboot into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs yaboot into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_yaboot: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_yaboot
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
-then
-	Echo_warning "skipping binary_yaboot, foreign architecture."
-	exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Checking local templates
-if [ -d config/templates/yaboot ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/lib/yaboot/yaboot yaboot
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/live"
-		;;
-
-	net|usb-hdd|hdd)
-		Echo_error "not supported, FIXME"
-	;;
-esac
-
-# Temporary check for broken yaboot
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	case "${LIVE_ARCHITECTURE}" in
-		powerpc)
-			DESTDIR="${DESTDIR}.ppc"
-			;;
-	esac
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
-	mkdir -p "${DESTDIR}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-else
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-fi
-
-# FIXME
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz*
-	do
-		if [ -z "${LINUX}" ]
-		then
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-		then
-				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-			else
-				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-		fi
-		else
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-			else
-				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-			fi
-		fi
-	done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		# Copying yaboot
-		mkdir -p binary/install
-		cp chroot/usr/lib/yaboot/yaboot binary/install
-		cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
-
-		# Configure yaboot templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf
-		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
-
-		# Working arround yaboot 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
-				mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
-				sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
-			done
-		else
-			mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
-			mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
-			sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
-		fi
-		;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_yaboot

Copied: dists/sid/live-helper/helpers/lh_binary_yaboot (from rev 1724, dists/trunk/live-helper/helpers/lh_binary_yaboot)
===================================================================
--- dists/sid/live-helper/helpers/lh_binary_yaboot	                        (rev 0)
+++ dists/sid/live-helper/helpers/lh_binary_yaboot	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,232 @@
+#!/bin/sh
+
+# lh_binary_yaboot(1) - installs yaboot into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs yaboot into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_yaboot: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_yaboot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
+then
+	Echo_warning "skipping binary_yaboot, foreign architecture."
+	exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+	if [ -d ../"${LIVE_TEMPLATES}" ]
+	then
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+fi
+
+# Checking local templates
+if [ -d config/templates/yaboot ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/lib/yaboot/yaboot yaboot
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net|usb-hdd|hdd)
+		Echo_error "not supported, FIXME"
+	;;
+esac
+
+# Temporary check for broken yaboot
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	case "${LIVE_ARCHITECTURE}" in
+		powerpc)
+			DESTDIR="${DESTDIR}.ppc"
+			;;
+	esac
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_USERNAME}" != "user" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	case "${LIVE_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_HOSTNAME}" != "debian" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+	LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+else
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+	LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+fi
+
+# FIXME
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+		then
+				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+			else
+				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+		fi
+		else
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+			then
+				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+			else
+				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+			fi
+		fi
+	done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		# Copying yaboot
+		mkdir -p binary/install
+		cp chroot/usr/lib/yaboot/yaboot binary/install
+		cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
+
+		# Configure yaboot templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
+
+		# Working arround yaboot 8.3 limitation
+		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+			do
+				NUMBER=$(($NUMBER + 1))
+
+				mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
+				mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
+				sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+			done
+		else
+			mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
+			mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
+			sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+		fi
+		;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_yaboot

Deleted: dists/sid/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/helpers/make-live	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,394 +0,0 @@
-#!/bin/sh
-
-# make-live(1) - utility to build Debian Live systems
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-        . ${FUNCTION}
-done
-
-# Set static variables
-PROGRAM="`basename ${0}`"
-DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
-
-HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
-
-Local_arguments ()
-{
-	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
-
-	if [ "${?}" != "0" ]
-	then
-		echo "Terminating." >&2
-		exit 1
-	fi
-
-	if [ "${1}" = "config" ]
-	then
-		CONFIG="true"
-	fi
-
-	eval set -- "${ARGUMENTS}"
-
-	while true
-	do
-		case "${1}" in
-			# common
-			--mode)
-				LH_MODE="${2}"; shift 2
-				;;
-
-			--config)
-				LH_CONFIG="${2}"; shift 2
-				;;
-
-			--apt)
-				LH_APT="${2}"; shift 2
-				;;
-
-			--apt-ftpproxy)
-				LH_APT_FTPPROXY="${2}"; shift 2
-				;;
-
-			--apt-httpproxy)
-				LH_APT_HTTPPROXY="${2}"; shift 2
-				;;
-
-			--apt-generic)
-				LH_APT_GENERIC="${2}"; shift 2
-				;;
-
-			--apt-pdiffs)
-				LH_APT_PDIFFS="${2}"; shift 2
-				;;
-
-			--apt-recommends)
-				LH_APT_RECOMMENDS="${2}"; shift 2
-				;;
-
-			--apt-secure)
-				LH_APT_SECURE="${2}"; shift 2
-				;;
-
-			--bootstrap)
-				LH_BOOTSTRAP="${2}"; shift 2
-				;;
-
-			--cache)
-				LH_CACHE="${2}"; shift 2
-				;;
-
-			--debconf-frontend)
-				LH_DEBCONF_FRONTEND="${2}"; shift 2
-				;;
-
-			--debconf-priority)
-				LH_DEBCONF_PRIORITY="${2}"; shift 2
-				;;
-
-			--debconf-nowarnings)
-				LH_DEBCONF_NOWARNINGS="${2}"; shift 2
-				;;
-
-			--genisoimage)
-				LH_GENISOIMAGE="${2}"; shift 2
-				;;
-
-			--losetup)
-				LH_LOSETUP="${2}"; shift 2
-				;;
-
-			--tasksel)
-				LH_TASKSEL="${2}"; shift 2
-				;;
-
-			-r|--root)
-				LIVE_ROOT="${2}"; shift 2
-				;;
-
-			--root-command)
-				LIVE_ROOT_COMMAND="${2}"; shift 2
-				;;
-
-			# bootstrap
-			-a|--architecture)
-				LIVE_ARCHITECTURE="${2}"; shift 2
-				;;
-
-			-d|--distribution)
-				LIVE_DISTRIBUTION="${2}"; shift 2
-				export LIVE_DISTRIBUTION
-				;;
-
-			--distribution-config)
-				LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
-				;;
-
-			-f|--bootstrap-flavour)
-				LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
-				;;
-
-			-m|--mirror-bootstrap)
-				LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
-				;;
-
-			--mirror-bootstrap-security)
-				LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
-				;;
-
-			--mirror-binary)
-				LIVE_MIRROR_BINARY="${2}"; shift 2
-				;;
-
-			--mirror-binary-security)
-				LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
-				;;
-
-			--sections)
-				LIVE_SECTIONS="${2}"; shift 2
-				;;
-
-			# chroot
-			--interactive)
-				LIVE_INTERACTIVE="${2}"; shift 2
-				;;
-
-			-k|--linux-flavours)
-				LIVE_LINUX_FLAVOURS="${2}"; shift 2
-				;;
-
-			--linux-packages)
-				LIVE_LINUX_PACKAGES="${2}"; shift 2
-				;;
-
-			--keyring-packages)
-				LIVE_KEYRING_PACKAGS="${2}"; shift 2
-				;;
-
-			--hooks)
-				LIVE_HOOKS="${2}"; shift 2
-				;;
-
-			-l|--language)
-				LIVE_LANGUAGE="${2}"; shift 2
-				;;
-
-			--packages)
-				LIVE_PACKAGES="${2}"; shift 2
-				;;
-
-			-p|--packages-lists)
-				LIVE_PACKAGES_LISTS="${2}"; shift 2
-				;;
-
-			--tasks)
-				LIVE_TASKS="${2}"; shift 2
-				;;
-
-			--security)
-				LIVE_SECURITY="${2}"; shift 2
-				;;
-
-			--symlinks)
-				LIVE_SYMLINKS="${2}"; shift 2
-				;;
-
-			--sysvinit)
-				LIVE_SYSVINIT="${2}"; shift 2
-				;;
-
-			# image
-			--bootappend)
-				LIVE_BOOTAPPEND="${2}"; shift 2
-				;;
-
-			-e|--encryption)
-				LIVE_ENCRYPTION="${2}"; shift 2
-				;;
-
-			--username)
-				LIVE_USERNAME="${2}"; shift 2
-				;;
-
-			--hostname)
-				LIVE_HOSTNAME="${2}"; shift 2
-				;;
-
-			--chroot-filesystem)
-				LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
-				;;
-
-			--memtest)
-				LIVE_MEMTEST="${2}"; shift 2
-				;;
-
-			--iso-volume)
-				LIVE_ISO_VOLUME="${2}"; shift 2
-				;;
-
-			--net-server)
-				LIVE_NET_SERVER="${2}"; shift 2
-				;;
-
-			--net-path)
-				LIVE_NET_PATH="${2}"; shift 2
-				;;
-
-			--source)
-				LIVE_SOURCE="${2}"; shift 2
-				;;
-
-			--bootloader)
-				LIVE_BOOTLOADER="${2}"; shift 2
-				;;
-
-			--grub-splash)
-				LIVE_GRUB_SPLASH="${2}"; shift 2
-				;;
-
-			--syslinux-splash)
-				LIVE_SYSLINUX_SPLASH="${2}"; shift 2
-				;;
-
-			-b|--binary-images)
-				LIVE_BINARY_IMAGES="${2}"; shift 2
-				;;
-
-			-s|--source-images)
-				LIVE_SOURCE_IMAGES="${2}"; shift 2
-				;;
-
-			--includes)
-				LIVE_INCLUDES="${2}"; shift 2
-				;;
-
-			--templates)
-				LIVE_TEMPLATES="${2}"; shift 2
-				;;
-
-			# other
-			-h|--help)
-				Help; shift
-				;;
-
-			-u|--usage)
-				Usage; shift
-				;;
-
-			-v|--version)
-				Version; shift
-				;;
-
-			--breakpoints)
-				LH_BREAKPOINTS="enabled"; shift
-				;;
-
-			--debug)
-				LH_DEBUG="enabled"; shift
-				;;
-
-			--force)
-				LH_FORCE="enabled"; shift
-				;;
-
-			--quiet)
-				LH_QUIET="enabled"; shift
-				;;
-
-			--verbose)
-				LH_VERBOSE="enabled"; shift
-				;;
-
-			--)
-				shift; break
-				;;
-
-			*)
-				echo "Internal error."
-				exit 1
-				;;
-		esac
-	done
-}
-
-Main ()
-{
-	Local_arguments "${@}"
-
-	Set_defaults
-
-	if [ -z "${ROOT}" ]
-	then
-		ROOT="${LIVE_ROOT}"
-	fi
-
-	# Source existing configuration
-	Read_conffile "${ROOT}"/config/common
-	Read_conffile "${ROOT}"/config/bootstrap
-	Read_conffile "${ROOT}"/config/chroot
-	Read_conffile "${ROOT}"/config/image
-
-	Local_arguments "${@}"
-
-	# Configuring (this is really shit!)
-	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
-
-	if [ "${LH_BREAKPOINTS}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --breakpoints"
-	fi
-
-	if [ "${LH_DEBUG}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --debug"
-	fi
-
-	if [ "${LH_FORCE}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --force"
-	fi
-
-	if [ "${LH_QUIET}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --quiet"
-	fi
-
-	if [ "${LH_VERBOSE}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --verbose"
-	fi
-
-	# Building
-	if [ -z "${CONFIG}" ]
-	then
-		cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
-	fi
-}
-
-trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
-      if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
-      0 1 2 3 9 15
-
-Main "${@}"

Copied: dists/sid/live-helper/helpers/make-live (from rev 1683, dists/trunk/live-helper/helpers/make-live)
===================================================================
--- dists/sid/live-helper/helpers/make-live	                        (rev 0)
+++ dists/sid/live-helper/helpers/make-live	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,398 @@
+#!/bin/sh
+
+# make-live(1) - utility to build Debian Live systems
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# On Debian systems, the complete text of the GNU General Public License
+# can be found in /usr/share/common-licenses/GPL file.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+        . ${FUNCTION}
+done
+
+# Set static variables
+PROGRAM="`basename ${0}`"
+DESCRIPTION="utility to build Debian Live systems"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+
+HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
+
+Local_arguments ()
+{
+	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+
+	if [ "${?}" != "0" ]
+	then
+		echo "Terminating." >&2
+		exit 1
+	fi
+
+	if [ "${1}" = "config" ]
+	then
+		CONFIG="true"
+	fi
+
+	eval set -- "${ARGUMENTS}"
+
+	while true
+	do
+		case "${1}" in
+			# common
+			--mode)
+				LH_MODE="${2}"; shift 2
+				;;
+
+			--config)
+				LH_CONFIG="${2}"; shift 2
+				;;
+
+			--apt)
+				LH_APT="${2}"; shift 2
+				;;
+
+			--apt-ftpproxy)
+				LH_APT_FTPPROXY="${2}"; shift 2
+				;;
+
+			--apt-httpproxy)
+				LH_APT_HTTPPROXY="${2}"; shift 2
+				;;
+
+			--binary-indices)
+				LH_BINARY_INDICES="${2}"; shift 2
+				;;
+
+			--apt-pdiffs)
+				LH_APT_PDIFFS="${2}"; shift 2
+				;;
+
+			--apt-recommends)
+				LH_APT_RECOMMENDS="${2}"; shift 2
+				;;
+
+			--apt-secure)
+				LH_APT_SECURE="${2}"; shift 2
+				;;
+
+			--bootstrap)
+				LH_BOOTSTRAP="${2}"; shift 2
+				;;
+
+			--cache)
+				LH_CACHE="${2}"; shift 2
+				;;
+
+			--debconf-frontend)
+				LH_DEBCONF_FRONTEND="${2}"; shift 2
+				;;
+
+			--debconf-priority)
+				LH_DEBCONF_PRIORITY="${2}"; shift 2
+				;;
+
+			--debconf-nowarnings)
+				LH_DEBCONF_NOWARNINGS="${2}"; shift 2
+				;;
+
+			--genisoimage)
+				LH_GENISOIMAGE="${2}"; shift 2
+				;;
+
+			--losetup)
+				LH_LOSETUP="${2}"; shift 2
+				;;
+
+			--tasksel)
+				LH_TASKSEL="${2}"; shift 2
+				;;
+
+			-r|--root)
+				LIVE_ROOT="${2}"; shift 2
+				;;
+
+			--root-command)
+				LIVE_ROOT_COMMAND="${2}"; shift 2
+				;;
+
+			# bootstrap
+			-a|--architecture)
+				LIVE_ARCHITECTURE="${2}"; shift 2
+				;;
+
+			-d|--distribution)
+				LIVE_DISTRIBUTION="${2}"; shift 2
+				export LIVE_DISTRIBUTION
+				;;
+
+			--distribution-config)
+				LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
+				;;
+
+			-f|--bootstrap-flavour)
+				LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
+				;;
+
+			-m|--mirror-bootstrap)
+				LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
+				;;
+
+			--mirror-bootstrap-security)
+				LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
+				;;
+
+			--mirror-binary)
+				LIVE_MIRROR_BINARY="${2}"; shift 2
+				;;
+
+			--mirror-binary-security)
+				LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
+				;;
+
+			--sections)
+				LIVE_SECTIONS="${2}"; shift 2
+				;;
+
+			# chroot
+			--interactive)
+				LIVE_INTERACTIVE="${2}"; shift 2
+				;;
+
+			--initramfs)
+				LH_INITRAMFS="${2}"; shift 2
+				;;
+
+			-k|--linux-flavours)
+				LIVE_LINUX_FLAVOURS="${2}"; shift 2
+				;;
+
+			--linux-packages)
+				LIVE_LINUX_PACKAGES="${2}"; shift 2
+				;;
+
+			--keyring-packages)
+				LIVE_KEYRING_PACKAGS="${2}"; shift 2
+				;;
+
+			--hooks)
+				LIVE_HOOKS="${2}"; shift 2
+				;;
+
+			-l|--language)
+				LIVE_LANGUAGE="${2}"; shift 2
+				;;
+
+			--packages)
+				LIVE_PACKAGES="${2}"; shift 2
+				;;
+
+			-p|--packages-lists)
+				LIVE_PACKAGES_LISTS="${2}"; shift 2
+				;;
+
+			--tasks)
+				LIVE_TASKS="${2}"; shift 2
+				;;
+
+			--security)
+				LIVE_SECURITY="${2}"; shift 2
+				;;
+
+			--symlinks)
+				LIVE_SYMLINKS="${2}"; shift 2
+				;;
+
+			--sysvinit)
+				LIVE_SYSVINIT="${2}"; shift 2
+				;;
+
+			# image
+			--bootappend)
+				LIVE_BOOTAPPEND="${2}"; shift 2
+				;;
+
+			-e|--encryption)
+				LIVE_ENCRYPTION="${2}"; shift 2
+				;;
+
+			--username)
+				LIVE_USERNAME="${2}"; shift 2
+				;;
+
+			--hostname)
+				LIVE_HOSTNAME="${2}"; shift 2
+				;;
+
+			--chroot-filesystem)
+				LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
+				;;
+
+			--memtest)
+				LIVE_MEMTEST="${2}"; shift 2
+				;;
+
+			--iso-volume)
+				LIVE_ISO_VOLUME="${2}"; shift 2
+				;;
+
+			--net-server)
+				LIVE_NET_SERVER="${2}"; shift 2
+				;;
+
+			--net-path)
+				LIVE_NET_PATH="${2}"; shift 2
+				;;
+
+			--source)
+				LIVE_SOURCE="${2}"; shift 2
+				;;
+
+			--bootloader)
+				LIVE_BOOTLOADER="${2}"; shift 2
+				;;
+
+			--grub-splash)
+				LIVE_GRUB_SPLASH="${2}"; shift 2
+				;;
+
+			--syslinux-splash)
+				LIVE_SYSLINUX_SPLASH="${2}"; shift 2
+				;;
+
+			-b|--binary-images)
+				LIVE_BINARY_IMAGES="${2}"; shift 2
+				;;
+
+			-s|--source-images)
+				LIVE_SOURCE_IMAGES="${2}"; shift 2
+				;;
+
+			--includes)
+				LIVE_INCLUDES="${2}"; shift 2
+				;;
+
+			--templates)
+				LIVE_TEMPLATES="${2}"; shift 2
+				;;
+
+			# other
+			-h|--help)
+				Help; shift
+				;;
+
+			-u|--usage)
+				Usage; shift
+				;;
+
+			-v|--version)
+				Version; shift
+				;;
+
+			--breakpoints)
+				LH_BREAKPOINTS="enabled"; shift
+				;;
+
+			--debug)
+				LH_DEBUG="enabled"; shift
+				;;
+
+			--force)
+				LH_FORCE="enabled"; shift
+				;;
+
+			--quiet)
+				LH_QUIET="enabled"; shift
+				;;
+
+			--verbose)
+				LH_VERBOSE="enabled"; shift
+				;;
+
+			--)
+				shift; break
+				;;
+
+			*)
+				echo "Internal error."
+				exit 1
+				;;
+		esac
+	done
+}
+
+Main ()
+{
+	Local_arguments "${@}"
+
+	Set_defaults
+
+	if [ -z "${ROOT}" ]
+	then
+		ROOT="${LIVE_ROOT}"
+	fi
+
+	# Source existing configuration
+	Read_conffile "${ROOT}"/config/common
+	Read_conffile "${ROOT}"/config/bootstrap
+	Read_conffile "${ROOT}"/config/chroot
+	Read_conffile "${ROOT}"/config/image
+
+	Local_arguments "${@}"
+
+	# Configuring (this is really shit!)
+	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
+
+	if [ "${LH_BREAKPOINTS}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --breakpoints"
+	fi
+
+	if [ "${LH_DEBUG}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --debug"
+	fi
+
+	if [ "${LH_FORCE}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --force"
+	fi
+
+	if [ "${LH_QUIET}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --quiet"
+	fi
+
+	if [ "${LH_VERBOSE}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --verbose"
+	fi
+
+	# Building
+	if [ -z "${CONFIG}" ]
+	then
+		cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
+	fi
+}
+
+trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
+      if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
+      0 1 2 3 9 15
+
+Main "${@}"

Deleted: dists/sid/live-helper/manpages/lh_binary.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_binary.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,61 +0,0 @@
-.TH LH_BINARY 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
-
-.SH SYNTAX
-.B lh_binary [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binary\-Stufe zu vervollst\[:a]ndigen.
-
-.SH BINARY HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-kopiert chroot in chroot.
-.IP "\fIlh_binary_debian\-installer\fR(1)" 4
-kopiert debian\-installer in das Binary\-Image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-verschl\[:u]sselt das Root\-Dateisystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-kopiert grub in das Binary\-Image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-erstellt den Festplatten Binary\-Tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-kopiert Dateien in das Binary\-Image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-erstell das CD/DVD Binary\-Image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-kopiert linux\-image in das Binary\-Image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-kopiert lokale Dateien in das Binary\-Image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-erstellt die Paketliste des Root\-Dateisystemes.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-erstellt md5sum.txt im Binary\-Image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-kopiert ein memtest in das Binary\-Image.
-.IP "\fIlh_binary_net\fR(1)" 4
-erstellt den Netboot Binary\-Tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-erstell das Root\-Dateisystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-kopiert syslinux in das Binary\-Image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-erstellt das USB-hdd Binary\-Image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-kopiert yaboot in das Binary\-Image.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_binary.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_binary.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_binary.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_binary.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,61 @@
+.TH LH_BINARY 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
+
+.SH SYNTAX
+.B lh_binary [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binary\-Stufe zu vervollst\[:a]ndigen.
+
+.SH BINARY HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+kopiert chroot in chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+kopiert debian\-installer in das Binary\-Image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+verschl\[:u]sselt das Root\-Dateisystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+kopiert grub in das Binary\-Image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+erstellt den Festplatten Binary\-Tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+kopiert Dateien in das Binary\-Image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+erstell das CD/DVD Binary\-Image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+kopiert linux\-image in das Binary\-Image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+kopiert lokale Dateien in das Binary\-Image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+erstellt die Paketliste des Root\-Dateisystemes.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+erstellt md5sum.txt im Binary\-Image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+kopiert ein memtest in das Binary\-Image.
+.IP "\fIlh_binary_net\fR(1)" 4
+erstellt den Netboot Binary\-Tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+erstell das Root\-Dateisystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+kopiert syslinux in das Binary\-Image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+erstellt das USB-hdd Binary\-Image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+kopiert yaboot in das Binary\-Image.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_binary.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_binary.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,61 +0,0 @@
-.TH LH_BINARY 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_binary \- meta\-helper for lh_binary_*
-
-.SH SYNOPSIS
-.B lh_binary [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_binary is a meta\-helper. It calls all necessary helpers to complete the binary stage.
-
-.SH BINARY HELPERS
-Here is the complete list of available binary helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-copies chroot into chroot.
-.IP "\fIlh_binary_debian-installer\fR(1)" 4
-copies debian-installer into the binary image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-encrypts the root filesystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-copies grub into the binary image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-creates the harddisk binary tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-copies files into the binary image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-creates the CD/DVD binary image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-copies linux\-image into the binary image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-creates the package list of the root filesystem.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-copies a memtest into the binary image.
-.IP "\fIlh_binary_net\fR(1)" 4
-creates the netboot binary tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-creates the root filesystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-copies syslinux into the binary image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-creates the USB-hdd binary image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-copies yaboot into the binary image.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_binary.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_binary.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_binary.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_binary.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,61 @@
+.TH LH_BINARY 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_binary \- meta\-helper for lh_binary_*
+
+.SH SYNOPSIS
+.B lh_binary [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_binary is a meta\-helper. It calls all necessary helpers to complete the binary stage.
+
+.SH BINARY HELPERS
+Here is the complete list of available binary helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+copies chroot into chroot.
+.IP "\fIlh_binary_debian-installer\fR(1)" 4
+copies debian-installer into the binary image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+encrypts the root filesystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+copies grub into the binary image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+creates the harddisk binary tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+copies files into the binary image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+creates the CD/DVD binary image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+copies linux\-image into the binary image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+creates the package list of the root filesystem.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+creates md5sum.txt in the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
+.IP "\fIlh_binary_net\fR(1)" 4
+creates the netboot binary tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+creates the root filesystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+copies syslinux into the binary image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+creates the USB-hdd binary image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+copies yaboot into the binary image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_bootstrap.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_bootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,31 +0,0 @@
-.TH LH_BOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
-
-.SH SYNTAX
-.B lh_bootstrap [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_bootstrap ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die bootstrap-Stufe zu vervollst\[:a]ndigen.
-
-.SH BOOTSTRAP HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren bootstrap\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-erstellt ein Debian-System mit cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-erstellt ein Debian-System mit debootstrap.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_bootstrap.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_bootstrap.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_bootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,31 @@
+.TH LH_BOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
+
+.SH SYNTAX
+.B lh_bootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die bootstrap-Stufe zu vervollst\[:a]ndigen.
+
+.SH BOOTSTRAP HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren bootstrap\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+erstellt ein Debian-System mit cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+erstellt ein Debian-System mit debootstrap.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_bootstrap.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_bootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,31 +0,0 @@
-.TH LH_BOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap \- meta\-helper for lh_bootstrap_*
-
-.SH SYNOPSIS
-.B lh_bootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap is a meta\-helper. It calls all necessary helpers to complete the bootstrap stage.
-
-.SH BOOTSTRAP HELPERS
-Here is the complete list of available bootstrap helper commands. See their man pages for additional documentation.
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-bootstraps system with cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-bootstraps system with debootstrap.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_bootstrap.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_bootstrap.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_bootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,31 @@
+.TH LH_BOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap \- meta\-helper for lh_bootstrap_*
+
+.SH SYNOPSIS
+.B lh_bootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap is a meta\-helper. It calls all necessary helpers to complete the bootstrap stage.
+
+.SH BOOTSTRAP HELPERS
+Here is the complete list of available bootstrap helper commands. See their man pages for additional documentation.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+bootstraps system with cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+bootstraps system with debootstrap.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
-
-.SH SYNTAX
-.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_bootstrap_cdebootstrap benutzt \fIcdebootstrap\fR(1) um ein Debian Grundsystem zu erstellen.
-
-.SH KONFIGURATIONSDATEI
-lh_bootstrap_cdebootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
-
-.SH UMGEBUNG
-lh_bootstrap_cdebootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-w\[:a]hlt die Distribution aus (Standard: etch)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
-
-.SH SIEHE AUCH
-\fIcdebootstrap\fR(1)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
+
+.SH SYNTAX
+.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap_cdebootstrap benutzt \fIcdebootstrap\fR(1) um ein Debian Grundsystem zu erstellen.
+
+.SH KONFIGURATIONSDATEI
+lh_bootstrap_cdebootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
+
+.SH UMGEBUNG
+lh_bootstrap_cdebootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+w\[:a]hlt die Distribution aus (Standard: etch)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
+
+.SH SIEHE AUCH
+\fIcdebootstrap\fR(1)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
-
-.SH SYNOPSIS
-.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap_cdebootstrap uses \fIcdebootstrap\fR(1) to create a Debian base system from scratch.
-
-.SH CONFIGURATION FILE
-lh_bootstrap_cdebootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
-
-.SH ENVIRONMENT
-lh_bootstrap_cdebootstrap respects the following environment variables if available, otherwise uses default values for it.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-control the bootstrap program to be used (Default: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-control if downloaded packages should be cached (Default: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-set the mirror to use (Default: http://ftp.debian.org/debian/)
-
-.SH SEE ALSO
-\fIcdebootstrap\fR(1)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
+
+.SH SYNOPSIS
+.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap_cdebootstrap uses \fIcdebootstrap\fR(1) to create a Debian base system from scratch.
+
+.SH CONFIGURATION FILE
+lh_bootstrap_cdebootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
+
+.SH ENVIRONMENT
+lh_bootstrap_cdebootstrap respects the following environment variables if available, otherwise uses default values for it.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+control the bootstrap program to be used (Default: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+control if downloaded packages should be cached (Default: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+select the chroot architecture (Default: autodetected)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+set distribution config directory (Default: empty)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+select the flavour to use (Default: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+select the distribution to use (Default: sid)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+set the mirror to use (Default: http://ftp.debian.org/debian/)
+
+.SH SEE ALSO
+\fIcdebootstrap\fR(1)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
-
-.SH SYNTAX
-.B lh_bootstrap_debootstrap [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_bootstrap_debootstrap benutzt \fIdebootstrap\fR(8) um ein Debian Grundsystem zu erstellen.
-
-.SH KONFIGURATIONSDATEI
-lh_bootstrap_debootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
-
-.SH UMGEBUNG
-lh_bootstrap_debootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-w\[:a]hlt die Distribution aus (Standard: etch)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
-
-.SH SIEHE AUCH
-\fIdebootstrap\fR(8)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
+
+.SH SYNTAX
+.B lh_bootstrap_debootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap_debootstrap benutzt \fIdebootstrap\fR(8) um ein Debian Grundsystem zu erstellen.
+
+.SH KONFIGURATIONSDATEI
+lh_bootstrap_debootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
+
+.SH UMGEBUNG
+lh_bootstrap_debootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+w\[:a]hlt die Distribution aus (Standard: etch)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
+
+.SH SIEHE AUCH
+\fIdebootstrap\fR(8)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
-
-.SH SYNOPSIS
-.B lh_bootstrap_debootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap_debootstrap uses \fIdebootstrap\fR(8) to create a Debian base system from scratch.
-
-.SH CONFIGURATION FILE
-lh_bootstrap_debootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
-
-.SH ENVIRONMENT
-lh_bootstrap_debootstrap respects the following environment variables if available, otherwise uses default values for it.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-control the bootstrap program to be used (Default: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-control if downloaded packages should be cached (Default: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-set the mirror to use (Default: http://ftp.debian.org/debian/)
-
-.SH SEE ALSO
-\fIdebootstrap\fR(8)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_bootstrap_debootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
+
+.SH SYNOPSIS
+.B lh_bootstrap_debootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap_debootstrap uses \fIdebootstrap\fR(8) to create a Debian base system from scratch.
+
+.SH CONFIGURATION FILE
+lh_bootstrap_debootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
+
+.SH ENVIRONMENT
+lh_bootstrap_debootstrap respects the following environment variables if available, otherwise uses default values for it.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+control the bootstrap program to be used (Default: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+control if downloaded packages should be cached (Default: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+select the chroot architecture (Default: autodetected)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+set distribution config directory (Default: empty)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+select the flavour to use (Default: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+select the distribution to use (Default: sid)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+set the mirror to use (Default: http://ftp.debian.org/debian/)
+
+.SH SEE ALSO
+\fIdebootstrap\fR(8)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_build.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_build.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_build.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,35 +0,0 @@
-.TH LH_BUILD 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_build \- erstellen eines Live-Systemes
-
-.SH SYNOPSIS
-.B lh_build [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein Live-System erfolgreich zu erstellen.
-
-.SH META\-HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_binary\fR(1)" 4
-erstellt ein Binary\-Image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-erstellt das Grundsystem.
-.IP "\fIlh_chroot\fR(1)" 4
-individualisiert chroot.
-.IP "\fIlh_source\fR(1)" 4
-erstellt ein Source-Image.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_build.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_build.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_build.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_build.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,35 @@
+.TH LH_BUILD 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_build \- erstellen eines Live-Systemes
+
+.SH SYNOPSIS
+.B lh_build [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein Live-System erfolgreich zu erstellen.
+
+.SH META\-HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary\fR(1)" 4
+erstellt ein Binary\-Image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+erstellt das Grundsystem.
+.IP "\fIlh_chroot\fR(1)" 4
+individualisiert chroot.
+.IP "\fIlh_source\fR(1)" 4
+erstellt ein Source-Image.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_build.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_build.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_build.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,35 +0,0 @@
-.TH LH_BUILD 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_build \- building a live system
-
-.SH SYNOPSIS
-.B lh_build [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_build is a helper script. It calls all required meta\-helper scripts to successfully build a live system.
-
-.SH META\-HELPERS
-Here is the complete list of available meta\-helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary\fR(1)" 4
-builds a binary image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-bootstraps a system.
-.IP "\fIlh_chroot\fR(1)" 4
-customizes a chroot.
-.IP "\fIlh_source\fR(1)" 4
-builds a source image.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_build.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_build.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_build.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_build.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,35 @@
+.TH LH_BUILD 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_build \- building a live system
+
+.SH SYNOPSIS
+.B lh_build [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_build is a helper script. It calls all required meta\-helper scripts to successfully build a live system.
+
+.SH META\-HELPERS
+Here is the complete list of available meta\-helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary\fR(1)" 4
+builds a binary image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+bootstraps a system.
+.IP "\fIlh_chroot\fR(1)" 4
+customizes a chroot.
+.IP "\fIlh_source\fR(1)" 4
+builds a source image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_chroot.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_chroot.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_chroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,71 +0,0 @@
-.TH LH_CHROOT 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
-
-.SH SYNOPSIS
-.B lh_chroot [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_chroot ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die chroot\-Stufe zu vervollst\[:a]ndigen.
-
-.SH CHROOT HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren chroot\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-verwaltet /etc/debian_chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-f\[:u]hrt Hacks im chroot aus.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-f\[:u]hrt Hooks im chroot aus.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-verwaltet /etc/hosts.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-macht Bauprozess interaktiv.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-verwaltet /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-f\[:u]hrt lokale Hooks im chroot aus.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-kopiert lokale Dateien in den chroot.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installiert Lokalisierungspakete im chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installiert lokale Pakete im chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installiert lokale Paketlisten im chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installiert Pakete im chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installiert Paketlisten im chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-bindet /proc ein.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-verwaltet /etc/resolv.conf.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-konvertiert symbolische Links.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-bindet /sys ein.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-konfiguriert sysvinit.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-verwaltet /usr/sbin/policy\-rc.d.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installiert Paket-Tasks im chroot.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_chroot.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_chroot.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_chroot.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_chroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,71 @@
+.TH LH_CHROOT 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
+
+.SH SYNOPSIS
+.B lh_chroot [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_chroot ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die chroot\-Stufe zu vervollst\[:a]ndigen.
+
+.SH CHROOT HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren chroot\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+verwaltet /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+f\[:u]hrt Hacks im chroot aus.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+f\[:u]hrt Hooks im chroot aus.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+verwaltet /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+macht Bauprozess interaktiv.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+verwaltet /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+f\[:u]hrt lokale Hooks im chroot aus.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+kopiert lokale Dateien in den chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installiert Lokalisierungspakete im chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installiert lokale Pakete im chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installiert lokale Paketlisten im chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installiert Pakete im chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installiert Paketlisten im chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+bindet /proc ein.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+verwaltet /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+konvertiert symbolische Links.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+bindet /sys ein.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+konfiguriert sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+verwaltet /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installiert Paket-Tasks im chroot.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_chroot.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_chroot.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_chroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,71 +0,0 @@
-.TH LH_CHROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_chroot \- meta\-helper for lh_chroot_*
-
-.SH SYNOPSIS
-.B lh_chroot [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_chroot is a meta\-helper. It calls all necessary helpers to complete the chroot stage.
-
-.SH CHROOT HELPERS
-Here is the complete list of available chroot helper commands. See their man pages for additional documentation.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-manages /etc/apt/apt.conf.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-manages /etc/debian_chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-executes hacks in chroot.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-executes hooks in chroot.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-manages /etc/hosts.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-makes build interactive.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-manages /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-executes local hooks in chroot.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-copies local files into chroot.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installs localization packages into chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installs local packages into chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installs local packages lists into chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installs packages into chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installs packages lists into chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-mounts /proc.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-manages /etc/resolv.conf.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-manages /etc/apt/apt.conf.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-convers symlinks.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-mounts /sys.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-configures sysvinit.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-manages /usr/sbin/policy\-rc.d.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installs tasks into chroot.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_chroot.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_chroot.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_chroot.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_chroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,71 @@
+.TH LH_CHROOT 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_chroot \- meta\-helper for lh_chroot_*
+
+.SH SYNOPSIS
+.B lh_chroot [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_chroot is a meta\-helper. It calls all necessary helpers to complete the chroot stage.
+
+.SH CHROOT HELPERS
+Here is the complete list of available chroot helper commands. See their man pages for additional documentation.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+manages /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+manages /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+executes hacks in chroot.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+executes hooks in chroot.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+manages /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+makes build interactive.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+manages /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+executes local hooks in chroot.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+copies local files into chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installs localization packages into chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installs local packages into chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installs local packages lists into chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installs packages into chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installs packages lists into chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+mounts /proc.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+manages /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+manages /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+convers symlinks.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+mounts /sys.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+configures sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+manages /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installs tasks into chroot.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_clean.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_clean.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_clean.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,44 +0,0 @@
-.TH LH_CLEAN 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_clean \- r\[:a]umt das Build-Verzeichnis auf
-
-.SH SYNOPSIS
-.B lh_clean [\fIlive\-helper\ Optionen\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
-
-.SH BESCHREIBUNG
-lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist.
-
-.SH OPTIONEN
-Die folgenden Optionen werden von lh_clean unterst\[:u]tzt.
-.IP "\fBall\fR" 4
-entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation.
-.IP "\fBcache\fR" 4
-entfernt alle cache-Verzeichnisse.
-.IP "\fBchroot\fR" 4
-entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt.
-.IP "\fBbinary\fR" 4
-entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe.
-.IP "\fBlock\fR" 4
-entfernt alle lock-Dateien.
-.IP "\fBpurge\fR" 4
-entfernt alles (inlusive cache) ausser config.
-.IP "\fBstage\fR" 4
-entfernt alle Stage-Dateien.
-.IP "\fBsource\fR" 4
-entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_clean.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_clean.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_clean.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_clean.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,44 @@
+.TH LH_CLEAN 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_clean \- r\[:a]umt das Build-Verzeichnis auf
+
+.SH SYNOPSIS
+.B lh_clean [\fIlive\-helper\ Optionen\fR\|]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+
+.SH BESCHREIBUNG
+lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist.
+
+.SH OPTIONEN
+Die folgenden Optionen werden von lh_clean unterst\[:u]tzt.
+.IP "\fBall\fR" 4
+entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation.
+.IP "\fBcache\fR" 4
+entfernt alle cache-Verzeichnisse.
+.IP "\fBchroot\fR" 4
+entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt.
+.IP "\fBbinary\fR" 4
+entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe.
+.IP "\fBlock\fR" 4
+entfernt alle lock-Dateien.
+.IP "\fBpurge\fR" 4
+entfernt alles (inlusive cache) ausser config.
+.IP "\fBstage\fR" 4
+entfernt alle Stage-Dateien.
+.IP "\fBsource\fR" 4
+entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_clean.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_clean.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_clean.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,44 +0,0 @@
-.TH LH_CLEAN 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_clean \- clean up system build directories
-
-.SH SYNOPSIS
-.B lh_clean [\fIlive\-helper\ options\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
-
-.SH DESCRIPTION
-lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
-
-.SH OPTIONS
-The following command line options are supported by lh_clean.
-.IP "\fBall\fR" 4
-removes chroot, binary, lock, stage, and source. This is the default operation.
-.IP "\fBcache\fR" 4
-removes all cache directories.
-.IP "\fBchroot\fR" 4
-unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
-.IP "\fBbinary\fR" 4
-removes all binary related caches, directories, and stages files.
-.IP "\fBlock\fR" 4
-removes all lock files.
-.IP "\fBpurge\fR" 4
-removes everything (including cache) but config.
-.IP "\fBstage\fR" 4
-removes all stage files.
-.IP "\fBsource\fR" 4
-removes all source related caches, directories, and stage files.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_clean.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_clean.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_clean.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_clean.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,44 @@
+.TH LH_CLEAN 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_clean \- clean up system build directories
+
+.SH SYNOPSIS
+.B lh_clean [\fIlive\-helper\ options\fR\|]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+
+.SH DESCRIPTION
+lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
+
+.SH OPTIONS
+The following command line options are supported by lh_clean.
+.IP "\fBall\fR" 4
+removes chroot, binary, lock, stage, and source. This is the default operation.
+.IP "\fBcache\fR" 4
+removes all cache directories.
+.IP "\fBchroot\fR" 4
+unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
+.IP "\fBbinary\fR" 4
+removes all binary related caches, directories, and stages files.
+.IP "\fBlock\fR" 4
+removes all lock files.
+.IP "\fBpurge\fR" 4
+removes everything (including cache) but config.
+.IP "\fBstage\fR" 4
+removes all stage files.
+.IP "\fBsource\fR" 4
+removes all source related caches, directories, and stage files.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_source.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_source.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,43 +0,0 @@
-.TH LH_SOURCE 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_source \- Meta\-Helper f\[:u]r lh_source_*
-
-.SH SYNTAX
-.B lh_source [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die source\-Stufe zu vervollst\[:a]ndigen.
-
-.SH SOURCE HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_source_debian-live\fR(1)" 4
-kopiert debian\-live Konfiguration in source.
-.IP "\fIlh_source_debian\fR(1)" 4
-l\[:a]dt Paketquellen herunter.
-.IP "\fIlh_source_generic\fR(1)" 4
-erstellt den generischen Source-Tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-erstellt den Harddisk Source-Tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-erstellt  CD/DVD Source-Image.
-.IP "\fIlh_source_md5sum\fR(1)" 4
-erstellt md5sum.txt im Source-Image.
-.IP "\fIlh_source_net\fR(1)" 4
-erstellt Netboot Source-Tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-erstellt USB-hdd Source-Tarball.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_source.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_source.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_source.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_source.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,43 @@
+.TH LH_SOURCE 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_source \- Meta\-Helper f\[:u]r lh_source_*
+
+.SH SYNTAX
+.B lh_source [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die source\-Stufe zu vervollst\[:a]ndigen.
+
+.SH SOURCE HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_source_debian-live\fR(1)" 4
+kopiert debian\-live Konfiguration in source.
+.IP "\fIlh_source_debian\fR(1)" 4
+l\[:a]dt Paketquellen herunter.
+.IP "\fIlh_source_generic\fR(1)" 4
+erstellt den generischen Source-Tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+erstellt den Harddisk Source-Tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+erstellt  CD/DVD Source-Image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+erstellt md5sum.txt im Source-Image.
+.IP "\fIlh_source_net\fR(1)" 4
+erstellt Netboot Source-Tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+erstellt USB-hdd Source-Tarball.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_source.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_source.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,43 +0,0 @@
-.TH LH_SOURCE 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_source \- meta\-helper for lh_source_*
-
-.SH SYNOPSIS
-.B lh_source [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_source is a meta\-helper. It calls all necessary helpers to complete the source stage.
-
-.SH SOURCE HELPERS
-Here is the complete list of available source helper commands. See their man pages for additional documentation.
-.IP "\fIlh_source_debian-live\fR(1)" 4
-copies debian\-live config into source.
-.IP "\fIlh_source_debian\fR(1)" 4
-downloads sources.
-.IP "\fIlh_source_generic\fR(1)" 4
-creates the generic source tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-creates the harddisk source tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-creates the CD/DVD source image.
-.IP "\fIlh_source_md5sum\fR(1)" 4
-creates md5sum.txt in the source image.
-.IP "\fIlh_source_net\fR(1)" 4
-creates the netboot source tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-creates the USB-hdd source image.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_source.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_source.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_source.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_source.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,43 @@
+.TH LH_SOURCE 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_source \- meta\-helper for lh_source_*
+
+.SH SYNOPSIS
+.B lh_source [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_source is a meta\-helper. It calls all necessary helpers to complete the source stage.
+
+.SH SOURCE HELPERS
+Here is the complete list of available source helper commands. See their man pages for additional documentation.
+.IP "\fIlh_source_debian-live\fR(1)" 4
+copies debian\-live config into source.
+.IP "\fIlh_source_debian\fR(1)" 4
+downloads sources.
+.IP "\fIlh_source_generic\fR(1)" 4
+creates the generic source tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+creates the harddisk source tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+creates the CD/DVD source image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+creates md5sum.txt in the source image.
+.IP "\fIlh_source_net\fR(1)" 4
+creates the netboot source tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+creates the USB-hdd source image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/lh_testroot.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_testroot.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_testroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,24 +0,0 @@
-.TH LH_TESTROOT 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_testroot \- stellt sicher dass das System als root gebaut wird
-
-.SH SYNTAX
-.B lh_testroot [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit einem Fehler. Debian Live-Images m\[:u]ssen momentan als root gebaut werden, \fIfakeroot\fR(1) oder \fIsudo\fR(8) funktioniert nicht.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/lh_testroot.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_testroot.de.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_testroot.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_testroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,24 @@
+.TH LH_TESTROOT 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_testroot \- stellt sicher dass das System als root gebaut wird
+
+.SH SYNTAX
+.B lh_testroot [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit einem Fehler. Debian Live-Images m\[:u]ssen momentan als root gebaut werden, \fIfakeroot\fR(1) oder \fIsudo\fR(8) funktioniert nicht.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/lh_testroot.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_testroot.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/lh_testroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,24 +0,0 @@
-.TH LH_TESTROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_testroot \- ensure that a system is built as root
-
-.SH SYNOPSIS
-.B lh_testroot [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_testroot simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root, \fIfakeroot\fR(1) or \fIsudo\fR(8) does not work.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/lh_testroot.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_testroot.en.1)
===================================================================
--- dists/sid/live-helper/manpages/lh_testroot.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/lh_testroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,24 @@
+.TH LH_TESTROOT 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_testroot \- ensure that a system is built as root
+
+.SH SYNOPSIS
+.B lh_testroot [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_testroot simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root, \fIfakeroot\fR(1) or \fIsudo\fR(8) does not work.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/live-helper.de.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.de.7	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/live-helper.de.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,178 +0,0 @@
-.TH LIVE\-HELPER 7 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-live\-helper \- Debian Live Helper-Programme
-
-.SH SYNTAX
-.B lh_* [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen.
-.PP
-Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \fImake\-live\fR(1).
-
-.\" .SH CONFIGURATION FILE
-.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
-
-.\" .SH ENVIRONMENT
-.\" Every live\-helper command respects the following environment variables if available.
-.\" .IP "\fI$LH_DEBUG\fR" 4
-.\" enables debug (Default: false)
-.\" .IP "\fI$LH_QUIET\fR" 4
-.\" be quiet (Default: false)
-.\" .IP "\fI$LH_VERBOSE\fR" 4
-.\" be verbose (Default: false)
-
-.SH LIVE\-HELPER KOMMANDOS
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_binary\fR(1)" 4
-Meta\-Helper f\[:u]r lh_binary_*
-.IP "\fIlh_binary_chroot\fR(1)" 4
-kopiert chroot in chroot.
-.IP "\fIlh_binary_debian\-installer\fR(1)" 4
-kopiert debian-\installer in das Binary\-Image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-verschl\[:u]sselt das Root\-Dateisystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-kopiert grub in das Binary\-Image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-erstellt den Festplatten Binary\-Tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-kopiert Dateien in das Binary\-Image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-erstell das CD/DVD Binary\-Image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-kopiert linux\-image in das Binary\-Image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-kopiert lokale Dateien in das Binary\-Image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-erstellt die Paketliste des Root\-Dateisystemes.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-erstellt md5sum.txt im Binary\-Image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-kopiert ein memtest in das Binary\-Image.
-.IP "\fIlh_binary_net\fR(1)" 4
-erstellt den Netboot Binary\-Tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-erstell das Root\-Dateisystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-kopiert syslinux in das Binary\-Image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-erstellt das USB-hdd Binary\-Image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-kopiert yaboot in das Binary\-Image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-Meta\-Helper f\[:u]r lh_bootstrap_*
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-erstellt ein Debian-System mit cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-erstellt ein Debian-System mit debootstrap.
-.IP "\fIlh_build\fR(1)" 4
-erstellen eines Live-Systemes
-.IP "\fIlh_chroot\fR(1)" 4
-Meta\-Helper f\[:u]r lh_chroot_*
-.IP "\fIlh_chroot_apt\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-verwaltet /etc/debian_chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-f\[:u]hrt Hacks im chroot aus.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-f\[:u]hrt Hooks im chroot aus.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-verwaltet /etc/hosts.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-macht Bauprozess interaktiv.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-verwaltet /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-f\[:u]hrt lokale Hooks im chroot aus.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-kopiert lokale Dateien in den chroot.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installiert Lokalisierungspakete im chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installiert lokale Pakete im chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installiert lokale Paketlisten im chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installiert Pakete im chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installiert Paketlisten im chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-bindet /proc ein.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-verwaltet /etc/resolv.conf.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-konvertiert symbolische Links.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-bindet /sys ein.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-konfiguriert sysvinit.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-verwaltet /usr/sbin/policy\-rc.d.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installiert Paket-Tasks im chroot.
-.IP "\fIlh_clean\fR(1)" 4
-r\[:a]umt das Build-Verzeichnis auf
-.IP "\fIlh_config\fR(1)" 4
-erstellt eine Beispielkonfiguration
-.IP "\fIlh_losetup\fR(1)" 4
-verwaltet Loop-Ger\[:a]te
-.IP "\fIlh_source\fR(1)" 4
-Meta\-Helper f\[:u]r lh_source_*
-.IP "\fIlh_source_debian-live\fR(1)" 4
-kopiert debian\-live Konfiguration in source.
-.IP "\fIlh_source_debian\fR(1)" 4
-l\[:a]dt Paketquellen herunter.
-.IP "\fIlh_source_generic\fR(1)" 4
-erstellt den generischen Source-Tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-erstellt den Harddisk Source-Tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-erstellt  CD/DVD Source-Image.
-.IP "\fIlh_source_md5sum\fR(1)" 4
-erstellt md5sum.txt im Source-Image.
-.IP "\fIlh_source_net\fR(1)" 4
-erstellt Netboot Source-Tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-erstellt USB-hdd Source-Tarball.
-.IP "\fIlh_testroot\fR(1)" 4
-stellt sicher dass das System als root gebaut wird.
-
-.SH LIVE\-HELPER OPTIONEN
-Die folgenden Kommandozeilenoptionen werden von allen live\-helper-Programmen unterst\[:u]tzt.
-.IP "\fB\-\-breakpoints\fR" 4
-Ausf\[:u]hrung mit Breakpoints.
-.IP "\fB\-\-conffile\fR" 4
-benutzen von eigenen Konfigurationsdateien.
-.IP "\fB\-\-debug\fR" 4
-zeigt Debug Informationen.
-.IP "\fB\-\-force\fR" 4
-erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert.
-.IP "\fB\-h, \-\-help\fR" 4
-zeigt Hilfe Informationen und stoppt.
-.IP "\fB\-\-logfile\fR" 4
-benutzen von eigener Log-Datei.
-.IP "\fB\-\-quiet\fR" 4
-still
-.IP "\fB\-u, \-\-usage\fR" 4
-zeigt Anwedungshinweise und stoppt.
-.IP "\fB\-\-verbose\fR" 4
-gespr\[:a]chig
-.IP "\fB\-v, \-\-version\fR" 4
-gibt Versionsinformationen aus und stoppt.
-
-.SH SIEHE AUCH
-\fIlive\-initramfs\fR(7)
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/live-helper.de.7 (from rev 1679, dists/trunk/live-helper/manpages/live-helper.de.7)
===================================================================
--- dists/sid/live-helper/manpages/live-helper.de.7	                        (rev 0)
+++ dists/sid/live-helper/manpages/live-helper.de.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,178 @@
+.TH LIVE\-HELPER 7 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+live\-helper \- Debian Live Helper-Programme
+
+.SH SYNTAX
+.B lh_* [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen.
+.PP
+Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \fImake\-live\fR(1).
+
+.\" .SH CONFIGURATION FILE
+.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
+
+.\" .SH ENVIRONMENT
+.\" Every live\-helper command respects the following environment variables if available.
+.\" .IP "\fI$LH_DEBUG\fR" 4
+.\" enables debug (Default: false)
+.\" .IP "\fI$LH_QUIET\fR" 4
+.\" be quiet (Default: false)
+.\" .IP "\fI$LH_VERBOSE\fR" 4
+.\" be verbose (Default: false)
+
+.SH LIVE\-HELPER KOMMANDOS
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary\fR(1)" 4
+Meta\-Helper f\[:u]r lh_binary_*
+.IP "\fIlh_binary_chroot\fR(1)" 4
+kopiert chroot in chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+kopiert debian-\installer in das Binary\-Image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+verschl\[:u]sselt das Root\-Dateisystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+kopiert grub in das Binary\-Image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+erstellt den Festplatten Binary\-Tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+kopiert Dateien in das Binary\-Image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+erstell das CD/DVD Binary\-Image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+kopiert linux\-image in das Binary\-Image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+kopiert lokale Dateien in das Binary\-Image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+erstellt die Paketliste des Root\-Dateisystemes.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+erstellt md5sum.txt im Binary\-Image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+kopiert ein memtest in das Binary\-Image.
+.IP "\fIlh_binary_net\fR(1)" 4
+erstellt den Netboot Binary\-Tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+erstell das Root\-Dateisystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+kopiert syslinux in das Binary\-Image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+erstellt das USB-hdd Binary\-Image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+kopiert yaboot in das Binary\-Image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+Meta\-Helper f\[:u]r lh_bootstrap_*
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+erstellt ein Debian-System mit cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+erstellt ein Debian-System mit debootstrap.
+.IP "\fIlh_build\fR(1)" 4
+erstellen eines Live-Systemes
+.IP "\fIlh_chroot\fR(1)" 4
+Meta\-Helper f\[:u]r lh_chroot_*
+.IP "\fIlh_chroot_apt\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+verwaltet /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+f\[:u]hrt Hacks im chroot aus.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+f\[:u]hrt Hooks im chroot aus.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+verwaltet /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+macht Bauprozess interaktiv.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+verwaltet /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+f\[:u]hrt lokale Hooks im chroot aus.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+kopiert lokale Dateien in den chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installiert Lokalisierungspakete im chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installiert lokale Pakete im chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installiert lokale Paketlisten im chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installiert Pakete im chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installiert Paketlisten im chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+bindet /proc ein.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+verwaltet /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+konvertiert symbolische Links.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+bindet /sys ein.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+konfiguriert sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+verwaltet /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installiert Paket-Tasks im chroot.
+.IP "\fIlh_clean\fR(1)" 4
+r\[:a]umt das Build-Verzeichnis auf
+.IP "\fIlh_config\fR(1)" 4
+erstellt eine Beispielkonfiguration
+.IP "\fIlh_losetup\fR(1)" 4
+verwaltet Loop-Ger\[:a]te
+.IP "\fIlh_source\fR(1)" 4
+Meta\-Helper f\[:u]r lh_source_*
+.IP "\fIlh_source_debian-live\fR(1)" 4
+kopiert debian\-live Konfiguration in source.
+.IP "\fIlh_source_debian\fR(1)" 4
+l\[:a]dt Paketquellen herunter.
+.IP "\fIlh_source_generic\fR(1)" 4
+erstellt den generischen Source-Tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+erstellt den Harddisk Source-Tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+erstellt  CD/DVD Source-Image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+erstellt md5sum.txt im Source-Image.
+.IP "\fIlh_source_net\fR(1)" 4
+erstellt Netboot Source-Tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+erstellt USB-hdd Source-Tarball.
+.IP "\fIlh_testroot\fR(1)" 4
+stellt sicher dass das System als root gebaut wird.
+
+.SH LIVE\-HELPER OPTIONEN
+Die folgenden Kommandozeilenoptionen werden von allen live\-helper-Programmen unterst\[:u]tzt.
+.IP "\fB\-\-breakpoints\fR" 4
+Ausf\[:u]hrung mit Breakpoints.
+.IP "\fB\-\-conffile\fR" 4
+benutzen von eigenen Konfigurationsdateien.
+.IP "\fB\-\-debug\fR" 4
+zeigt Debug Informationen.
+.IP "\fB\-\-force\fR" 4
+erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert.
+.IP "\fB\-h, \-\-help\fR" 4
+zeigt Hilfe Informationen und stoppt.
+.IP "\fB\-\-logfile\fR" 4
+benutzen von eigener Log-Datei.
+.IP "\fB\-\-quiet\fR" 4
+still
+.IP "\fB\-u, \-\-usage\fR" 4
+zeigt Anwedungshinweise und stoppt.
+.IP "\fB\-\-verbose\fR" 4
+gespr\[:a]chig
+.IP "\fB\-v, \-\-version\fR" 4
+gibt Versionsinformationen aus und stoppt.
+
+.SH SIEHE AUCH
+\fIlive\-initramfs\fR(7)
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/live-helper.en.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.en.7	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/live-helper.en.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,176 +0,0 @@
-.TH LIVE\-HELPER 7 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-live\-helper \- Debian Live helper programs
-
-.SH SYNOPSIS
-.B lh_* [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-Live\-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live\-helper is to provide a collection of small, simple, and easily understood tools that can be used in your own program to automate building of a Live system.
-.PP
-A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1).
-
-.\" .SH CONFIGURATION FILE
-.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
-
-.\" .SH ENVIRONMENT
-.\" Every live\-helper command respects the following environment variables if available.
-.\" .IP "\fI$LH_DEBUG\fR" 4
-.\" enables debug (Default: false)
-.\" .IP "\fI$LH_QUIET\fR" 4
-.\" be quiet (Default: false)
-.\" .IP "\fI$LH_VERBOSE\fR" 4
-.\" be verbose (Default: false)
-
-.SH LIVE\-HELPER COMMANDS
-Here is the complete list of available live\-helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary\fR(1)" 4
-meta\-helper for lh_binary_*.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-copies chroot into chroot.
-.IP "\fIlh_binary_debian\-installer\fR(1)" 4
-copies debian-installer into the binary image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-encrypts the root filesystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-copies grub into the binary image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-creates the harddisk binary tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-copies files into the binary image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-creates the CD/DVD binary image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-copies linux\-image into the binary image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-creates the package list of the root filesystem.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-copies a memtest into the binary image.
-.IP "\fIlh_binary_net\fR(1)" 4
-creates the netboot binary tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-creates the root filesystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-copies syslinux into the binary image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-creates the USB-hdd binary image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-copies yaboot into the binary image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-meta\-helper for lh_bootstrap_*.
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-bootstraps system with cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-bootstraps system with debootstrap.
-.IP "\fIlh_build\fR(1)" 4
-meta\-helper for lh_bootstrap, lh_chroot, lh_binary and lh_source.
-.IP "\fIlh_chroot\fR(1)" 4
-meta\-helper for lh_chroot_*.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-configures /etc/apt/apt.conf in chroot.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-configures /etc/debian_chroot in chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-does evil (temporary) hacks in the chroot.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-executes additional commands in the chroot.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-configures /etc/hosts in the chroot.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-makes build interactive.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-configures /etc/kernel\-img.conf in the chroot.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-executes additional local commands in the chroot.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installs localization packages in the chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installs local packages in the chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installs local packages lists in the chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installs packages in the chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installs packages lists in the chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-mounts /proc in the chroot.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-configures /etc/resolf.conf in the chroot.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-configures /etc/apt/sources.list in the chroot.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-converts symlinks in the chroot.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-mounts /sys in the chroot.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-minimizes daemon startup in the chroot.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-installs policy\-id hack in the chroot.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installs packages tasks in the chroot.
-.IP "\fIlh_clean\fR(1)" 4
-cleans up build directory.
-.IP "\fIlh_config\fR(1)" 4
-creates sample configuration.
-.IP "\fIlh_losetup\fR(1)" 4
-manages loop device handling
-.IP "\fIlh_source\fR(1)" 4
-meta\-helper for lh_source_*.
-.IP "\fIlh_source_debian-live\fR(1)" 4
-copies config into source directory.
-.IP "\fIlh_source_debian\fR(1)" 4
-downloads source packages.
-.IP "\fIlh_source_generic\fR(1)" 4
-creates generic source tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-creates harddisk source tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-creates CD/DVD source image.
-.IP "\fIlh_source_net\fR(1)" 4
-creates netboot source tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-creates USB-hdd source image.
-.IP "\fIlh_testroot\fR(1)" 4
-checks for root privileges.
-
-.SH LIVE\-HELPER OPTIONS
-The following command line options are supported by all live\-helper programs.
-.IP "\fB\-\-breakpoints\fR" 4
-run with breakpoints
-.IP "\fB\-\-conffile\fR" 4
-use custom configuration file
-.IP "\fB\-\-debug\fR" 4
-show debug information
-.IP "\fB\-\-force\fR" 4
-force helper execution, even if stage file exists.
-.IP "\fB\-h, \-\-help\fR" 4
-display help and exit
-.IP "\fB\-\-logfile\fR" 4
-use custom log file
-.IP "\fB\-\-quiet\fR" 4
-be quiet
-.IP "\fB\-u, \-\-usage\fR" 4
-show usage and exit
-.IP "\fB\-\-verbose\fR" 4
-be verbose
-.IP "\fB\-v, \-\-version\fR" 4
-output version information and exit
-
-.SH SEE ALSO
-\fIlive\-initramfs\fR(7)
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/live-helper.en.7 (from rev 1679, dists/trunk/live-helper/manpages/live-helper.en.7)
===================================================================
--- dists/sid/live-helper/manpages/live-helper.en.7	                        (rev 0)
+++ dists/sid/live-helper/manpages/live-helper.en.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,176 @@
+.TH LIVE\-HELPER 7 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+live\-helper \- Debian Live helper programs
+
+.SH SYNOPSIS
+.B lh_* [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+Live\-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live\-helper is to provide a collection of small, simple, and easily understood tools that can be used in your own program to automate building of a Live system.
+.PP
+A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1).
+
+.\" .SH CONFIGURATION FILE
+.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
+
+.\" .SH ENVIRONMENT
+.\" Every live\-helper command respects the following environment variables if available.
+.\" .IP "\fI$LH_DEBUG\fR" 4
+.\" enables debug (Default: false)
+.\" .IP "\fI$LH_QUIET\fR" 4
+.\" be quiet (Default: false)
+.\" .IP "\fI$LH_VERBOSE\fR" 4
+.\" be verbose (Default: false)
+
+.SH LIVE\-HELPER COMMANDS
+Here is the complete list of available live\-helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary\fR(1)" 4
+meta\-helper for lh_binary_*.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+copies chroot into chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+copies debian-installer into the binary image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+encrypts the root filesystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+copies grub into the binary image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+creates the harddisk binary tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+copies files into the binary image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+creates the CD/DVD binary image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+copies linux\-image into the binary image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+creates the package list of the root filesystem.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+creates md5sum.txt in the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
+.IP "\fIlh_binary_net\fR(1)" 4
+creates the netboot binary tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+creates the root filesystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+copies syslinux into the binary image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+creates the USB-hdd binary image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+copies yaboot into the binary image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+meta\-helper for lh_bootstrap_*.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+bootstraps system with cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+bootstraps system with debootstrap.
+.IP "\fIlh_build\fR(1)" 4
+meta\-helper for lh_bootstrap, lh_chroot, lh_binary and lh_source.
+.IP "\fIlh_chroot\fR(1)" 4
+meta\-helper for lh_chroot_*.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+configures /etc/apt/apt.conf in chroot.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+configures /etc/debian_chroot in chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+does evil (temporary) hacks in the chroot.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+executes additional commands in the chroot.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+configures /etc/hosts in the chroot.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+makes build interactive.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+configures /etc/kernel\-img.conf in the chroot.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+executes additional local commands in the chroot.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installs localization packages in the chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installs local packages in the chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installs local packages lists in the chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installs packages in the chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installs packages lists in the chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+mounts /proc in the chroot.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+configures /etc/resolf.conf in the chroot.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+configures /etc/apt/sources.list in the chroot.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+converts symlinks in the chroot.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+mounts /sys in the chroot.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+minimizes daemon startup in the chroot.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+installs policy\-id hack in the chroot.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installs packages tasks in the chroot.
+.IP "\fIlh_clean\fR(1)" 4
+cleans up build directory.
+.IP "\fIlh_config\fR(1)" 4
+creates sample configuration.
+.IP "\fIlh_losetup\fR(1)" 4
+manages loop device handling
+.IP "\fIlh_source\fR(1)" 4
+meta\-helper for lh_source_*.
+.IP "\fIlh_source_debian-live\fR(1)" 4
+copies config into source directory.
+.IP "\fIlh_source_debian\fR(1)" 4
+downloads source packages.
+.IP "\fIlh_source_generic\fR(1)" 4
+creates generic source tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+creates harddisk source tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+creates CD/DVD source image.
+.IP "\fIlh_source_net\fR(1)" 4
+creates netboot source tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+creates USB-hdd source image.
+.IP "\fIlh_testroot\fR(1)" 4
+checks for root privileges.
+
+.SH LIVE\-HELPER OPTIONS
+The following command line options are supported by all live\-helper programs.
+.IP "\fB\-\-breakpoints\fR" 4
+run with breakpoints
+.IP "\fB\-\-conffile\fR" 4
+use custom configuration file
+.IP "\fB\-\-debug\fR" 4
+show debug information
+.IP "\fB\-\-force\fR" 4
+force helper execution, even if stage file exists.
+.IP "\fB\-h, \-\-help\fR" 4
+display help and exit
+.IP "\fB\-\-logfile\fR" 4
+use custom log file
+.IP "\fB\-\-quiet\fR" 4
+be quiet
+.IP "\fB\-u, \-\-usage\fR" 4
+show usage and exit
+.IP "\fB\-\-verbose\fR" 4
+be verbose
+.IP "\fB\-v, \-\-version\fR" 4
+output version information and exit
+
+.SH SEE ALSO
+\fIlive\-initramfs\fR(7)
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: dists/sid/live-helper/manpages/make-live.de.1
===================================================================
--- dists/trunk/live-helper/manpages/make-live.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/make-live.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,88 +0,0 @@
-.TH MAKE\-LIVE 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-make\-live \- erstellt ein Debian Live-System
-
-.SH SYNOPSIS
-.B make\-live
-[config]
-[\-\-mode \fIMODE\fR]
-[\-\-config \fICONFIG\fR]
-[\-\-apt \fIapt\fR|\fIaptitude\fR]
-[\-\-apt\-ftpproxy \fIURL\fR]
-[\-\-apt\-httpproxy \fIURL\fR]
-[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
-[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
-[\-\-cache \fIenabled\fR|\fIdisabled\fR]
-[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
-[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
-[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
-[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
-[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
-[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
-[\-r|\-\-root \fIDIRECTORY\fR]
-[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
-[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
-[\-\-distribution\-config \fIDIRECTORY\fR]
-[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
-[\-m|\-\-mirror\-build \fIURL\fR]
-[\-\-mirror\-build\-security \fIURL\fR]
-[\-\-mirror\-image \fIURL\fR]
-[\-\-mirror\-image\-security \fIURL\fR]
-[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
-[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
-[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
-[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
-[\-l|\-\-language \fILANGUAGE\fR]
-[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
-[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
-[\-\-security \fIenabled\fR|\fIdisabled\fR]
-[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
-[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
-[\-e|\-\-encryption \fIALGORITHM\fR]
-[\-\-username \fINAME\fR]
-[\-\-hostname \fINAME\fR]
-[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
-[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
-[\-\-iso\-volume \fISTRING\fR]
-[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
-[\-\-server\-path \fIDIRECTORY\fR]
-[\-\-source \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
-[\-\-grub\-splash \fIFILE\fR]
-[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-\-includes \fIPATH\fR]
-[\-\-templates \fIPATH\fR]
-[\-\-breakpoints]
-[\-\-debug]
-[\-\-force]
-[\-\-quiet]
-[\-\-verbose]
-
-.SH BESCHREIBUNG
-make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen.
-
-.SH OPTIONEN
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: dists/sid/live-helper/manpages/make-live.de.1 (from rev 1679, dists/trunk/live-helper/manpages/make-live.de.1)
===================================================================
--- dists/sid/live-helper/manpages/make-live.de.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/make-live.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,88 @@
+.TH MAKE\-LIVE 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+make\-live \- erstellt ein Debian Live-System
+
+.SH SYNOPSIS
+.B make\-live
+[config]
+[\-\-mode \fIMODE\fR]
+[\-\-config \fICONFIG\fR]
+[\-\-apt \fIapt\fR|\fIaptitude\fR]
+[\-\-apt\-ftpproxy \fIURL\fR]
+[\-\-apt\-httpproxy \fIURL\fR]
+[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
+[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
+[\-\-cache \fIenabled\fR|\fIdisabled\fR]
+[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
+[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
+[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
+[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
+[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
+[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
+[\-r|\-\-root \fIDIRECTORY\fR]
+[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
+[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
+[\-\-distribution\-config \fIDIRECTORY\fR]
+[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
+[\-m|\-\-mirror\-build \fIURL\fR]
+[\-\-mirror\-build\-security \fIURL\fR]
+[\-\-mirror\-image \fIURL\fR]
+[\-\-mirror\-image\-security \fIURL\fR]
+[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
+[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
+[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
+[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
+[\-l|\-\-language \fILANGUAGE\fR]
+[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
+[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
+[\-\-security \fIenabled\fR|\fIdisabled\fR]
+[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
+[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
+[\-e|\-\-encryption \fIALGORITHM\fR]
+[\-\-username \fINAME\fR]
+[\-\-hostname \fINAME\fR]
+[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
+[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
+[\-\-iso\-volume \fISTRING\fR]
+[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
+[\-\-server\-path \fIDIRECTORY\fR]
+[\-\-source \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
+[\-\-grub\-splash \fIFILE\fR]
+[\-\-syslinux\-splash \fIFILE\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-\-includes \fIPATH\fR]
+[\-\-templates \fIPATH\fR]
+[\-\-breakpoints]
+[\-\-debug]
+[\-\-force]
+[\-\-quiet]
+[\-\-verbose]
+
+.SH BESCHREIBUNG
+make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen.
+
+.SH OPTIONEN
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: dists/sid/live-helper/manpages/make-live.en.1
===================================================================
--- dists/trunk/live-helper/manpages/make-live.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ dists/sid/live-helper/manpages/make-live.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,88 +0,0 @@
-.TH MAKE\-LIVE 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-make\-live \- build a Debian Live system
-
-.SH SYNOPSIS
-.B make\-live
-[config]
-[\-\-mode \fIMODE\fR]
-[\-\-config \fICONFIG\fR]
-[\-\-apt \fIapt\fR|\fIaptitude\fR]
-[\-\-apt\-ftpproxy \fIURL\fR]
-[\-\-apt\-httpproxy \fIURL\fR]
-[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
-[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
-[\-\-cache \fIenabled\fR|\fIdisabled\fR]
-[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
-[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
-[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
-[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
-[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
-[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
-[\-r|\-\-root \fIDIRECTORY\fR]
-[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
-[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
-[\-\-distribution\-config \fIDIRECTORY\fR]
-[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
-[\-m|\-\-mirror\-build \fIURL\fR]
-[\-\-mirror\-build\-security \fIURL\fR]
-[\-\-mirror\-image \fIURL\fR]
-[\-\-mirror\-image\-security \fIURL\fR]
-[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
-[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
-[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
-[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
-[\-l|\-\-language \fILANGUAGE\fR]
-[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
-[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
-[\-\-security \fIenabled\fR|\fIdisabled\fR]
-[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
-[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
-[\-e|\-\-encryption \fIALGORITHM\fR]
-[\-\-username \fINAME\fR]
-[\-\-hostname \fINAME\fR]
-[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
-[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
-[\-\-iso\-volume \fISTRING\fR]
-[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
-[\-\-server\-path \fIDIRECTORY\fR]
-[\-\-source \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
-[\-\-grub\-splash \fIFILE\fR]
-[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-\-includes \fIPATH\fR]
-[\-\-templates \fIPATH\fR]
-[\-\-breakpoints]
-[\-\-debug]
-[\-\-force]
-[\-\-quiet]
-[\-\-verbose]
-
-.SH DESCRIPTION
-make\-live is a script calling all required live\-helper(7) programs to build a live system.
-
-.SH OPTIONS
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: dists/sid/live-helper/manpages/make-live.en.1 (from rev 1679, dists/trunk/live-helper/manpages/make-live.en.1)
===================================================================
--- dists/sid/live-helper/manpages/make-live.en.1	                        (rev 0)
+++ dists/sid/live-helper/manpages/make-live.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,88 @@
+.TH MAKE\-LIVE 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+make\-live \- build a Debian Live system
+
+.SH SYNOPSIS
+.B make\-live
+[config]
+[\-\-mode \fIMODE\fR]
+[\-\-config \fICONFIG\fR]
+[\-\-apt \fIapt\fR|\fIaptitude\fR]
+[\-\-apt\-ftpproxy \fIURL\fR]
+[\-\-apt\-httpproxy \fIURL\fR]
+[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
+[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
+[\-\-cache \fIenabled\fR|\fIdisabled\fR]
+[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
+[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
+[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
+[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
+[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
+[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
+[\-r|\-\-root \fIDIRECTORY\fR]
+[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
+[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
+[\-\-distribution\-config \fIDIRECTORY\fR]
+[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
+[\-m|\-\-mirror\-build \fIURL\fR]
+[\-\-mirror\-build\-security \fIURL\fR]
+[\-\-mirror\-image \fIURL\fR]
+[\-\-mirror\-image\-security \fIURL\fR]
+[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
+[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
+[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
+[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
+[\-l|\-\-language \fILANGUAGE\fR]
+[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
+[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
+[\-\-security \fIenabled\fR|\fIdisabled\fR]
+[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
+[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
+[\-e|\-\-encryption \fIALGORITHM\fR]
+[\-\-username \fINAME\fR]
+[\-\-hostname \fINAME\fR]
+[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
+[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
+[\-\-iso\-volume \fISTRING\fR]
+[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
+[\-\-server\-path \fIDIRECTORY\fR]
+[\-\-source \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
+[\-\-grub\-splash \fIFILE\fR]
+[\-\-syslinux\-splash \fIFILE\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-\-includes \fIPATH\fR]
+[\-\-templates \fIPATH\fR]
+[\-\-breakpoints]
+[\-\-debug]
+[\-\-force]
+[\-\-quiet]
+[\-\-verbose]
+
+.SH DESCRIPTION
+make\-live is a script calling all required live\-helper(7) programs to build a live system.
+
+.SH OPTIONS
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1 (from rev 1670, dists/trunk/live-helper)

Deleted: releases/live-helper/1.0~a11-1/Makefile
===================================================================
--- dists/trunk/live-helper/Makefile	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/Makefile	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,106 +0,0 @@
-# Makefile
-
-TRANSLATIONS="de"
-
-all: build
-
-test:
-	set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \
-	do \
-		sh -n $$SCRIPT; \
-	done
-
-build:
-	@echo "Nothing to build."
-
-install: test
-	# Installing executables
-	mkdir -p $(DESTDIR)/usr/bin
-	cp helpers/lh_* helpers/make-live $(DESTDIR)/usr/bin
-
-	# Installing shared data
-	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
-
-	# Installing documentation
-	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
-	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-helper
-
-	# Installing manpages
-	set -e; for MANPAGE in manpages/*.en.1; \
-	do \
-		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
-	done
-
-	set -e; for MANPAGE in manpages/*.en.7; \
-	do \
-		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
-	done
-
-	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
-	do \
-		for MANPAGE in manpages/*.$$TRANSLATION.1; \
-		do \
-			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
-		done; \
-		for MANPAGE in manpages/*.$$TRANSLATION.7; \
-		do \
-			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .$$TRANSLATION.7`.7; \
-		done; \
-	done
-
-uninstall:
-	# Uninstalling executables
-	for HELPER in helpers/*; \
-	do \
-		rm -f $(DESTDIR)/usr/bin/`basename $$HELPER`; \
-	done
-
-	# Uninstalling shared data
-	rm -rf $(DESTDIR)/usr/share/live-helper
-
-	# Uninstalling documentation
-	rm -rf $(DESTDIR)/usr/share/doc/live-helper
-
-	# Uninstalling manpages
-	set -e; for MANPAGE in manpages/*.en.1; \
-	do \
-		rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
-	done
-
-	set -e; for MANPAGE in manpages/*.en.7; \
-	do \
-		rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
-	done
-
-	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
-	do \
-		for MANPAGE in manpages/*.$$TRANSLATION.1; \
-		do \
-			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
-		done; \
-		for MANPAGE in manpages/*.$$TRANSLATION.7; \
-		do \
-			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .de.7`.7; \
-		done; \
-	done
-
-update:
-	set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
-	do \
-		sed -i	-e 's/2007\\-05\\-07/2007\\-05\\-14/' \
-			-e 's/07.05.2007/14.05.2007/' \
-			-e 's/1.0~a9/1.0~a10/' \
-		$$MANPAGE; \
-	done
-
-	sed -i -e 's/1.0~a9/1.0~a10/' functions/common.sh
-
-	sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch.sh
-	sed -i -e 's/1.0~a9/1.0~a10/' examples/cron/etch+beryl.sh
-
-clean:
-
-distclean:
-
-reinstall: uninstall install

Copied: releases/live-helper/1.0~a11-1/Makefile (from rev 1679, dists/trunk/live-helper/Makefile)
===================================================================
--- releases/live-helper/1.0~a11-1/Makefile	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/Makefile	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,106 @@
+# Makefile
+
+TRANSLATIONS="de"
+
+all: build
+
+test:
+	set -e; for SCRIPT in functions/* examples/*/*.sh helpers/* hooks/*; \
+	do \
+		sh -n $$SCRIPT; \
+	done
+
+build:
+	@echo "Nothing to build."
+
+install: test
+	# Installing executables
+	mkdir -p $(DESTDIR)/usr/bin
+	cp helpers/lh_* helpers/make-live $(DESTDIR)/usr/bin
+
+	# Installing shared data
+	mkdir -p $(DESTDIR)/usr/share/live-helper
+	cp -r examples functions hooks includes lists templates $(DESTDIR)/usr/share/live-helper
+
+	# Installing documentation
+	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
+	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-helper
+
+	# Installing manpages
+	set -e; for MANPAGE in manpages/*.en.1; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
+	done
+
+	set -e; for MANPAGE in manpages/*.en.7; \
+	do \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
+	done
+
+	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
+	do \
+		for MANPAGE in manpages/*.$$TRANSLATION.1; \
+		do \
+			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
+		done; \
+		for MANPAGE in manpages/*.$$TRANSLATION.7; \
+		do \
+			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .$$TRANSLATION.7`.7; \
+		done; \
+	done
+
+uninstall:
+	# Uninstalling executables
+	for HELPER in helpers/*; \
+	do \
+		rm -f $(DESTDIR)/usr/bin/`basename $$HELPER`; \
+	done
+
+	# Uninstalling shared data
+	rm -rf $(DESTDIR)/usr/share/live-helper
+
+	# Uninstalling documentation
+	rm -rf $(DESTDIR)/usr/share/doc/live-helper
+
+	# Uninstalling manpages
+	set -e; for MANPAGE in manpages/*.en.1; \
+	do \
+		rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
+	done
+
+	set -e; for MANPAGE in manpages/*.en.7; \
+	do \
+		rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
+	done
+
+	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
+	do \
+		for MANPAGE in manpages/*.$$TRANSLATION.1; \
+		do \
+			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
+		done; \
+		for MANPAGE in manpages/*.$$TRANSLATION.7; \
+		do \
+			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .de.7`.7; \
+		done; \
+	done
+
+update:
+	set -e; for MANPAGE in manpages/*.de.* manpages/*.en.*; \
+	do \
+		sed -i	-e 's/2007\\-05\\-14/2007\\-05\\-21/' \
+			-e 's/14.05.2007/21.05.2007/' \
+			-e 's/1.0~a10/1.0~a11/' \
+		$$MANPAGE; \
+	done
+
+	sed -i -e 's/1.0~a10/1.0~a11/' functions/common.sh
+
+	sed -i -e 's/1.0~a10/1.0~a11/' examples/cron/etch.sh
+	sed -i -e 's/1.0~a10/1.0~a11/' examples/cron/etch+beryl.sh
+
+clean:
+
+distclean:
+
+reinstall: uninstall install

Deleted: releases/live-helper/1.0~a11-1/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/debian/changelog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,83 +0,0 @@
-live-helper (1.0~a10-1) unstable; urgency=medium
-
-  * New upstream release:
-    - really removed forgotten set -x in the cron (Closes: #421105).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 14 May 2007 00:00:00 +0200
-
-live-helper (1.0~a9-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  7 May 2007 00:00:00 +0200
-
-live-helper (1.0~a8-1) unstable; urgency=medium
-
-  * New upstream release:
-    - updated syslinux templates (Closes: #399658).
-    - removed forgotten set -x in the cron (Closes: #421105).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 30 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a7-1) unstable; urgency=medium
-
-  * New upstream release:
-    - make-live unmounts proc and sys on exit and failures
-      (Closes: #394334, #410147).
-    - supporting sudo (Closes: #387069).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 23 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a6-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 16 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a5-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  9 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  2 Apr 2007 00:00:00 +0200
-
-live-helper (1.0~a3-2) unstable; urgency=low
-
-  * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 17:00:00 +0200
-
-live-helper (1.0~a3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 00:00:00 +0100
-
-live-helper (1.0~a2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 19 Mar 2007 00:00:00 +0100
-
-live-helper (1.0~a1-3) unstable; urgency=low
-
-  * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 21:00:00 +0100
-
-live-helper (1.0~a1-2) unstable; urgency=low
-
-  * New upstream snapshot.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 18:00:00 +0100
-
-live-helper (1.0~a1-1) unstable; urgency=low
-
-  * Initial release, replacing live-package.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 12 Mar 2007 00:00:00 +0100

Copied: releases/live-helper/1.0~a11-1/debian/changelog (from rev 1728, dists/trunk/live-helper/debian/changelog)
===================================================================
--- releases/live-helper/1.0~a11-1/debian/changelog	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/debian/changelog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,89 @@
+live-helper (1.0~a11-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 21 May 2007 00:00:00 +0200
+
+live-helper (1.0~a10-1) unstable; urgency=medium
+
+  * New upstream release:
+    - really removed forgotten set -x in the cron (Closes: #421105).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 14 May 2007 00:00:00 +0200
+
+live-helper (1.0~a9-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  7 May 2007 00:00:00 +0200
+
+live-helper (1.0~a8-1) unstable; urgency=medium
+
+  * New upstream release:
+    - updated syslinux templates (Closes: #399658).
+    - removed forgotten set -x in the cron (Closes: #421105).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 30 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a7-1) unstable; urgency=medium
+
+  * New upstream release:
+    - make-live unmounts proc and sys on exit and failures
+      (Closes: #394334, #410147).
+    - supporting sudo (Closes: #387069).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 23 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 16 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  9 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  2 Apr 2007 00:00:00 +0200
+
+live-helper (1.0~a3-2) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 17:00:00 +0200
+
+live-helper (1.0~a3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 26 Mar 2007 00:00:00 +0100
+
+live-helper (1.0~a2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 19 Mar 2007 00:00:00 +0100
+
+live-helper (1.0~a1-3) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 21:00:00 +0100
+
+live-helper (1.0~a1-2) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 14 Mar 2007 18:00:00 +0100
+
+live-helper (1.0~a1-1) unstable; urgency=low
+
+  * Initial release, replacing live-package.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 12 Mar 2007 00:00:00 +0100

Copied: releases/live-helper/1.0~a11-1/debian/changelog.live-package (from rev 1689, dists/trunk/live-helper/debian/changelog.live-package)
===================================================================
--- releases/live-helper/1.0~a11-1/debian/changelog.live-package	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/debian/changelog.live-package	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,208 @@
+live-package (0.99.26-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 12:27:00 +0100
+
+live-package (0.99.25-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 01:49:00 +0100
+
+live-package (0.99.24-1) unstable; urgency=low
+
+  * New upstream release:
+    - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
+      Mathieu Geli <mathieu.geli at gmail.com> (Closes: #412325).
+
+ -- Daniel Baumann <daniel at debian.org>  Sun,  3 Mar 2007 12:25:00 +0100
+
+live-package (0.99.23-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 21 Feb 2007 22:08:00 +0100
+
+live-package (0.99.22-1) unstable; urgency=low
+
+  * New upstream release:
+    - updates manpage (Closes: #411008).
+
+ -- Daniel Baumann <daniel at debian.org>  Fri, 16 Feb 2007 20:38:00 +0100
+
+live-package (0.99.21-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 12 Feb 2007 15:06:00 +0100
+
+live-package (0.99.20-1) unstable; urgency=low
+
+  * New upstream release:
+    - Fixed manual pruning in minimal flavour as suggested by
+      Bas Wijnen <wijnen at debian.org> (Closes: #410040).
+
+ -- Daniel Baumann <daniel at debian.org>  Thu,  1 Feb 2007 17:35:00 +0100
+
+live-package (0.99.19-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 31 Jan 2007 12:38:00 +0100
+
+live-package (0.99.18-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Thu, 25 Jan 2007 08:29:00 +0100
+
+live-package (0.99.17-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Wed, 24 Jan 2007 22:18:00 +0100
+
+live-package (0.99.16-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Thu, 18 Jan 2007 16:25:00 +0100
+
+live-package (0.99.15-1) unstable; urgency=low
+
+  * New upstream release:
+    - switched default distribution back to unstable, as unstable is usable
+      again from the kernel point of view (Closes: #400457).
+    - added file to the minimal package list (Closes: #400485).
+
+ -- Daniel Baumann <daniel at debian.org>  Tue, 16 Jan 2007 21:24:00 +0100
+
+live-package (0.99.14-3) unstable; urgency=high
+
+  * Adding workaround for new xorg packages by including xserver-xorg-input-all
+    and xserver-xorg-video-all in all X11 package lists. See #405639 for more
+    information.
+  * Adding xdebconfigurator to all X11 package lists.
+
+ -- Daniel Baumann <daniel at debian.org>  Fri,  5 Jan 2007 22:34:00 +0100
+
+live-package (0.99.14-2) unstable; urgency=high
+
+  * Adding workaround for initrd backup files (Closes: #404314).
+
+ -- Daniel Baumann <daniel at debian.org>  Thu,  4 Jan 2007 20:52:00 +0100
+
+live-package (0.99.14-1) unstable; urgency=medium
+
+  * New upstream release:
+    - fixed typo for policy-rc.d hack (Closes: #396813), thanks to
+      Markus Bauer <bauer-markus at web.de>.
+    - corrected manpage section (Closes: #396083), thanks to
+      Sune Vuorela <reportbug at pusling.com>.
+    - fixes script sourcing to exclude files in .svn (Closes: #396861),
+      thanks to Markus Bauer <bauer-markus at web.de>.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  6 Nov 2006 00:00:00 +0200
+
+live-package (0.99.13-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 30 Oct 2006 00:00:00 +0200
+
+live-package (0.99.12-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation
+      (Closes: #394226).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 23 Oct 2006 00:00:00 +0200
+
+live-package (0.99.11-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 16 Oct 2006 00:00:00 +0200
+
+live-package (0.99.10-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  9 Oct 2006 00:00:00 +0200
+
+live-package (0.99.9-1) unstable; urgency=medium
+
+  * New upstream release:
+    - adds support for custom repositories (Closes: #387068).
+    - using proxy for chroot creating too (Closes: #390378).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  2 Oct 2006 00:00:00 +0200
+
+live-package (0.99.8-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 25 Sep 2006 00:00:00 +0200
+
+live-package (0.99.7-1) unstable; urgency=medium
+
+  * New upstream release:
+    - removes the now outdated handling of testing specific kernels
+      (Closes: #387562).
+    - added fix from Bas Wijnen <wijnen at debian.org> for space handling in
+      arguments (Closes: #388204).
+    - fixes package list handling similar to the fix suggested by Alex Owen
+      <r.alex.owen at gmail.com> (Closes: #388060).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 18 Sep 2006 00:00:00 +0200
+
+live-package (0.99.6-1) unstable; urgency=medium
+
+  * New upstream release:
+    - fixing netboot.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 11 Sep 2006 00:00:00 +0200
+
+live-package (0.99.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Set maintainer to the project list.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon,  4 Sep 2006 00:00:00 +0200
+
+live-package (0.99.4-1) unstable; urgency=low
+
+  * New upstream release:
+    - Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update pxelinux.cfg
+      for NFS root in casper (Closes: #380512).
+    - Temporarily hacks xorg configuration file to remove BusID and set
+      default driver to vesa (Closes: #382391).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 28 Aug 2006 00:00:00 +0200
+
+live-package (0.99.3-1) unstable; urgency=low
+
+  * New upstream release:
+    - fixed configuration file handling (Closes: #384598).
+  * Update long descriptiong (Closes: #382473).
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 21 Aug 2006 00:00:00 +0200
+
+live-package (0.99.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 31 Jul 2006 00:00:00 +0200
+
+live-package (0.99.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 24 Jul 2006 00:00:00 +0200
+
+live-package (0.99-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Daniel Baumann <daniel at debian.org>  Mon, 17 Jul 2006 00:00:00 +0200

Deleted: releases/live-helper/1.0~a11-1/debian/changelog.old
===================================================================
--- dists/trunk/live-helper/debian/changelog.old	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/debian/changelog.old	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,208 +0,0 @@
-live-package (0.99.26-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 12:27:00 +0100
-
-live-package (0.99.25-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Fri,  9 Mar 2007 01:49:00 +0100
-
-live-package (0.99.24-1) unstable; urgency=low
-
-  * New upstream release:
-    - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by
-      Mathieu Geli <mathieu.geli at gmail.com> (Closes: #412325).
-
- -- Daniel Baumann <daniel at debian.org>  Sun,  3 Mar 2007 12:25:00 +0100
-
-live-package (0.99.23-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 21 Feb 2007 22:08:00 +0100
-
-live-package (0.99.22-1) unstable; urgency=low
-
-  * New upstream release:
-    - updates manpage (Closes: #411008).
-
- -- Daniel Baumann <daniel at debian.org>  Fri, 16 Feb 2007 20:38:00 +0100
-
-live-package (0.99.21-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 12 Feb 2007 15:06:00 +0100
-
-live-package (0.99.20-1) unstable; urgency=low
-
-  * New upstream release:
-    - Fixed manual pruning in minimal flavour as suggested by
-      Bas Wijnen <wijnen at debian.org> (Closes: #410040).
-
- -- Daniel Baumann <daniel at debian.org>  Thu,  1 Feb 2007 17:35:00 +0100
-
-live-package (0.99.19-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 31 Jan 2007 12:38:00 +0100
-
-live-package (0.99.18-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Thu, 25 Jan 2007 08:29:00 +0100
-
-live-package (0.99.17-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Wed, 24 Jan 2007 22:18:00 +0100
-
-live-package (0.99.16-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Thu, 18 Jan 2007 16:25:00 +0100
-
-live-package (0.99.15-1) unstable; urgency=low
-
-  * New upstream release:
-    - switched default distribution back to unstable, as unstable is usable
-      again from the kernel point of view (Closes: #400457).
-    - added file to the minimal package list (Closes: #400485).
-
- -- Daniel Baumann <daniel at debian.org>  Tue, 16 Jan 2007 21:24:00 +0100
-
-live-package (0.99.14-3) unstable; urgency=high
-
-  * Adding workaround for new xorg packages by including xserver-xorg-input-all
-    and xserver-xorg-video-all in all X11 package lists. See #405639 for more
-    information.
-  * Adding xdebconfigurator to all X11 package lists.
-
- -- Daniel Baumann <daniel at debian.org>  Fri,  5 Jan 2007 22:34:00 +0100
-
-live-package (0.99.14-2) unstable; urgency=high
-
-  * Adding workaround for initrd backup files (Closes: #404314).
-
- -- Daniel Baumann <daniel at debian.org>  Thu,  4 Jan 2007 20:52:00 +0100
-
-live-package (0.99.14-1) unstable; urgency=medium
-
-  * New upstream release:
-    - fixed typo for policy-rc.d hack (Closes: #396813), thanks to
-      Markus Bauer <bauer-markus at web.de>.
-    - corrected manpage section (Closes: #396083), thanks to
-      Sune Vuorela <reportbug at pusling.com>.
-    - fixes script sourcing to exclude files in .svn (Closes: #396861),
-      thanks to Markus Bauer <bauer-markus at web.de>.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  6 Nov 2006 00:00:00 +0200
-
-live-package (0.99.13-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 30 Oct 2006 00:00:00 +0200
-
-live-package (0.99.12-1) unstable; urgency=medium
-
-  * New upstream release.
-    - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation
-      (Closes: #394226).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 23 Oct 2006 00:00:00 +0200
-
-live-package (0.99.11-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 16 Oct 2006 00:00:00 +0200
-
-live-package (0.99.10-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  9 Oct 2006 00:00:00 +0200
-
-live-package (0.99.9-1) unstable; urgency=medium
-
-  * New upstream release:
-    - adds support for custom repositories (Closes: #387068).
-    - using proxy for chroot creating too (Closes: #390378).
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  2 Oct 2006 00:00:00 +0200
-
-live-package (0.99.8-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 25 Sep 2006 00:00:00 +0200
-
-live-package (0.99.7-1) unstable; urgency=medium
-
-  * New upstream release:
-    - removes the now outdated handling of testing specific kernels
-      (Closes: #387562).
-    - added fix from Bas Wijnen <wijnen at debian.org> for space handling in
-      arguments (Closes: #388204).
-    - fixes package list handling similar to the fix suggested by Alex Owen
-      <r.alex.owen at gmail.com> (Closes: #388060).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 18 Sep 2006 00:00:00 +0200
-
-live-package (0.99.6-1) unstable; urgency=medium
-
-  * New upstream release:
-    - fixing netboot.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 11 Sep 2006 00:00:00 +0200
-
-live-package (0.99.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Set maintainer to the project list.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  4 Sep 2006 00:00:00 +0200
-
-live-package (0.99.4-1) unstable; urgency=low
-
-  * New upstream release:
-    - Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update pxelinux.cfg
-      for NFS root in casper (Closes: #380512).
-    - Temporarily hacks xorg configuration file to remove BusID and set
-      default driver to vesa (Closes: #382391).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 28 Aug 2006 00:00:00 +0200
-
-live-package (0.99.3-1) unstable; urgency=low
-
-  * New upstream release:
-    - fixed configuration file handling (Closes: #384598).
-  * Update long descriptiong (Closes: #382473).
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 21 Aug 2006 00:00:00 +0200
-
-live-package (0.99.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 31 Jul 2006 00:00:00 +0200
-
-live-package (0.99.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 24 Jul 2006 00:00:00 +0200
-
-live-package (0.99-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 17 Jul 2006 00:00:00 +0200

Deleted: releases/live-helper/1.0~a11-1/debian/rules
===================================================================
--- dists/trunk/live-helper/debian/rules	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/debian/rules	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,55 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-upstream:
-	# Needs: subversion
-	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-helper || true
-	find . -type d -name .svn | xargs rm -rf
-
-build:
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Installing package
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
-
-	install -D -m 0644 debian/changelog.old debian/live-helper/usr/share/doc/live-helper/changelog.Debian.old
-
-	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
-
-	# Removing double files
-	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
-	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
-	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old debian/live-helper/usr/share/doc/live-helper/changelog.old
-
-binary-arch: build install
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs docs/ChangeLog
-	dh_installdocs
-	dh_install
-	dh_installcron
-	dh_installman
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Copied: releases/live-helper/1.0~a11-1/debian/rules (from rev 1689, dists/trunk/live-helper/debian/rules)
===================================================================
--- releases/live-helper/1.0~a11-1/debian/rules	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/debian/rules	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,55 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+upstream:
+	# Needs: subversion
+	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-helper || true
+	find . -type d -name .svn | xargs rm -rf
+
+build:
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Installing package
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper
+
+	install -D -m 0644 debian/changelog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.Debian.live-package
+
+	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
+
+	# Removing double files
+	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
+	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
+	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package
+
+binary-arch: build install
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs docs/ChangeLog
+	dh_installdocs
+	dh_install
+	dh_installcron
+	dh_installman
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Deleted: releases/live-helper/1.0~a11-1/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/docs/ChangeLog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,558 +0,0 @@
-2007-05-18  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS.
-	  - Renamed LIVE_KERNEL_PACKAGES to LIVE_LINUX_PACKAGES.
-	  - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES.
-	  - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES.
-	  - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM.
-	  - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER.
-	  - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH.
-	* Uploaded 1.0~a10-1.
-
-2007-05-18  Mathieu Geli  <mathieu.geli at gmail.com>
-
-	* examples/hooks/*
-	  - Added new hooks for non-free/contrib drivers
-	    Intel  : ipw3945, ipw2100, ipw2200
-	    Nvidia : nvidia-legacy
-	    Ralink : rt2x00, rt2570
-	  - Changed behavior of beryl hook: autostart beryl
-	    if video driver allows it (minimal detection based on glxinfo)
-
-2007-05-17  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_md5sum, lh_source,md5sum:
-	  - Fixed accidentally inclusion of md5sum.txt itself into
-	    binary/md5sum.txt.
-
-2007-05-16  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Added check for local includes and templates.
-	  - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES.
-	  - Renamed lh_binary_localincludes to lh_binary_local-includes.
-	  - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
-	  - Renamed lh_chroot_localincludes to lh_chroot_local-includes.
-	  - Renamed lh_chroot_localpackages to lh_chroot_local-packages.
-	  - Renamed lh_chroot_localpackageslists to
-	    lh_chroot_local-packageslists.
-	  - Renamed lh_source_download to lh_source_debian.
-	  - Renamed lh_source_config to lh_source_debian-live.
-
-2007-05-09  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
-	  - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY.
-	* helpers/lh_chroot_sources:
-	  - Added aptitude overwrite for untrusted sources.
-	  - Changed checks for *.build/*.image to *.bootstrap/*.binary.
-
-2007-05-08  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Renamed lh_binary_linuximage to lh_binary_linux-image.
-	  - Renamed lh_chroot_linuximage to lh_chroot_linux-image.
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
-	  - Added missing cache directory when only caching stages.
-	* helpers/lh_binary_debian-installer, lh_binary_linux-image,
-	  lh_binary_memtest:
-	  - Changed kernel installation directories.
-
-2007-05-07  Daniel Baumann  <daniel at debian.org>
-
-	* examples/snapshot-build.sh, live-snapshot.sources.list:
-	  - Added.
-	* helpers/lh_binary_rootfs:
-	  - Fixed wrong order of squashfs options.
-
-2007-05-06  Daniel Baumann  <daniel at debian.org>
-
-	* templates/syslinux:
-	  - Updated again.
-	* helpers/lh_config:
-	  - Fixed overwriting of LH_* options.
-	* helpers/lh_binary_includes:
-	  - Fixed a quoting typo.
-	  - Working arround symlinks on usb-hdd binary images.
-	* Uploaded 1.0~a9-1.
-
-2007-04-31  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Added LH_INITRAMFS.
-	  - Splitted config/image into config/binary and config/source.
-	* Uploaded 1.0~a8-1.
-
-2007-04-26  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/*:
-	  - Implemented paranoid caching with LIVE_CACHE_INDICES,
-	    LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build
-	    images offline from the cache.
-
-2007-04-25  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_usb, lh_source_usb:
-	  - In preparation of adding support for usb-zip images, the usb binary
-	    type is renamed to usb-hdd.
-
-2007-04-24  Daniel Baumann  <daniel at debian.org>
-
-	* functions/stagefile.sh:
-	  - Requite_stagefile can require more than one stage.
-	* helpers/lh_binary_debian-installer:
-	  - Added.
-
-2007-04-23  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_includes, lh_binary_usb, lh_source_usb:
-	  - Added workaround for vfat limitations.
-
-2007-04-23  Daniel Baumann  <daniel at debian.org>
-
-	* Makefile:
-	  - Added simple test rule.
-	* functions/*, helpers/*:
-	  - Added LH_ROOT_COMMAND to support sudo.
-	* functions/package.sh:
-	  - Added. Helper dependencies in-chroot can now be handled by
-	    functions.
-	* helpers/make-live:
-	  - Added trap to unmount proc and sys on exit and failure.
-	* Uploaded 1.0~a7-1.
-
-2007-04-22  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - In ubuntu mode, setting default sections to main restricted.
-	* helpers/lh_binary_grub:
-	  - Making copy call of grub arch independent.
-	* helpers/lh_chroot_sources:
-	  - In debian mode, checking for non-sid rather than if-etch.
-	  - Fixed wrong Ubuntu security URL.
-
-2007-04-20  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_rootfs, lh_binary_iso:
-	  - Added mksquashfs/genisoimage quiet/verbose options.
-
-2007-04-19  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, lh_binary_syslinux:
-	  - Added check for splash in config directory.
-
-2007-04-18  Daniel Baumann  <daniel at debian.org>
-
-	* debian/cron.daily, default:
-	  - Added.
-	* doc/BUGS, DOWNLOAD:
-	  - Added.
-	* examples/edu.sources.list, fai.sources.list:
-	  - Added.
-	* manpages/*:
-	  - Added language suffix.
-	  - Added German translations.
-
-2007-04-17  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_chroot_hooks:
-	  - Also check for tasks specific hooks, not just for package lists.
-	* helpers/lh_chroot_tasks:
-	  - Allowing to use either aptitude or tasksel.
-	* hooks/kde-desktop:
-	  - Added.
-	* manpages/lh_build.1, lh_source.1:
-	  - Added.
-
-2007-04-16  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Using lsb_release, if existing, to set default mode to ubuntu on
-	    ubuntu systems.
-	  - Moved desktop task to the end, so that gdm doesn't take
-	    gnome-session as default.
-	* helpers/lh_chroot_hooks:
-	  - Added simple --hooks for easy testing.
-	* Uploaded 1.0~a6-1.
-
-2007-04-15  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Set LH_APT to apt-get when using mini or minimal.
-	* helpers/lh_chroot_sources:
-	  - Excluding comments from local sources lists.
-	* helpers/lh_bootstrap_cdebootstrap:
-	  - Removing imported configuration files by cdebootstrap.
-
-2007-04-13  Daniel Baumann  <daniel at debian.org>
-
-	* Moved examples from /usr/share/doc to /usr/share/live-helper.
-	* examples/bpo.sources.list:
-	  - Added.
-	* functions/defaults.sh:
-	  - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
-	* helpers/lh_clean:
-	  - Added missing removal of generic source.
-
-2007-04-12  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_config, make-live:
-	  - Adding --config.
-	* helpers/lh_binary_memtester86:
-	  - Renamed to lh_binary_memtest, made more generic.
-	* functions/defaults.sh:
-	  - Setting default distribution to etch until 2.6.20 has setteled in
-	    unstable.
-
-2007-04-11  Daniel Baumann  <daniel at debian.org>
-
-	* Merging from sidux fllbuilder 1.0.4:
-	  - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
-	  - helpers/lh_chroot_linuximage: Added additional options to
-	    kernel-img.conf.
-	  - helpers/lh_chroot_proc: Made binfmt umount conditional.
-	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
-	  - Added.
-	* helpers/lh_binary_grub, lh_binary_syslinux:
-	  - Added failsafe kernel entries.
-	* helpers/lh_chroot_apt:
-	  - Using apt.conf.d also for apt, not just for aptitude.
-	  - Minor code cleanup.
-	* helpers/lh_source_*:
-	  - Minor code cleanup.
-	* helpers/lh_source_download:
-	  - Added LIVE_BOOTLOADER to the list of source packages.
-	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
-	  - Added.
-
-2007-04-10  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_includes, includes/*:
-	  - Redone.
-
-2007-04-09  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_yaboot, templates/yaboot:
-	  - Added.
-
-2007-04-09  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_config, make-live, functions/defaults.sh:
-	  - Added mode to distinguish between Debian and Ubuntu.
-	* helpers/lh_chroot_sources:
-	  - Added check for LIVE_MIRROR_BUILD* to be equal to
-	    LIVE_MIRROR_IMAGE*.
-	* Uploaded 1.0~a5-1.
-
-2007-04-08  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_net:
-	  - Added check for namespace collision with LIVE_SERVER_PATH.
-	* helpers/lh_binary_grub:
-	  - Added functionality for usb|hdd images.
-
-2007-04-07  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_chroot_sources:
-	  - Moved check for local source lists from
-	    config/sources.lists.{build,image} to
-	    config/chroot_sources/*.{build,image}.
-	  - Added check for local gpg keys in
-	    config/chroot_sources/*.{build,image}.gpg.
-	  - Added check for local keyring packages in
-	    config/chroot_sources/*.deb.
-	  - Added LIVE_KEYRING_PACKAGES.
-
-2007-04-06  Daniel Baumann  <daniel at debian.org>
-
-	* functions/breakpoints.sh, helpers/*:
-	  - Added initial breakpoints.
-	* functions/chroot.sh:
-	  - Adding /usr/local to path.
-	* functions/lockfile.sh:
-	  - Added additional signals to the trap.
-	* helpers/lh_binary_includes:
-	  - Respect LIVE_INCLUDES=none.
-	* manpages/*:
-	  - Updated.
-
-2007-04-05  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, templates/grub/menu.lst:
-	  - Added splash functionality.
-	* Uploaded 1.0~a4-1.
-
-2007-04-03  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, lh_binary_grub:
-	  - Added check for LIVE_TEMPLATES to be existing.
-	* helpers/lh_binary_includes:
-	  - Added check for LIVE_INCLUDES to be existing.
-
-2007-04-02  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*:
-	  - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
-	* helpers/lh_binary_iso:
-	  - Added exclude for the bootloader from the iso image content.
-
-2007-04-01  Daniel Baumann  <daniel at debian.org>
-
-	* helper/lh_binary_grub:
-	  - Added.
-
-2007-03-30  Daniel Baumann  <daniel at debian.org>
-
-	* helper/lh_chroot_localincludes:
-	  - Fixed wrong path for hook removal.
-
-2007-03-29  Daniel Baumann  <daniel at debian.org>
-
-	* functions/common.sh, echo.sh:
-	  - Added.
-	* doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7:
-	  - Added forgotten helpers.
-	* doc/FAQ:
-	  - Added.
-	* lists/mini, minimal:
-	  - Added --yes to apt call to make them non-interactive.
-	* manpages/lh_chroot.1:
-	  - Added.
-
-2007-03-28  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
-	  - Added --debug, --quiet, and --verbose.
-
-2007-03-27  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_linuximage, lh_binary_memtest86:
-	  - Added missing Read_conffiles to fix foreign architecture builds.
-
-2007-03-26  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
-	  lh_clean:
-	  - Added routine to cache bootstrapped chroot as suggested by Kai
-	    Hendry <hendry at iki.fi>.
-	* helpers/lh_chroot_rootfs:
-	  - Fixed typo in net type.
-	* lists/gnome*, kde*, standard-x11, xfce*:
-	  - Added menu.
-
-2007-03-26  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Fixed handling of desktop list variable loop.
-	* Uploaded 1.0~a3-1.
-
-2007-03-25  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*:
-	  - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
-	  - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS.
-	* functions/cache.sh:
-	  - Added.
-	* helpers/lh_bootstrap_cdebootstrap:
-	  - Added removal of cdebootstrap-helper-diverts.
-	* helpers/lh_binary_chroot:
-	  - Added.
-	* helpers/lh_binary_rootfs:
-	  - Moved filesystem routines into chroot.
-	* helpers/lh_chroot_localization, lh_chroot_localpackages,
-	  lh_chroot_localpackageslists, lh_chroot_packages,
-	  lh_chroot_packageslists, lh_chroot_tasks:
-	  - Added check for LH_CACHE.
-	* helpers/lh_chroot_apt:
-	  - Removing old apt.conf if existing as suggested by Ben Armstrong
-	    <synrg at debian.org>.
-	* helpers/lh_chroot_hacks:
-	  - Added check for already installed smbfs.
-	  - Added check for already configured initramfs.conf as suggested by
-	    Ben Armstrong <synrg at debian.org>.
-	* helpers/lh_chroot_interactive:
-	  - Added.
-	* helpers/lh_chroot_tasks:
-	  - Added routine for LH_APT=apt.
-	* lists/minimal-net:
-	  - Minimized.
-
-2007-03-24  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*, hooks/*:
-	  - Added GPL blurb.
-	* functions/arguments.sh, helpers/*:
-	  - Added common arguments.
-	* functions/arguments.sh, stagefile.sh, helpers/*,
-	  manpages/live-helper.7:
-	  - Added --force option.
-	* functions/defaults.sh, helpers/lh_binary_syslinux, lh_config,
-	  make-live:
-	  - Added LIVE_USERNAME and LIVE_HOSTNAME.
-	* helpers/lh_binary_linuximage, lh_binary_memtest86,
-	  lh_binary_syslinux:
-	  - Moved kernel directory to live.
-	* helpers/lh_clean:
-	  - Added purge.
-
-2007-03-23  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/make-live:
-	  - Calling Arguments twice to catch case with non-default root.
-
-2007-03-22  Daniel Baumann  <daniel at debian.org>
-
-	* functions/default.sh, helpers/*:
-	  - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
-	    lh_chroot_localpackageslist to lh_chroot_localpackageslists
-	* helpers/lh_binary_includes:
-	  - Using LIVE_INCLUDES now.
-	* helpers/lh_chroot_apt:
-	  - Added LH_APT_SECURE.
-	* helpers/lh_chroot_linuximage:
-	  - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
-	    local packages.
-
-2007-03-21  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
-	  - Checking earlier if there is something todo.
-	* helpers/lh_binary_linuximage, lh_binary_syslinux,
-	  lh_chroot_linuximage, templates/syslinux/isolinux.cfg:
-	  - Extended to support multiple kernels at once.
-	* helpers/lh_binary_includes, lh_binary_localincludes,
-	  lh_chroot_localincludes:
-	  - Replaced path with variable as suggested Kai Hendry <hendry at iki.fi>.
-	* helpers/lh_source_md5sum:
-	  - Added.
-	* helpers/make-live:
-	  - Added short options in ARGUMENTS.
-	* functions/defaults.sh, helpers/*:
-	  - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR.
-	  - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
-	    LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
-
-2007-03-20  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/make-live:
-	  - Fixed typo in ARGUMENTS.
-
-2007-03-19  Daniel Baumann  <daniel at debian.org>
-
-	* lists/gnome*, kde*, standard-x11, xfce*:
-	  - Added alsa-base, alsa-oss, alsa-utils, and discover.
-
-2007-03-19  Daniel Baumann  <daniel at debian.org>
-
-	* Uploaded 1.0~a2-1.
-
-2007-03-18  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Quoted date call in LIVE_ISO_VOLUME.
-	* manpages/lh_clean.1:
-	  - Added.
-
-2007-03-17  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh, helpers/*:
-	  - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
-	    to LIVE_MIRROR_LOCAL_SECURITY.
-	* doc/examples/beryl-hook.sh:
-	  - Added, submitted by Inigo Tejedor Arrondo <inigo at navarrux.org>.
-	* helpers/lh_config, make-live:
-	  - Added check for newconfig to prevent overwriting of non-specified
-	    options to default values.
-	* helpers/lh_chroot_localhooks:
-	  - Added basename where needed.
-	* helpers/lh_chroot_sources:
-	  - Added check for local sources.list in config for custom
-	    repositories.
-	  - Replaced security check for etch with check for not-unstable.
-	* manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1,
-	  lh_bootstrap_debootstrap.1, lh_testroot.1:
-	  - Added.
-	* templates/syslinux/pxlinux.cfg:
-	  - Fixed path.
-
-2007-03-16  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_usb: Corrected stagefile creation.
-
-2007-03-15  Daniel Baumann  <daniel at debian.org>
-
-	* Makefile:
-	  - Replaced helper uninstall routine with a less intrusive one.
-	* doc/NEWS:
-	  - Updated.
-	* functions/conffile.sh:
-	  - Beautified.
-	* functions/defaults.sh:
-	  - Added LH_LOSETUP.
-	* functions/lockfile.sh:
-	  - Beautified.
-	* helpers/*:
-	  - Allowing apt-get, not just apt in LH_APT.
-	* helpers/lh_config:
-	  - Added check for existing configuration.
-	* helpers/lh_binary_md5sum:
-	  - Removed legacy code.
-	* helpers/lh_binary_manifest:
-	  - Added creation of packages.txt.
-	* helpers/lh_binary_usb, lh_source_usb:
-	  - Replaced loop device node workaround with a better one.
-	* helpers/lh_chroot_hooks, lh_chroot_localhooks:
-	  - Fixed executable check.
-	* helpers/lh_source_config:
-	  - Added.
-	* helpers/lh_source_download:
-	  - Separeted debian sources and debian-live configuration into
-	    different directories.
-	  - Added live-helper to the sources.
-	* helpers/lh_source_generic, lh_source_iso, lh_source_usb,
-	  lh_source_net:
-	  - Removed annyoing warning when sources are disabled.
-	* helpers/lh_source_net:
-	  - Beautified.
-	* helpers/make-live:
-	  - Fixed typo in ARGUMENTS.
-	  - Moved help, usage, version into functions.
-	  - Removed build pre-option.
-	* manpages/live-helper.7:
-	  - Added.
-	* templates/syslinux/f10.txt:
-	  - Added note about Debian Live project.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh, helpers/*:
-	  - Converted LIVE_ROOT to directory, not full path.
-	* functions/*, helpers/*:
-	  - Replaced LIVE_CHROOT with directory name.
-	* functions/conffile.sh:
-	  - Added warning if CONFFILE is not readable.
-	* helpers/lh_chroot_localization:
-	  - Completed check for koffice.
-	* helpers/lh_source_download:
-	  - Fixed typo in old source removal.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_chroot_hacks:
-	  - Added removal of udev persistent-net rule.
-	* Uploaded 1.0~a1-3.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Fixed setting of LIVE_SYSVINIT.
-	* helpers/lh_chroot_sysvinit:
-	  - Changed check for LIVE_SYSVINIT from disabled to enabled.
-	* Uploaded 1.0~a1-2.
-
-2007-03-12  Daniel Baumann  <daniel at debian.org>
-
-	* Rewritten live-package.
-	* Uploaded 1.0~a1-1.

Copied: releases/live-helper/1.0~a11-1/docs/ChangeLog (from rev 1728, dists/trunk/live-helper/docs/ChangeLog)
===================================================================
--- releases/live-helper/1.0~a11-1/docs/ChangeLog	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/docs/ChangeLog	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,567 @@
+2007-05-24  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_syslinux:
+	  - Added dedicated directory handling for syslinux (>= 3.36) on usb.
+	* helpers/lh_binary_debian-installer, lh_binary_linux-image,
+	  lh_binary_memtest, lh_binary_syslinux:
+	  - Added legacy support for syslinux (<< 3.36).
+	* Uploaded 1.0~a11-1.
+
+2007-05-18  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Renamed LIVE_KERNEL_FLAVOUR to LIVE_LINUX_FLAVOURS.
+	  - Renamed LIVE_KERNEL_PACKAGES to LIVE_LINUX_PACKAGES.
+	  - Renamed LIVE_BINARY_IMAGE to LIVE_BINARY_IMAGES.
+	  - Renamed LIVE_SOURCE_IMAGE to LIVE_SOURCE_IMAGES.
+	  - Renamed LIVE_FILESYSTEM to LIVE_CHROOT_FILESYSTEM.
+	  - Renamed LIVE_SERVER_ADDRESS to LIVE_NET_SERVER.
+	  - Renamed LIVE_SERVER_PATH to LIVE_NET_PATH.
+	* Uploaded 1.0~a10-1.
+
+2007-05-18  Mathieu Geli  <mathieu.geli at gmail.com>
+
+	* examples/hooks/*
+	  - Added new hooks for non-free/contrib drivers
+	    Intel  : ipw3945, ipw2100, ipw2200
+	    Nvidia : nvidia-legacy
+	    Ralink : rt2x00, rt2570
+	  - Changed behavior of beryl hook: autostart beryl
+	    if video driver allows it (minimal detection based on glxinfo)
+
+2007-05-17  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_md5sum, lh_source,md5sum:
+	  - Fixed accidentally inclusion of md5sum.txt itself into
+	    binary/md5sum.txt.
+
+2007-05-16  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Added check for local includes and templates.
+	  - Renamed LH_APT_GENERIC to LIVE_BINARY_INDICES.
+	  - Renamed lh_binary_localincludes to lh_binary_local-includes.
+	  - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
+	  - Renamed lh_chroot_localincludes to lh_chroot_local-includes.
+	  - Renamed lh_chroot_localpackages to lh_chroot_local-packages.
+	  - Renamed lh_chroot_localpackageslists to
+	    lh_chroot_local-packageslists.
+	  - Renamed lh_source_download to lh_source_debian.
+	  - Renamed lh_source_config to lh_source_debian-live.
+
+2007-05-09  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Renamed LH_MIRROR*_BUILD to LH_MIRROR*_BOOTSTRAP.
+	  - Renamed LH_MIRROR*_IMAGE to LH_MIRROR*_BINARY.
+	* helpers/lh_chroot_sources:
+	  - Added aptitude overwrite for untrusted sources.
+	  - Changed checks for *.build/*.image to *.bootstrap/*.binary.
+
+2007-05-08  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Renamed lh_binary_linuximage to lh_binary_linux-image.
+	  - Renamed lh_chroot_linuximage to lh_chroot_linux-image.
+	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
+	  - Added missing cache directory when only caching stages.
+	* helpers/lh_binary_debian-installer, lh_binary_linux-image,
+	  lh_binary_memtest:
+	  - Changed kernel installation directories.
+
+2007-05-07  Daniel Baumann  <daniel at debian.org>
+
+	* examples/snapshot-build.sh, live-snapshot.sources.list:
+	  - Added.
+	* helpers/lh_binary_rootfs:
+	  - Fixed wrong order of squashfs options.
+
+2007-05-06  Daniel Baumann  <daniel at debian.org>
+
+	* templates/syslinux:
+	  - Updated again.
+	* helpers/lh_config:
+	  - Fixed overwriting of LH_* options.
+	* helpers/lh_binary_includes:
+	  - Fixed a quoting typo.
+	  - Working arround symlinks on usb-hdd binary images.
+	* Uploaded 1.0~a9-1.
+
+2007-04-31  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Added LH_INITRAMFS.
+	  - Splitted config/image into config/binary and config/source.
+	* Uploaded 1.0~a8-1.
+
+2007-04-26  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/*:
+	  - Implemented paranoid caching with LIVE_CACHE_INDICES,
+	    LIVE_CACHE_PACKAGES and LIVE_CACHE_STAGES. This allows to build
+	    images offline from the cache.
+
+2007-04-25  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_usb, lh_source_usb:
+	  - In preparation of adding support for usb-zip images, the usb binary
+	    type is renamed to usb-hdd.
+
+2007-04-24  Daniel Baumann  <daniel at debian.org>
+
+	* functions/stagefile.sh:
+	  - Requite_stagefile can require more than one stage.
+	* helpers/lh_binary_debian-installer:
+	  - Added.
+
+2007-04-23  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_includes, lh_binary_usb, lh_source_usb:
+	  - Added workaround for vfat limitations.
+
+2007-04-23  Daniel Baumann  <daniel at debian.org>
+
+	* Makefile:
+	  - Added simple test rule.
+	* functions/*, helpers/*:
+	  - Added LH_ROOT_COMMAND to support sudo.
+	* functions/package.sh:
+	  - Added. Helper dependencies in-chroot can now be handled by
+	    functions.
+	* helpers/make-live:
+	  - Added trap to unmount proc and sys on exit and failure.
+	* Uploaded 1.0~a7-1.
+
+2007-04-22  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - In ubuntu mode, setting default sections to main restricted.
+	* helpers/lh_binary_grub:
+	  - Making copy call of grub arch independent.
+	* helpers/lh_chroot_sources:
+	  - In debian mode, checking for non-sid rather than if-etch.
+	  - Fixed wrong Ubuntu security URL.
+
+2007-04-20  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_rootfs, lh_binary_iso:
+	  - Added mksquashfs/genisoimage quiet/verbose options.
+
+2007-04-19  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added check for splash in config directory.
+
+2007-04-18  Daniel Baumann  <daniel at debian.org>
+
+	* debian/cron.daily, default:
+	  - Added.
+	* doc/BUGS, DOWNLOAD:
+	  - Added.
+	* examples/edu.sources.list, fai.sources.list:
+	  - Added.
+	* manpages/*:
+	  - Added language suffix.
+	  - Added German translations.
+
+2007-04-17  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_hooks:
+	  - Also check for tasks specific hooks, not just for package lists.
+	* helpers/lh_chroot_tasks:
+	  - Allowing to use either aptitude or tasksel.
+	* hooks/kde-desktop:
+	  - Added.
+	* manpages/lh_build.1, lh_source.1:
+	  - Added.
+
+2007-04-16  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Using lsb_release, if existing, to set default mode to ubuntu on
+	    ubuntu systems.
+	  - Moved desktop task to the end, so that gdm doesn't take
+	    gnome-session as default.
+	* helpers/lh_chroot_hooks:
+	  - Added simple --hooks for easy testing.
+	* Uploaded 1.0~a6-1.
+
+2007-04-15  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Set LH_APT to apt-get when using mini or minimal.
+	* helpers/lh_chroot_sources:
+	  - Excluding comments from local sources lists.
+	* helpers/lh_bootstrap_cdebootstrap:
+	  - Removing imported configuration files by cdebootstrap.
+
+2007-04-13  Daniel Baumann  <daniel at debian.org>
+
+	* Moved examples from /usr/share/doc to /usr/share/live-helper.
+	* examples/bpo.sources.list:
+	  - Added.
+	* functions/defaults.sh:
+	  - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
+	* helpers/lh_clean:
+	  - Added missing removal of generic source.
+
+2007-04-12  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_config, make-live:
+	  - Adding --config.
+	* helpers/lh_binary_memtester86:
+	  - Renamed to lh_binary_memtest, made more generic.
+	* functions/defaults.sh:
+	  - Setting default distribution to etch until 2.6.20 has setteled in
+	    unstable.
+
+2007-04-11  Daniel Baumann  <daniel at debian.org>
+
+	* Merging from sidux fllbuilder 1.0.4:
+	  - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
+	  - helpers/lh_chroot_linuximage: Added additional options to
+	    kernel-img.conf.
+	  - helpers/lh_chroot_proc: Made binfmt umount conditional.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added failsafe kernel entries.
+	* helpers/lh_chroot_apt:
+	  - Using apt.conf.d also for apt, not just for aptitude.
+	  - Minor code cleanup.
+	* helpers/lh_source_*:
+	  - Minor code cleanup.
+	* helpers/lh_source_download:
+	  - Added LIVE_BOOTLOADER to the list of source packages.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+
+2007-04-10  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_includes, includes/*:
+	  - Redone.
+
+2007-04-09  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_yaboot, templates/yaboot:
+	  - Added.
+
+2007-04-09  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_config, make-live, functions/defaults.sh:
+	  - Added mode to distinguish between Debian and Ubuntu.
+	* helpers/lh_chroot_sources:
+	  - Added check for LIVE_MIRROR_BUILD* to be equal to
+	    LIVE_MIRROR_IMAGE*.
+	* Uploaded 1.0~a5-1.
+
+2007-04-08  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_net:
+	  - Added check for namespace collision with LIVE_SERVER_PATH.
+	* helpers/lh_binary_grub:
+	  - Added functionality for usb|hdd images.
+
+2007-04-07  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_sources:
+	  - Moved check for local source lists from
+	    config/sources.lists.{build,image} to
+	    config/chroot_sources/*.{build,image}.
+	  - Added check for local gpg keys in
+	    config/chroot_sources/*.{build,image}.gpg.
+	  - Added check for local keyring packages in
+	    config/chroot_sources/*.deb.
+	  - Added LIVE_KEYRING_PACKAGES.
+
+2007-04-06  Daniel Baumann  <daniel at debian.org>
+
+	* functions/breakpoints.sh, helpers/*:
+	  - Added initial breakpoints.
+	* functions/chroot.sh:
+	  - Adding /usr/local to path.
+	* functions/lockfile.sh:
+	  - Added additional signals to the trap.
+	* helpers/lh_binary_includes:
+	  - Respect LIVE_INCLUDES=none.
+	* manpages/*:
+	  - Updated.
+
+2007-04-05  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, templates/grub/menu.lst:
+	  - Added splash functionality.
+	* Uploaded 1.0~a4-1.
+
+2007-04-03  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_grub, lh_binary_grub:
+	  - Added check for LIVE_TEMPLATES to be existing.
+	* helpers/lh_binary_includes:
+	  - Added check for LIVE_INCLUDES to be existing.
+
+2007-04-02  Daniel Baumann  <daniel at debian.org>
+
+	* functions/*, helpers/*:
+	  - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
+	* helpers/lh_binary_iso:
+	  - Added exclude for the bootloader from the iso image content.
+
+2007-04-01  Daniel Baumann  <daniel at debian.org>
+
+	* helper/lh_binary_grub:
+	  - Added.
+
+2007-03-30  Daniel Baumann  <daniel at debian.org>
+
+	* helper/lh_chroot_localincludes:
+	  - Fixed wrong path for hook removal.
+
+2007-03-29  Daniel Baumann  <daniel at debian.org>
+
+	* functions/common.sh, echo.sh:
+	  - Added.
+	* doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7:
+	  - Added forgotten helpers.
+	* doc/FAQ:
+	  - Added.
+	* lists/mini, minimal:
+	  - Added --yes to apt call to make them non-interactive.
+	* manpages/lh_chroot.1:
+	  - Added.
+
+2007-03-28  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
+	  - Added --debug, --quiet, and --verbose.
+
+2007-03-27  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_linuximage, lh_binary_memtest86:
+	  - Added missing Read_conffiles to fix foreign architecture builds.
+
+2007-03-26  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
+	  lh_clean:
+	  - Added routine to cache bootstrapped chroot as suggested by Kai
+	    Hendry <hendry at iki.fi>.
+	* helpers/lh_chroot_rootfs:
+	  - Fixed typo in net type.
+	* lists/gnome*, kde*, standard-x11, xfce*:
+	  - Added menu.
+
+2007-03-26  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Fixed handling of desktop list variable loop.
+	* Uploaded 1.0~a3-1.
+
+2007-03-25  Daniel Baumann  <daniel at debian.org>
+
+	* functions/*, helpers/*:
+	  - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
+	  - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS.
+	* functions/cache.sh:
+	  - Added.
+	* helpers/lh_bootstrap_cdebootstrap:
+	  - Added removal of cdebootstrap-helper-diverts.
+	* helpers/lh_binary_chroot:
+	  - Added.
+	* helpers/lh_binary_rootfs:
+	  - Moved filesystem routines into chroot.
+	* helpers/lh_chroot_localization, lh_chroot_localpackages,
+	  lh_chroot_localpackageslists, lh_chroot_packages,
+	  lh_chroot_packageslists, lh_chroot_tasks:
+	  - Added check for LH_CACHE.
+	* helpers/lh_chroot_apt:
+	  - Removing old apt.conf if existing as suggested by Ben Armstrong
+	    <synrg at debian.org>.
+	* helpers/lh_chroot_hacks:
+	  - Added check for already installed smbfs.
+	  - Added check for already configured initramfs.conf as suggested by
+	    Ben Armstrong <synrg at debian.org>.
+	* helpers/lh_chroot_interactive:
+	  - Added.
+	* helpers/lh_chroot_tasks:
+	  - Added routine for LH_APT=apt.
+	* lists/minimal-net:
+	  - Minimized.
+
+2007-03-24  Daniel Baumann  <daniel at debian.org>
+
+	* functions/*, helpers/*, hooks/*:
+	  - Added GPL blurb.
+	* functions/arguments.sh, helpers/*:
+	  - Added common arguments.
+	* functions/arguments.sh, stagefile.sh, helpers/*,
+	  manpages/live-helper.7:
+	  - Added --force option.
+	* functions/defaults.sh, helpers/lh_binary_syslinux, lh_config,
+	  make-live:
+	  - Added LIVE_USERNAME and LIVE_HOSTNAME.
+	* helpers/lh_binary_linuximage, lh_binary_memtest86,
+	  lh_binary_syslinux:
+	  - Moved kernel directory to live.
+	* helpers/lh_clean:
+	  - Added purge.
+
+2007-03-23  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/make-live:
+	  - Calling Arguments twice to catch case with non-default root.
+
+2007-03-22  Daniel Baumann  <daniel at debian.org>
+
+	* functions/default.sh, helpers/*:
+	  - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
+	    lh_chroot_localpackageslist to lh_chroot_localpackageslists
+	* helpers/lh_binary_includes:
+	  - Using LIVE_INCLUDES now.
+	* helpers/lh_chroot_apt:
+	  - Added LH_APT_SECURE.
+	* helpers/lh_chroot_linuximage:
+	  - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
+	    local packages.
+
+2007-03-21  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
+	  - Checking earlier if there is something todo.
+	* helpers/lh_binary_linuximage, lh_binary_syslinux,
+	  lh_chroot_linuximage, templates/syslinux/isolinux.cfg:
+	  - Extended to support multiple kernels at once.
+	* helpers/lh_binary_includes, lh_binary_localincludes,
+	  lh_chroot_localincludes:
+	  - Replaced path with variable as suggested Kai Hendry <hendry at iki.fi>.
+	* helpers/lh_source_md5sum:
+	  - Added.
+	* helpers/make-live:
+	  - Added short options in ARGUMENTS.
+	* functions/defaults.sh, helpers/*:
+	  - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR.
+	  - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
+	    LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
+
+2007-03-20  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/make-live:
+	  - Fixed typo in ARGUMENTS.
+
+2007-03-19  Daniel Baumann  <daniel at debian.org>
+
+	* lists/gnome*, kde*, standard-x11, xfce*:
+	  - Added alsa-base, alsa-oss, alsa-utils, and discover.
+
+2007-03-19  Daniel Baumann  <daniel at debian.org>
+
+	* Uploaded 1.0~a2-1.
+
+2007-03-18  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Quoted date call in LIVE_ISO_VOLUME.
+	* manpages/lh_clean.1:
+	  - Added.
+
+2007-03-17  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh, helpers/*:
+	  - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
+	    to LIVE_MIRROR_LOCAL_SECURITY.
+	* doc/examples/beryl-hook.sh:
+	  - Added, submitted by Inigo Tejedor Arrondo <inigo at navarrux.org>.
+	* helpers/lh_config, make-live:
+	  - Added check for newconfig to prevent overwriting of non-specified
+	    options to default values.
+	* helpers/lh_chroot_localhooks:
+	  - Added basename where needed.
+	* helpers/lh_chroot_sources:
+	  - Added check for local sources.list in config for custom
+	    repositories.
+	  - Replaced security check for etch with check for not-unstable.
+	* manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1,
+	  lh_bootstrap_debootstrap.1, lh_testroot.1:
+	  - Added.
+	* templates/syslinux/pxlinux.cfg:
+	  - Fixed path.
+
+2007-03-16  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_binary_usb: Corrected stagefile creation.
+
+2007-03-15  Daniel Baumann  <daniel at debian.org>
+
+	* Makefile:
+	  - Replaced helper uninstall routine with a less intrusive one.
+	* doc/NEWS:
+	  - Updated.
+	* functions/conffile.sh:
+	  - Beautified.
+	* functions/defaults.sh:
+	  - Added LH_LOSETUP.
+	* functions/lockfile.sh:
+	  - Beautified.
+	* helpers/*:
+	  - Allowing apt-get, not just apt in LH_APT.
+	* helpers/lh_config:
+	  - Added check for existing configuration.
+	* helpers/lh_binary_md5sum:
+	  - Removed legacy code.
+	* helpers/lh_binary_manifest:
+	  - Added creation of packages.txt.
+	* helpers/lh_binary_usb, lh_source_usb:
+	  - Replaced loop device node workaround with a better one.
+	* helpers/lh_chroot_hooks, lh_chroot_localhooks:
+	  - Fixed executable check.
+	* helpers/lh_source_config:
+	  - Added.
+	* helpers/lh_source_download:
+	  - Separeted debian sources and debian-live configuration into
+	    different directories.
+	  - Added live-helper to the sources.
+	* helpers/lh_source_generic, lh_source_iso, lh_source_usb,
+	  lh_source_net:
+	  - Removed annyoing warning when sources are disabled.
+	* helpers/lh_source_net:
+	  - Beautified.
+	* helpers/make-live:
+	  - Fixed typo in ARGUMENTS.
+	  - Moved help, usage, version into functions.
+	  - Removed build pre-option.
+	* manpages/live-helper.7:
+	  - Added.
+	* templates/syslinux/f10.txt:
+	  - Added note about Debian Live project.
+
+2007-03-14  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh, helpers/*:
+	  - Converted LIVE_ROOT to directory, not full path.
+	* functions/*, helpers/*:
+	  - Replaced LIVE_CHROOT with directory name.
+	* functions/conffile.sh:
+	  - Added warning if CONFFILE is not readable.
+	* helpers/lh_chroot_localization:
+	  - Completed check for koffice.
+	* helpers/lh_source_download:
+	  - Fixed typo in old source removal.
+
+2007-03-14  Daniel Baumann  <daniel at debian.org>
+
+	* helpers/lh_chroot_hacks:
+	  - Added removal of udev persistent-net rule.
+	* Uploaded 1.0~a1-3.
+
+2007-03-14  Daniel Baumann  <daniel at debian.org>
+
+	* functions/defaults.sh:
+	  - Fixed setting of LIVE_SYSVINIT.
+	* helpers/lh_chroot_sysvinit:
+	  - Changed check for LIVE_SYSVINIT from disabled to enabled.
+	* Uploaded 1.0~a1-2.
+
+2007-03-12  Daniel Baumann  <daniel at debian.org>
+
+	* Rewritten live-package.
+	* Uploaded 1.0~a1-1.

Copied: releases/live-helper/1.0~a11-1/docs/ChangeLog.live-package (from rev 1689, dists/trunk/live-helper/docs/ChangeLog.live-package)
===================================================================
--- releases/live-helper/1.0~a11-1/docs/ChangeLog.live-package	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/docs/ChangeLog.live-package	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,474 @@
+2007-03-10 Daniel Baumann <daniel at debian.org>
+
+	* Added knoppix and knoppix-dvd package lists.
+
+2007-03-09 Daniel Baumann <daniel at debian.org>
+
+	* Getting free loopdevice from inside the chroot, not outside.
+
+2007-03-09 Daniel Baumann <daniel at debian.org>
+
+	* Added kbd to all !minimal lists.
+	* Uploaded 0.99.25.
+
+2007-03-08 Otavio Salvador <otavio at debian.org>
+
+	* helpers/lh_configapt: Fix aptitude configuration to really avoid
+	  recommended packages to get installed.
+	* src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
+
+2007-03-04 Daniel Baumann <daniel at debian.org>
+
+	* Replaced removal of kernel on minimal flavours with excludes on the
+	  mksquashfs call.
+	* Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported
+	  by Mathieu Geli <mathieu.geli at gmail.com>.
+	* Exported CODENAME_* manually as reported by Cédric Lucantis
+	  <omer at no-log.org>.
+	* Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry
+	  <hendry at iki.fi>.
+	* Uploaded 0.99.24.
+
+2007-02-22 Daniel Baumann <daniel at debian.org>
+
+	* Added xresprobe to all x11 lists.
+
+2007-02-22 Daniel Baumann <daniel at debian.org>
+
+	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  - add and cleanup variable exporting in defaults.
+	  - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
+	* Uploaded 0.99.23.
+
+2007-02-21 Daniel Baumann <daniel at debian.org>
+
+	* Added gnome-junior, kde-junior and xfce-junior lists.
+	* Uploaded 0.99.22.
+
+2007-02-19 Daniel Baumann <daniel at debian.org>
+
+	* Fixed manifest.
+
+2007-02-15 Daniel Baumann <daniel at debian.org>
+
+	* Applied patch from Sebastian Raveau <sebastien.raveau at epita.fr> to
+	  add support for filesystem images encrypted with loop-aes.
+
+2007-02-13 Daniel Baumann <daniel at debian.org>
+
+	* Broken out scripts into modularized lh_* subscripts.
+
+2007-02-12 Daniel Baumann <daniel at debian.org>
+
+	* Added some code as suggested by Alex Owen <r.a.owen at qmul.ac.uk> to
+	  check if the depends (syslinux, memtest etc.) are intentionally
+	  installed in the chroot, and hence, don't remove them.
+	* Moved some depends into the chroot.
+	* Uploaded 0.99.21.
+
+2007-02-11 Daniel Baumann <daniel at debian.org>
+
+	* Added mini flavour.
+
+2007-02-10 Daniel Baumann <daniel at debian.org>
+
+	* Added legacy code for genisoimage.
+	* Uploaded 0.99.20.
+
+2007-02-09 Daniel Baumann <daniel at debian.org>
+
+	* Added usb type.
+
+2007-02-08 Daniel Baumann <daniel at debian.org>
+
+	* Added desktop task to the *-desktop flavours.
+
+2007-02-07 Daniel Baumann <daniel at debian.org>
+
+	* Extended cron job a bit.
+	* Fixed manual pruning in minimal flavour as suggested by Bas Wijnen
+	  <wijnen at debian.org>
+
+2007-02-02 Daniel Baumann <daniel at debian.org>
+
+	* Added "--without-daemons".
+
+2007-02-01 Daniel Baumann <daniel at debian.org>
+
+	* Added "--tasks".
+	* Added desktop-base to all desktop package lists.
+
+2007-01-31 Daniel Baumann <daniel at debian.org>
+
+	* Changed vars in autobuilding script to be able to source
+	  make-live.conf.
+	* Uploaded 0.99.19.
+
+2007-01-30 Daniel Baumann <daniel at debian.org>
+
+	* Added cron job for autobuilding images.
+
+2007-01-25 Daniel Baumann <daniel at debian.org>
+
+	* Added additional pruning to minimal flavour.
+	* Using interactive frontend while processing --hook.
+	* Uploaded 0.99.18.
+
+2007-01-24 Daniel Baumann <daniel at debian.org>
+
+	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  - adding "--keyring" flag.
+	  - adding LIVE_DISK_VOLUME.
+	  - adding start-stop-daemon wrapper to avoid daemons to be started.
+	  - adding workaround to prevent binfmt locking /proc.
+	  - adding LIVE_ISOLINUX_SPLASH.
+	* Uploaded 0.99.17.
+
+2007-01-19 Daniel Baumann <daniel at debian.org>
+
+	* Replacing mkisofs with genisoimage.
+
+2007-01-18 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups.
+	* Uploaded 0.99.16.
+
+2007-01-16 Daniel Baumann <daniel at debian.org>
+
+	* Switched default distribution back to unstable, as unstable is usable
+	  again from the kernel point of view.
+	* Added file to the minimal package list.
+	* Uploaded 0.99.15.
+
+2007-01-04 Daniel Baumann <daniel at debian.org>
+
+	* Added workaround for new xorg packages by including
+	  xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
+	  lists. See #405639 for more information.
+	* Added xdebconfigurator to all X11 package lists.
+	* Adding workaround for initrd backup files.
+
+2006-11-06 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.14.
+
+2006-11-05 Daniel Baumann <daniel at debian.org>
+
+	* Applied patch from Markus Bauer <bauer-markus at web.de>:
+	  - fixing script sourcing to exclude files in .svn
+
+2006-11-03 Daniel Baumann <daniel at debian.org>
+
+	* Fixed typo in the policy-rc.d hack.
+
+2006-11-02 Daniel Baumann <daniel at debian.org>
+
+	* Using aptitude instead of apt-get.
+	* Added '--with-recommends' and '--without-recommends'.
+
+2006-11-01 Daniel Baumann <daniel at debian.org>
+
+	* Fixed regression when using -d ${CODENAME} wrt/ kernel packages.
+
+2006-10-30 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.13.
+
+2006-10-29 Daniel Baumann <daniel at debian.org>
+
+	* Added minimal-net flavour.
+
+2006-10-28 Daniel Baumann <daniel at debian.org>
+
+	* Added console-common to standard selection.
+
+2006-10-27 Daniel Baumann <daniel at debian.org>
+
+	* Added patch from Otavio Salvador <otavio at debian.org>:
+	  - fixing preseeding error-handling.
+
+2006-10-26 Daniel Baumann <daniel at debian.org>
+
+	* Added gnustep package selection based on the suggestion of
+	  Guerkan Senguen <gurkan at linuks.mine.nu>.
+
+2006-10-25 Daniel Baumann <daniel at debian.org>
+
+	* Applied patch from Marcelo D. Re <mdre at rectorado.unl.edu.ar>:
+	  - skip deb-src source-list entries when building images with
+	    --without-source.
+	* Applied patches from Otavio Salvador <otavio at debian.org>:
+	  - adding '--bootstrap-config' to support cdebootstraps
+	    '--suite-config'.
+	  - allowing override of ${BASE}.
+	  - adjust sourcing of scripts, so that only the real scripts are
+	    sourced and not other (backup) files.
+	  - allowing override of kernel-packages.
+	* Reverted mangling of LIVE_DISTRIBUTION for sources.list generation.
+
+2006-10-23 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.12.
+
+2006-10-18 Daniel Baumann <daniel at debian.org>
+
+	* Autodetecting proxy now.
+
+2006-10-16 Daniel Baumann <daniel at debian.org>
+
+	* Readded and slightly changed --clone and --preseed.
+	* Uploaded 0.99.11.
+
+2006-10-09 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups.
+	* Uploaded 0.99.10.
+
+2006-10-02 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.9.
+
+2006-10-01 Daniel Baumann <daniel at debian.org>
+
+	* Added multiple repositories.
+	* Using LIVE_PROXY_* also for bootstraping.
+
+2006-09-27 Daniel Baumann <daniel at debian.org>
+
+	* Changing manpage section.
+
+2006-09-26 Daniel Baumann <daniel at debian.org>
+
+	* Added default flavour hooks.
+	* minimal flavour does not install debian-archive-keyring to save space.
+	* Adjusted network patch.
+
+2006-09-25 Daniel Baumann <daniel at debian.org>
+
+	* Removed now unused initramfs-tools hack.
+	* Simplified xorg check based on distribution rather than version.
+	* Added fix from Bas Wijnen <wijnen at debian.org> for space handling in
+	  arguments.
+	* Fixed package list handling similar to the fix suggested by Alex Owen
+	  <r.alex.owen at gmail.com>.
+	* Uploaded 0.99.8.
+
+2006-09-24 Marco Amadori <marco.amadori at gmail.com>
+
+	* 13hack.sh: initramfs-tools hack, check added for xorg.
+
+2006-09-18 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.7.
+
+2006-09-15 Daniel Baumann <daniel at debian.org>
+
+	* Added eject to minimal package selection.
+
+2006-09-14 Daniel Baumann <daniel at debian.org>
+
+	* Adjustements for linux 2.6.17 testing propagation.
+
+2006-09-11 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.6.
+
+2006-09-08 Marco Amadori <marco.amadori at gmail.com>
+
+	* 23net.sh: Fixed binary missing directory creation.
+	* templates/iso: Moved common files to templates/common.
+
+2006-09-07 Daniel Baumann <daniel at debian.org>
+
+	* Minor cleanups.
+	* Fixed dist target.
+
+2006-09-06 Marco Amadori <marco.amadori at gmail.com>
+
+	* 14chroot.sh, main.sh: Added manifest support.
+	* 23net.sh: Added 2 variables for basenames to ease readability.
+	* main.sh, 02default.sh: Modified Usage() uses.
+
+2006-09-04 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.5.
+
+2006-09-03 Daniel Baumann <daniel at debian.org>
+
+	* Added dist parameter to easily pull images for live.debian.net.
+	* Added "--output" to specify the image name prefix.
+	* Exclude iso templates for minimal flavour.
+
+2006-09-02 Daniel Baumann <daniel at debian.org>
+
+	* Added experimental as distribution.
+	* Added source image generation.
+	* Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency.
+
+2006-08-31 Daniel Baumann <daniel at debian.org>
+
+	* Added "--disable-generic-indices" and "--enable-generic-indices".
+	* Fixed i18n lists.
+	* Rewritten all lists, comments are now possible.
+	* Lists must be now explicitly given with --package-list, no longer as
+	  last argument of the make-live call.
+	* Setting default sources.list while the image generation, restoring
+	  customized ones afterwards.
+
+2006-08-30 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups:
+	  - moved 14patch_packages.sh to 13hack.sh.
+	  - simplified 13hack.sh.
+
+2006-08-29 Marco Amadori <marco.amadori at gmail.com>
+
+	* pxelinux.cfg: Updated to right defaults, first cifs then nfs or
+	  select your favorite way. Rationale: /dev/nfs is for kernel
+	  discovering, not for initramfs discover, casper will be just fine
+	  with "netboot".
+	* 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
+	  packages, mainly for xserver-xorg so far.
+
+2006-08-28 Daniel Baumann <daniel at debian.org>
+
+	* Updated documentation.
+	* Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update
+	  pxelinux.cfg for NFS root in casper.
+	* Uploaded 0.99.4.
+
+2006-08-27 Daniel Baumann <daniel at debian.org>
+
+	* Cleanups.
+
+2006-08-27 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added sysv init blocking policy.
+
+2006-08-22 Daniel Baumann <daniel at debian.org>
+
+	* Reorganised sources.
+	* Added staging support.
+	* Cleaned up parameter names.
+	* testing is now supported.
+
+2006-08-21 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.3.
+
+2006-08-02 Marco Amadori <marco.amadori at gmail.com>
+
+	* Rewrote netboot support.
+	* Added support for pure directory rootfs images.
+
+2006-07-31 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.2.
+
+2006-07-28 Daniel Baumann <daniel at debian.org>
+
+	* Added DEBIAN_FRONTEND to chroots(), now completely non-interactive.
+	* Fixed wrong chroot patch.
+
+2006-07-27 Marco Amadori <marco.amadori at gmail.com>
+
+	* Changed amd64 kernel naming scheme.
+
+2006-07-24 Daniel Baumann <daniel at debian.org>
+
+	* Uploaded 0.99.1.
+
+2006-07-19 Daniel Baumann <daniel at debian.org>
+
+	* Bugfixes.
+
+2006-07-18 Daniel Baumann <daniel at debian.org>
+
+	* Added iso templates.
+
+2006-07-17 Daniel Baumann <daniel at debian.org>
+
+	* Added chroot to 01-patch.sh.
+	* Added "--logfile".
+	* Uploaded 0.99.
+
+2006-07-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added "--flavour".
+
+2006-06-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added "--debug" and "--verbose".
+
+2006-06-23 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Rewritten manpages.
+
+2006-06-19 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added "--templates" options.
+	* Fixed some typos.
+
+2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* General fixes.
+
+2006-06-18 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added "-a|--architecture" and "-p|--package-list" options.
+	* Reworked how lists works.
+
+2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* General cleanup.
+
+2006-06-14 Marco Amadori <marco.amadori at gmail.com>
+
+	* Re-added "-f|--filesystem".
+
+2006-06-12 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added "--conffile", "--preseed", "--clone", and "--rootfs" options.
+
+2006-06-12 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added new splash.rle.
+	* Added memtest86+.
+	* Added "--distribution", and "--section" options.
+	* Moved /etc/default/make-live to /etc/make-live.conf.
+
+2006-06-11 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added handling of md5sums.
+
+2006-06-09 Marco Amadori <marco.amadori at gmail.com>
+
+	* Added splashy support.
+	* Added ext2 rootfs support.
+	* Added external hook and path support.
+	* Swiched to getopt.
+
+2006-06-02 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added patch from Jason D. Clinton <me at jasonclinton.com>:
+	  - Added netboot flavour.
+	  - Thanks to SafeDesk Solutions <http://www.safedesk.com/>.
+
+2006-06-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Moved syslinux inside the chroot.
+
+2006-05-31 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added kde-*i18n and standard-i18n lists.
+
+2006-05-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Added patch from Frederic Lehobey <Frederic.Lehobey at free.fr>:
+	  - Added locales to LIVE_PACKAGES.
+	  - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and
+	    LIVE_BOOTAPPEND.
+
+2006-05-27 Daniel Baumann <daniel.baumann at panthera-systems.net>
+
+	* Initial release.

Deleted: releases/live-helper/1.0~a11-1/docs/ChangeLog.old
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog.old	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/docs/ChangeLog.old	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,474 +0,0 @@
-2007-03-10 Daniel Baumann <daniel at debian.org>
-
-	* Added knoppix and knoppix-dvd package lists.
-
-2007-03-09 Daniel Baumann <daniel at debian.org>
-
-	* Getting free loopdevice from inside the chroot, not outside.
-
-2007-03-09 Daniel Baumann <daniel at debian.org>
-
-	* Added kbd to all !minimal lists.
-	* Uploaded 0.99.25.
-
-2007-03-08 Otavio Salvador <otavio at debian.org>
-
-	* helpers/lh_configapt: Fix aptitude configuration to really avoid
-	  recommended packages to get installed.
-	* src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
-
-2007-03-04 Daniel Baumann <daniel at debian.org>
-
-	* Replaced removal of kernel on minimal flavours with excludes on the
-	  mksquashfs call.
-	* Added LIVE_INCLUDE_CHROOT to the manual exported variables as reported
-	  by Mathieu Geli <mathieu.geli at gmail.com>.
-	* Exported CODENAME_* manually as reported by Cédric Lucantis
-	  <omer at no-log.org>.
-	* Fixed typo s/aptiude/aptitude/ as reported by Kai Hendry
-	  <hendry at iki.fi>.
-	* Uploaded 0.99.24.
-
-2007-02-22 Daniel Baumann <daniel at debian.org>
-
-	* Added xresprobe to all x11 lists.
-
-2007-02-22 Daniel Baumann <daniel at debian.org>
-
-	* Applied patches from Otavio Salvador <otavio at debian.org>:
-	  - add and cleanup variable exporting in defaults.
-	  - add LIVE_BOOTSTRAP_CONFIG to lh_debootstrap.
-	* Uploaded 0.99.23.
-
-2007-02-21 Daniel Baumann <daniel at debian.org>
-
-	* Added gnome-junior, kde-junior and xfce-junior lists.
-	* Uploaded 0.99.22.
-
-2007-02-19 Daniel Baumann <daniel at debian.org>
-
-	* Fixed manifest.
-
-2007-02-15 Daniel Baumann <daniel at debian.org>
-
-	* Applied patch from Sebastian Raveau <sebastien.raveau at epita.fr> to
-	  add support for filesystem images encrypted with loop-aes.
-
-2007-02-13 Daniel Baumann <daniel at debian.org>
-
-	* Broken out scripts into modularized lh_* subscripts.
-
-2007-02-12 Daniel Baumann <daniel at debian.org>
-
-	* Added some code as suggested by Alex Owen <r.a.owen at qmul.ac.uk> to
-	  check if the depends (syslinux, memtest etc.) are intentionally
-	  installed in the chroot, and hence, don't remove them.
-	* Moved some depends into the chroot.
-	* Uploaded 0.99.21.
-
-2007-02-11 Daniel Baumann <daniel at debian.org>
-
-	* Added mini flavour.
-
-2007-02-10 Daniel Baumann <daniel at debian.org>
-
-	* Added legacy code for genisoimage.
-	* Uploaded 0.99.20.
-
-2007-02-09 Daniel Baumann <daniel at debian.org>
-
-	* Added usb type.
-
-2007-02-08 Daniel Baumann <daniel at debian.org>
-
-	* Added desktop task to the *-desktop flavours.
-
-2007-02-07 Daniel Baumann <daniel at debian.org>
-
-	* Extended cron job a bit.
-	* Fixed manual pruning in minimal flavour as suggested by Bas Wijnen
-	  <wijnen at debian.org>
-
-2007-02-02 Daniel Baumann <daniel at debian.org>
-
-	* Added "--without-daemons".
-
-2007-02-01 Daniel Baumann <daniel at debian.org>
-
-	* Added "--tasks".
-	* Added desktop-base to all desktop package lists.
-
-2007-01-31 Daniel Baumann <daniel at debian.org>
-
-	* Changed vars in autobuilding script to be able to source
-	  make-live.conf.
-	* Uploaded 0.99.19.
-
-2007-01-30 Daniel Baumann <daniel at debian.org>
-
-	* Added cron job for autobuilding images.
-
-2007-01-25 Daniel Baumann <daniel at debian.org>
-
-	* Added additional pruning to minimal flavour.
-	* Using interactive frontend while processing --hook.
-	* Uploaded 0.99.18.
-
-2007-01-24 Daniel Baumann <daniel at debian.org>
-
-	* Applied patches from Otavio Salvador <otavio at debian.org>:
-	  - adding "--keyring" flag.
-	  - adding LIVE_DISK_VOLUME.
-	  - adding start-stop-daemon wrapper to avoid daemons to be started.
-	  - adding workaround to prevent binfmt locking /proc.
-	  - adding LIVE_ISOLINUX_SPLASH.
-	* Uploaded 0.99.17.
-
-2007-01-19 Daniel Baumann <daniel at debian.org>
-
-	* Replacing mkisofs with genisoimage.
-
-2007-01-18 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups.
-	* Uploaded 0.99.16.
-
-2007-01-16 Daniel Baumann <daniel at debian.org>
-
-	* Switched default distribution back to unstable, as unstable is usable
-	  again from the kernel point of view.
-	* Added file to the minimal package list.
-	* Uploaded 0.99.15.
-
-2007-01-04 Daniel Baumann <daniel at debian.org>
-
-	* Added workaround for new xorg packages by including
-	  xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
-	  lists. See #405639 for more information.
-	* Added xdebconfigurator to all X11 package lists.
-	* Adding workaround for initrd backup files.
-
-2006-11-06 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.14.
-
-2006-11-05 Daniel Baumann <daniel at debian.org>
-
-	* Applied patch from Markus Bauer <bauer-markus at web.de>:
-	  - fixing script sourcing to exclude files in .svn
-
-2006-11-03 Daniel Baumann <daniel at debian.org>
-
-	* Fixed typo in the policy-rc.d hack.
-
-2006-11-02 Daniel Baumann <daniel at debian.org>
-
-	* Using aptitude instead of apt-get.
-	* Added '--with-recommends' and '--without-recommends'.
-
-2006-11-01 Daniel Baumann <daniel at debian.org>
-
-	* Fixed regression when using -d ${CODENAME} wrt/ kernel packages.
-
-2006-10-30 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.13.
-
-2006-10-29 Daniel Baumann <daniel at debian.org>
-
-	* Added minimal-net flavour.
-
-2006-10-28 Daniel Baumann <daniel at debian.org>
-
-	* Added console-common to standard selection.
-
-2006-10-27 Daniel Baumann <daniel at debian.org>
-
-	* Added patch from Otavio Salvador <otavio at debian.org>:
-	  - fixing preseeding error-handling.
-
-2006-10-26 Daniel Baumann <daniel at debian.org>
-
-	* Added gnustep package selection based on the suggestion of
-	  Guerkan Senguen <gurkan at linuks.mine.nu>.
-
-2006-10-25 Daniel Baumann <daniel at debian.org>
-
-	* Applied patch from Marcelo D. Re <mdre at rectorado.unl.edu.ar>:
-	  - skip deb-src source-list entries when building images with
-	    --without-source.
-	* Applied patches from Otavio Salvador <otavio at debian.org>:
-	  - adding '--bootstrap-config' to support cdebootstraps
-	    '--suite-config'.
-	  - allowing override of ${BASE}.
-	  - adjust sourcing of scripts, so that only the real scripts are
-	    sourced and not other (backup) files.
-	  - allowing override of kernel-packages.
-	* Reverted mangling of LIVE_DISTRIBUTION for sources.list generation.
-
-2006-10-23 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.12.
-
-2006-10-18 Daniel Baumann <daniel at debian.org>
-
-	* Autodetecting proxy now.
-
-2006-10-16 Daniel Baumann <daniel at debian.org>
-
-	* Readded and slightly changed --clone and --preseed.
-	* Uploaded 0.99.11.
-
-2006-10-09 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups.
-	* Uploaded 0.99.10.
-
-2006-10-02 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.9.
-
-2006-10-01 Daniel Baumann <daniel at debian.org>
-
-	* Added multiple repositories.
-	* Using LIVE_PROXY_* also for bootstraping.
-
-2006-09-27 Daniel Baumann <daniel at debian.org>
-
-	* Changing manpage section.
-
-2006-09-26 Daniel Baumann <daniel at debian.org>
-
-	* Added default flavour hooks.
-	* minimal flavour does not install debian-archive-keyring to save space.
-	* Adjusted network patch.
-
-2006-09-25 Daniel Baumann <daniel at debian.org>
-
-	* Removed now unused initramfs-tools hack.
-	* Simplified xorg check based on distribution rather than version.
-	* Added fix from Bas Wijnen <wijnen at debian.org> for space handling in
-	  arguments.
-	* Fixed package list handling similar to the fix suggested by Alex Owen
-	  <r.alex.owen at gmail.com>.
-	* Uploaded 0.99.8.
-
-2006-09-24 Marco Amadori <marco.amadori at gmail.com>
-
-	* 13hack.sh: initramfs-tools hack, check added for xorg.
-
-2006-09-18 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.7.
-
-2006-09-15 Daniel Baumann <daniel at debian.org>
-
-	* Added eject to minimal package selection.
-
-2006-09-14 Daniel Baumann <daniel at debian.org>
-
-	* Adjustements for linux 2.6.17 testing propagation.
-
-2006-09-11 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.6.
-
-2006-09-08 Marco Amadori <marco.amadori at gmail.com>
-
-	* 23net.sh: Fixed binary missing directory creation.
-	* templates/iso: Moved common files to templates/common.
-
-2006-09-07 Daniel Baumann <daniel at debian.org>
-
-	* Minor cleanups.
-	* Fixed dist target.
-
-2006-09-06 Marco Amadori <marco.amadori at gmail.com>
-
-	* 14chroot.sh, main.sh: Added manifest support.
-	* 23net.sh: Added 2 variables for basenames to ease readability.
-	* main.sh, 02default.sh: Modified Usage() uses.
-
-2006-09-04 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.5.
-
-2006-09-03 Daniel Baumann <daniel at debian.org>
-
-	* Added dist parameter to easily pull images for live.debian.net.
-	* Added "--output" to specify the image name prefix.
-	* Exclude iso templates for minimal flavour.
-
-2006-09-02 Daniel Baumann <daniel at debian.org>
-
-	* Added experimental as distribution.
-	* Added source image generation.
-	* Using dpkg instead of dpkg-architecture, removed dpkg-dev dependency.
-
-2006-08-31 Daniel Baumann <daniel at debian.org>
-
-	* Added "--disable-generic-indices" and "--enable-generic-indices".
-	* Fixed i18n lists.
-	* Rewritten all lists, comments are now possible.
-	* Lists must be now explicitly given with --package-list, no longer as
-	  last argument of the make-live call.
-	* Setting default sources.list while the image generation, restoring
-	  customized ones afterwards.
-
-2006-08-30 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups:
-	  - moved 14patch_packages.sh to 13hack.sh.
-	  - simplified 13hack.sh.
-
-2006-08-29 Marco Amadori <marco.amadori at gmail.com>
-
-	* pxelinux.cfg: Updated to right defaults, first cifs then nfs or
-	  select your favorite way. Rationale: /dev/nfs is for kernel
-	  discovering, not for initramfs discover, casper will be just fine
-	  with "netboot".
-	* 13chroot.sh, 14patch_packages.sh: Added a simple system for patching
-	  packages, mainly for xserver-xorg so far.
-
-2006-08-28 Daniel Baumann <daniel at debian.org>
-
-	* Updated documentation.
-	* Added patch from Alex Owen <r.a.owen at qmul.ac.uk> to update
-	  pxelinux.cfg for NFS root in casper.
-	* Uploaded 0.99.4.
-
-2006-08-27 Daniel Baumann <daniel at debian.org>
-
-	* Cleanups.
-
-2006-08-27 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added sysv init blocking policy.
-
-2006-08-22 Daniel Baumann <daniel at debian.org>
-
-	* Reorganised sources.
-	* Added staging support.
-	* Cleaned up parameter names.
-	* testing is now supported.
-
-2006-08-21 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.3.
-
-2006-08-02 Marco Amadori <marco.amadori at gmail.com>
-
-	* Rewrote netboot support.
-	* Added support for pure directory rootfs images.
-
-2006-07-31 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.2.
-
-2006-07-28 Daniel Baumann <daniel at debian.org>
-
-	* Added DEBIAN_FRONTEND to chroots(), now completely non-interactive.
-	* Fixed wrong chroot patch.
-
-2006-07-27 Marco Amadori <marco.amadori at gmail.com>
-
-	* Changed amd64 kernel naming scheme.
-
-2006-07-24 Daniel Baumann <daniel at debian.org>
-
-	* Uploaded 0.99.1.
-
-2006-07-19 Daniel Baumann <daniel at debian.org>
-
-	* Bugfixes.
-
-2006-07-18 Daniel Baumann <daniel at debian.org>
-
-	* Added iso templates.
-
-2006-07-17 Daniel Baumann <daniel at debian.org>
-
-	* Added chroot to 01-patch.sh.
-	* Added "--logfile".
-	* Uploaded 0.99.
-
-2006-07-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added "--flavour".
-
-2006-06-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added "--debug" and "--verbose".
-
-2006-06-23 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Rewritten manpages.
-
-2006-06-19 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added "--templates" options.
-	* Fixed some typos.
-
-2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* General fixes.
-
-2006-06-18 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added "-a|--architecture" and "-p|--package-list" options.
-	* Reworked how lists works.
-
-2006-06-15 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* General cleanup.
-
-2006-06-14 Marco Amadori <marco.amadori at gmail.com>
-
-	* Re-added "-f|--filesystem".
-
-2006-06-12 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added "--conffile", "--preseed", "--clone", and "--rootfs" options.
-
-2006-06-12 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added new splash.rle.
-	* Added memtest86+.
-	* Added "--distribution", and "--section" options.
-	* Moved /etc/default/make-live to /etc/make-live.conf.
-
-2006-06-11 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added handling of md5sums.
-
-2006-06-09 Marco Amadori <marco.amadori at gmail.com>
-
-	* Added splashy support.
-	* Added ext2 rootfs support.
-	* Added external hook and path support.
-	* Swiched to getopt.
-
-2006-06-02 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added patch from Jason D. Clinton <me at jasonclinton.com>:
-	  - Added netboot flavour.
-	  - Thanks to SafeDesk Solutions <http://www.safedesk.com/>.
-
-2006-06-01 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Moved syslinux inside the chroot.
-
-2006-05-31 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added kde-*i18n and standard-i18n lists.
-
-2006-05-28 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Added patch from Frederic Lehobey <Frederic.Lehobey at free.fr>:
-	  - Added locales to LIVE_PACKAGES.
-	  - Added LIVE_MIRROR_KEY, LIVE_REPOSITORY, LIVE_REPOSITORY_KEY, and
-	    LIVE_BOOTAPPEND.
-
-2006-05-27 Daniel Baumann <daniel.baumann at panthera-systems.net>
-
-	* Initial release.

Deleted: releases/live-helper/1.0~a11-1/docs/NEWS
===================================================================
--- dists/trunk/live-helper/docs/NEWS	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/docs/NEWS	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,40 +0,0 @@
-News:
-
-  * 2006-02-14: Project announcement.
-    http://blog.daniel-baumann.ch/2006/02/14#20060214_debian-live-initiative
-
-  * 2006-02-28: Setup project resources.
-    http://blog.daniel-baumann.ch/2006/02/28#20060228_debian-live-resources
-
-  * 2006-03-16: Added support for ISO image generation.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-March/000048.html
-
-  * 2006-06-02: Added support for netboot image generation.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-May/000185.html
-
-  * 2006-07-17: Uploaded first live-package to Debian unstable.
-    http://packages.debian.org/changelogs/pool/main/l/live-package/current/changelog#versionversion0.99-1
-
-  * 2007-02-05: Setup image autobuild server.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000764.html
-
-  * 2007-02-10: Added support for USB image generation.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000790.html
-
-  * 2007-02-17: Added support for encrypted live filesystem.
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html
-
-  * 2007-03-12: Uploaded first live-helper to Debian unstable.
-    http://packages.debian.org/changelogs/pool/main/l/live-helper/current/changelog#versionversion1.0_a1-1
-
-  * 2007-03-14: live-package is dead, long lives live-helper
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-March/000998.html
-
-  * 2007-04-19: Google Summer of Code 2007
-    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html
-
-  * 2007-04-26: New website design
-    http://www.chris-lamb.co.uk/blog/2007/04/26/pimp-your-webpage/
-
-  * 2007-04-30: Uploaded first live-initramfs to Debian unstable.
-    http://packages.debian.org/changelogs/pool/main/l/live-initramfs/current/changelog#versionversion1.87.1-1

Copied: releases/live-helper/1.0~a11-1/docs/NEWS (from rev 1690, dists/trunk/live-helper/docs/NEWS)
===================================================================
--- releases/live-helper/1.0~a11-1/docs/NEWS	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/docs/NEWS	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,44 @@
+News:
+
+  * 2006-02-14: Project announcement.
+    http://blog.daniel-baumann.ch/2006/02/14#20060214_debian-live-initiative
+
+  * 2006-02-28: Setup project resources.
+    http://blog.daniel-baumann.ch/2006/02/28#20060228_debian-live-resources
+
+  * 2006-03-16: Added support for ISO image generation.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-March/000048.html
+
+  * 2006-06-02: Added support for netboot image generation.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2006-May/000185.html
+
+  * 2006-07-17: Uploaded first live-package to Debian unstable.
+    http://packages.debian.org/changelogs/pool/main/l/live-package/current/changelog#versionversion0.99-1
+
+  * 2007-02-05: Setup image autobuild server.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000764.html
+
+  * 2007-02-10: Added support for USB image generation.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000790.html
+
+  * 2007-02-17: Added support for encrypted live filesystem.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-February/000836.html
+
+  * 2007-03-12: Uploaded first live-helper to Debian unstable.
+    http://packages.debian.org/changelogs/pool/main/l/live-helper/current/changelog#versionversion1.0_a1-1
+
+  * 2007-03-14: live-package is dead, long lives live-helper
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-March/000998.html
+
+  * 2007-04-19: Google Summer of Code 2007
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-April/001221.html
+
+  * 2007-04-26: New website design
+    http://www.chris-lamb.co.uk/blog/2007/04/26/pimp-your-webpage/
+
+  * 2007-04-30: Uploaded first live-initramfs to Debian unstable.
+    http://packages.debian.org/changelogs/pool/main/l/live-initramfs/current/changelog#versionversion1.87.1-1
+
+  * 2007-05-24: casper is dead, long lives live-initramfs.
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-May/001392.html
+    http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-May/001393.html

Deleted: releases/live-helper/1.0~a11-1/docs/TODO
===================================================================
--- dists/trunk/live-helper/docs/TODO	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/docs/TODO	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,54 +0,0 @@
-TODO list for live-helper
--------------------------
-
-This file lists only outstanding tasks. Any additions/comments/questions and
-help is welcome. Write to <debian-live-devel at lists.alioth.debian.org>.
-
-
-1.0~a10-1:
-  * add compat code for old syslinux
-
-1.0~a10-1:
-  * reordering content of configuration files
-
-ALPHA series:
-
-FIXME
-  * xfce flavours seem to be damaged again
-  * multi-kernel syslinux fuckup
-  * d-i/g-i pool generation on the media
-  * yaboot (powerpc) boot support
-  * grub (i386/amd64) boot support on usb* binary images
-  * grub (i386/amd64) boot support on net binary images
-  * multi-binary builds in one shot
-  * vmlinu[xz]
-  * breakpoints (yes/no/all/type)
-  * check unset variables
-
-ADDME
-  * vmware binary image flavour
-  * usb-zip binary image flavour
-  * support splitted/partial squashfs images
-  * a fetch everything, then build option
-  * introduce package groups
-  * multi-arch for amd64/i386/powerpc on one medium
-  * logfiles
-  * re-import lh_clone/lh_preseed
-  * Add win32 loader
-
-BETA series:
-
-FIXME
-  * check all Require_stagefile calls
-  * make helpers call required stages when needed
-  * integrate lh_chroot_hacks
-  * cleanup variable names
-  * write manpage and documentation/manual
-
-POST 1.0:
-
-  * Add win32 autorun like
-    http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/cdrom-misc/autorun/
-  * Add loadlin or qemu batch
-  * Adding colinux?
-  * exec wrapper for output hiding/handling

Copied: releases/live-helper/1.0~a11-1/docs/TODO (from rev 1728, dists/trunk/live-helper/docs/TODO)
===================================================================
--- releases/live-helper/1.0~a11-1/docs/TODO	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/docs/TODO	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,50 @@
+TODO list for live-helper
+-------------------------
+
+This file lists only outstanding tasks. Any additions/comments/questions and
+help is welcome. Write to <debian-live-devel at lists.alioth.debian.org>.
+
+1.0~a12-1:
+  * reordering content of configuration files
+
+ALPHA series:
+
+FIXME
+  * xfce flavours seem to be damaged again
+  * multi-kernel syslinux fuckup
+  * d-i/g-i pool generation on the media
+  * yaboot (powerpc) boot support
+  * grub (i386/amd64) boot support on usb* binary images
+  * grub (i386/amd64) boot support on net binary images
+  * multi-binary builds in one shot
+  * vmlinu[xz]
+  * breakpoints (yes/no/all/type)
+  * check unset variables
+
+ADDME
+  * vmware binary image flavour
+  * usb-zip binary image flavour
+  * support splitted/partial squashfs images
+  * a fetch everything, then build option
+  * introduce package groups
+  * multi-arch for amd64/i386/powerpc on one medium
+  * logfiles
+  * re-import lh_clone/lh_preseed
+  * Add win32 loader
+
+BETA series:
+
+FIXME
+  * check all Require_stagefile calls
+  * make helpers call required stages when needed
+  * integrate lh_chroot_hacks
+  * cleanup variable names
+  * write manpage and documentation/manual
+
+POST 1.0:
+
+  * Add win32 autorun like
+    http://morphix.svn.sourceforge.net/viewvc/morphix/trunk/cdrom-misc/autorun/
+  * Add loadlin or qemu batch
+  * Adding colinux?
+  * exec wrapper for output hiding/handling

Deleted: releases/live-helper/1.0~a11-1/examples/cron/daily.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/daily.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/examples/cron/daily.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,166 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="daily"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="`date +%Y%m%d`"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="sid"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: releases/live-helper/1.0~a11-1/examples/cron/daily.sh (from rev 1681, dists/trunk/live-helper/examples/cron/daily.sh)
===================================================================
--- releases/live-helper/1.0~a11-1/examples/cron/daily.sh	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/examples/cron/daily.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,166 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="daily"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="`date +%Y%m%d`"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs live-initramfs"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="sid"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: releases/live-helper/1.0~a11-1/examples/cron/etch+beryl.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/etch+beryl.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/examples/cron/etch+beryl.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,175 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="etch+beryl"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="r0_1.0~a10-1"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="etch"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Beryl hook
-				mkdir -p debian-live/config/chroot_local-hooks
-				cp /usr/share/live-helper/examples/hooks/beryl.sh debian-live/config/chroot_local-hooks/beryl.sh
-				mkdir -p debian-live/config/chroot_sources
-				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg
-				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg
-				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.build
-				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.image
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: releases/live-helper/1.0~a11-1/examples/cron/etch+beryl.sh (from rev 1681, dists/trunk/live-helper/examples/cron/etch+beryl.sh)
===================================================================
--- releases/live-helper/1.0~a11-1/examples/cron/etch+beryl.sh	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/examples/cron/etch+beryl.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,175 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="etch+beryl"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="r0_1.0~a11-1"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs casper"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="etch"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Beryl hook
+				mkdir -p debian-live/config/chroot_local-hooks
+				cp /usr/share/live-helper/examples/hooks/beryl.sh debian-live/config/chroot_local-hooks/beryl.sh
+				mkdir -p debian-live/config/chroot_sources
+				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg
+				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg
+				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.build
+				cp /usr/share/live-helper/examples/sources.list/beryl debian-live/config/chroot_sources/beryl.image
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: releases/live-helper/1.0~a11-1/examples/cron/etch.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/etch.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/examples/cron/etch.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,166 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="etch"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="r0_1.0~a10-1"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="etch"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: releases/live-helper/1.0~a11-1/examples/cron/etch.sh (from rev 1681, dists/trunk/live-helper/examples/cron/etch.sh)
===================================================================
--- releases/live-helper/1.0~a11-1/examples/cron/etch.sh	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/examples/cron/etch.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,166 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="etch"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="r0_1.0~a11-1"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs casper"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="etch"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: releases/live-helper/1.0~a11-1/examples/cron/weekly.sh
===================================================================
--- dists/trunk/live-helper/examples/cron/weekly.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/examples/cron/weekly.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,166 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="weekly"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="`date +%Y%m%d`"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="lenny"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Copied: releases/live-helper/1.0~a11-1/examples/cron/weekly.sh (from rev 1681, dists/trunk/live-helper/examples/cron/weekly.sh)
===================================================================
--- releases/live-helper/1.0~a11-1/examples/cron/weekly.sh	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/examples/cron/weekly.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,166 @@
+#!/bin/sh -x
+
+set -e
+
+BUILD="weekly"
+
+# Begin custom defaults
+AUTOBUILD="enabled"
+
+DATE="`date +%Y%m%d`"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+TEMPDIR="/srv/tmp/live-helper"
+
+OPTIONS="--binary-indices disabled --initramfs casper"
+
+ARCHITECTURES="`dpkg --print-architecture`"
+DISTRIBUTIONS="lenny"
+MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
+MIRROR_BINARY="http://ftp.debian.org/debian/"
+MIRROR_BINARY_SECURITY="http://security.debian.org/"
+PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
+# End custom defaults
+
+# Checking for live-helper availability
+if [ ! -x /usr/bin/make-live ]
+then
+	exit 0
+fi
+
+# Checking for live-helper defaults
+#if [ -r /etc/default/live-helper ]
+#then
+#	. /etc/default/live-helper
+#else
+#	echo "E: /etc/default/live-helper missing."
+#	exit 1
+#fi
+
+# Checking for autobuild
+if [ "${AUTOBUILD}" != "enabled" ]
+then
+	exit 0
+fi
+
+# Checking for build directory
+if [ ! -d "${TEMPDIR}" ]
+then
+	mkdir -p "${TEMPDIR}"/debian-live
+else
+	# FIXME: maybe we should just remove the left overs.
+	echo "E: ${TEMPDIR} needs cleanup."
+	exit 1
+fi
+
+for ARCHITECTURE in ${ARCHITECTURES}
+do
+	for DISTRIBUTION in ${DISTRIBUTIONS}
+	do
+		for PACKAGES_LIST in ${PACKAGES_LISTS}
+		do
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
+			then
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b iso -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
+				mv "${TEMPDIR}"/debian-live/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
+
+				# Creating images directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.iso
+				mv "${TEMPDIR}"/debian-live/source.tar "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
+			fi
+
+			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
+			then
+				# Workaround of missing multi-binary support in live-helper
+				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
+				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
+				mkdir "${TEMPDIR}"/debian-live/binary
+				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
+				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
+				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
+
+				# Creating build directory
+				mkdir -p "${TEMPDIR}"/debian-live
+
+				cd "${TEMPDIR}"
+				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
+
+				# Generating images
+				make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
+
+				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
+			fi
+
+			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
+			then
+				# Creating log directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
+
+				# Moving logs
+				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
+				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
+
+				# Creating image directory
+				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
+
+				# Moving images
+				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}.img
+			fi
+
+			# Cleanup
+			cd "${TEMPDIR}"/debian-live
+			lh_clean
+		done
+
+		# Cleanup
+		cd "${TEMPDIR}"/debian-live
+		lh_clean purge
+	done
+done
+
+# Cleaning up
+if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/proc
+fi
+
+if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
+then
+	umount "${TEMPDIR}"/debian-live/chroot/sys
+fi
+
+# Removing build directory
+rm -rf "${TEMPDIR}"
+
+# Creating md5sums
+for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
+do
+	cd "${DIRECTORY}"
+	md5sum * > MD5SUMS
+done
+
+# Creating current symlink
+rm -f "${DESTDIR}"/"${BUILD}"-builds/current
+ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current

Deleted: releases/live-helper/1.0~a11-1/functions/common.sh
===================================================================
--- dists/trunk/live-helper/functions/common.sh	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/functions/common.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# common.sh - common things for all live-helpers
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-PROGRAM="`basename ${0}`"
-VERSION="1.0~a10"

Copied: releases/live-helper/1.0~a11-1/functions/common.sh (from rev 1679, dists/trunk/live-helper/functions/common.sh)
===================================================================
--- releases/live-helper/1.0~a11-1/functions/common.sh	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/functions/common.sh	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# common.sh - common things for all live-helpers
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+PROGRAM="`basename ${0}`"
+VERSION="1.0~a11"

Deleted: releases/live-helper/1.0~a11-1/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_debian-installer	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,250 +0,0 @@
-#!/bin/sh
-
-# lh_binary_debian-installer(1) - install debian-installer into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install debian-installer into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_debian-installer: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_debian-installer
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/install"
-		DESTDIR_INSTALLER="cdrom"
-		;;
-
-	net)
-		DESTDIR="tftpboot"
-		DESTDIR_INSTALLER="netboot"
-
-		Echo_error "Not supported yet (FIXME)"
-		exit 1
-		;;
-
-	usb-hdd|hdd)
-		DESTDIR="binary/install"
-		DESTDIR_INSTALLER="hd-media"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR="${DESTDIR}.amd"
-				;;
-
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-
-			powerpc)
-				DESTDIR="${DESTDIR}.ppc"
-				;;
-		esac
-	fi
-fi
-
-# Downloading debian-installer
-mkdir -p "${DESTDIR}"
-
-wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
-
-# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-then
-	mkdir -p "${DESTDIR}"/gtk
-
-	wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
-	wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
-fi
-
-FIXME ()
-{
-# Downloading udebs
-mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
-gunzip -c Packages.gz > Packages
-cd "${OLDPWD}"
-
-for DISTRIBUTION in frozen stable testing unstable
-do
-	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-done
-
-DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
-UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
-
-rm -f packages.di
-
-for UDEB in ${UDEBS}
-do
-	mkdir -p binary/`dirname ${UDEB}`
-	cd binary/`dirname ${UDEB}`
-	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
-	cd "${OLDPWD}"
-done
-
-# Downloading debs
-if [ -d cache/packages_bootstrap ]
-then
-	for FILE in cache/packages_bootstrap/*.deb
-	do
-		SOURCE="`dpkg -f ${FILE} Source`"
-
-		if [ -z "${SOURCE}" ]
-		then
-			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
-		fi
-
-		case "${SOURCE}" in
-			lib?*)
-				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
-				;;
-
-			*)
-				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
-				;;
-		esac
-
-		# Install directory
-		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
-
-		# Move files
-		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
-	done
-fi
-
-mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
-
-cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
-Archive: ${LIVE_DISTRIBUTION}
-Component: main
-Origin: Debian
-Label: Debian
-Architecture: ${LIVE_ARCHITECTURE}
-EOF
-
-mkdir -p cache/indices_debian-installer
-
-cat > cache/indices_debian-installer/archive << EOF
-Dir
-{
-	ArchiveDir	"binary";
-	// OverrideDir	"";
-	// CacheDir	"";
-	FileListDir	"cache/indices_debian-installer";
-};
-
-Default
-{
-	Packages::Compress	". gzip";
-	// Packages::Extension	".deb";
-	// Sources::Extensions	".dsc";
-	// Contents::Compress	"gzip";
-	// DeLinkLimit		"0";
-	// FileMode		"0644";
-};
-
-TreeDefault
-{
-	// MaxContentsChange
-	// ContentsAge
-	Directory		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
-	Packages		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
-	InternalPrefix		"dists/\$(DIST)/\$(SECTION)/";
-	Contents		"dists/\$(DIST)/Contents-\$(ARCH)";
-	// Contents::Header
-	// BinCacheDB		"cache.\$(DIST).\$(SECTION).\$(ARCH)";
-	// FileList		"filelist.\$(DIST).\$(SECTION).\$(ARCH)";
-	FileList		"filelist";
-	// BinOverride		"override.\$(DIST).\$(SECTION)";
-};
-
-tree "${LIVE_DISTRIBUTION}"
-{
-	Sections	"main";
-	Architectures	"${LIVE_ARCHITECTURE}";
-};
-EOF
-
-cd binary
-find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
-cd "${OLDPWD}"
-
-cat > cache/indices_debian-installer/release << EOF
-APT::FTPArchive::Release::Origin	"Debian";
-APT::FTPArchive::Release::Label		"Debian";
-APT::FTPArchive::Release::Suite		"${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Version	"4.0";
-APT::FTPArchive::Release::Codename	"${LIVE_DISTRIBUTION}";
-APT::FTPArchive::Release::Date		"`date -R`";
-APT::FTPArchive::Release::Architectures	"${LIVE_ARCHITECTURE}";
-APT::FTPArchive::Release::Components	"main";
-EOF
-
-apt-ftparchive generate cache/indices_debian-installer/archive
-apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
-}
-
-mkdir binary/.disk
-echo "main" > binary/.disk/base_components
-touch binary/.disk/base_installable
-echo "not_complete" > binary/.disk/cd_type
-#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
-touch binary/.disk/mkisofs
-
-# Creating stage file
-Create_stagefile .stage/binary_debian-installer

Copied: releases/live-helper/1.0~a11-1/helpers/lh_binary_debian-installer (from rev 1730, dists/trunk/live-helper/helpers/lh_binary_debian-installer)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/lh_binary_debian-installer	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_debian-installer	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,304 @@
+#!/bin/sh
+
+# lh_binary_debian-installer(1) - install debian-installer into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="install debian-installer into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_debian-installer: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_debian-installer
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/install"
+		DESTDIR_INSTALLER="cdrom"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		DESTDIR_INSTALLER="netboot"
+
+		Echo_error "Not supported yet (FIXME)"
+		exit 1
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				DESTDIR="binary"
+			else
+				DESTDIR="binary/install"
+			fi
+		else
+			DESTDIR="binary/install"
+		fi
+
+		DESTDIR_INSTALLER="hd-media"
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+
+			powerpc)
+				DESTDIR="${DESTDIR}.ppc"
+				;;
+		esac
+	fi
+fi
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR}"
+
+# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+then
+	if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+	then
+		if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+		then
+			wget --no-clobber -O "${DESTDIR}"/vmlinuz.di "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/initrddi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+		else
+			wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+		fi
+	else
+		wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+		wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+	fi
+else
+	wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+fi
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+	then
+		if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				wget --no-clobber -O "${DESTDIR}"/vmlinuz.gi "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+				wget --no-clobber -O "${DESTDIR}"/initrdgi.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+			else
+				mkdir -p "${DESTDIR}"/gtk
+
+				wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+				wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+			fi
+		else
+			mkdir -p "${DESTDIR}"/gtk
+
+			wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+		fi
+	else
+		mkdir -p "${DESTDIR}"/gtk
+
+		wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+		wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+	fi
+fi
+
+FIXME ()
+{
+# Downloading udebs
+mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
+gunzip -c Packages.gz > Packages
+cd "${OLDPWD}"
+
+for DISTRIBUTION in frozen stable testing unstable
+do
+	ln -s ${LIVE_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+done
+
+DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
+UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
+
+rm -f packages.di
+
+for UDEB in ${UDEBS}
+do
+	mkdir -p binary/`dirname ${UDEB}`
+	cd binary/`dirname ${UDEB}`
+	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+	cd "${OLDPWD}"
+done
+
+# Downloading debs
+if [ -d cache/packages_bootstrap ]
+then
+	for FILE in cache/packages_bootstrap/*.deb
+	do
+		SOURCE="`dpkg -f ${FILE} Source`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+	done
+fi
+
+mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
+
+cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
+Archive: ${LIVE_DISTRIBUTION}
+Component: main
+Origin: Debian
+Label: Debian
+Architecture: ${LIVE_ARCHITECTURE}
+EOF
+
+mkdir -p cache/indices_debian-installer
+
+cat > cache/indices_debian-installer/archive << EOF
+Dir
+{
+	ArchiveDir	"binary";
+	// OverrideDir	"";
+	// CacheDir	"";
+	FileListDir	"cache/indices_debian-installer";
+};
+
+Default
+{
+	Packages::Compress	". gzip";
+	// Packages::Extension	".deb";
+	// Sources::Extensions	".dsc";
+	// Contents::Compress	"gzip";
+	// DeLinkLimit		"0";
+	// FileMode		"0644";
+};
+
+TreeDefault
+{
+	// MaxContentsChange
+	// ContentsAge
+	Directory		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/";
+	Packages		"dists/\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
+	InternalPrefix		"dists/\$(DIST)/\$(SECTION)/";
+	Contents		"dists/\$(DIST)/Contents-\$(ARCH)";
+	// Contents::Header
+	// BinCacheDB		"cache.\$(DIST).\$(SECTION).\$(ARCH)";
+	// FileList		"filelist.\$(DIST).\$(SECTION).\$(ARCH)";
+	FileList		"filelist";
+	// BinOverride		"override.\$(DIST).\$(SECTION)";
+};
+
+tree "${LIVE_DISTRIBUTION}"
+{
+	Sections	"main";
+	Architectures	"${LIVE_ARCHITECTURE}";
+};
+EOF
+
+cd binary
+find pool -name "*.deb" | sort > ../cache/indices_debian-installer/filelist
+cd "${OLDPWD}"
+
+cat > cache/indices_debian-installer/release << EOF
+APT::FTPArchive::Release::Origin	"Debian";
+APT::FTPArchive::Release::Label		"Debian";
+APT::FTPArchive::Release::Suite		"${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Version	"4.0";
+APT::FTPArchive::Release::Codename	"${LIVE_DISTRIBUTION}";
+APT::FTPArchive::Release::Date		"`date -R`";
+APT::FTPArchive::Release::Architectures	"${LIVE_ARCHITECTURE}";
+APT::FTPArchive::Release::Components	"main";
+EOF
+
+apt-ftparchive generate cache/indices_debian-installer/archive
+apt-ftparchive -c cache/indices_debian-installer/release -o APT::FTPArchive::Release::Description="Last updated: `date -R`" release binary/dists/${LIVE_DISTRIBUTION} > binary/dists/${LIVE_DISTRIBUTION}/Release
+}
+
+mkdir binary/.disk
+echo "main" > binary/.disk/base_components
+touch binary/.disk/base_installable
+echo "not_complete" > binary/.disk/cd_type
+#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
+touch binary/.disk/mkisofs
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer

Deleted: releases/live-helper/1.0~a11-1/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_grub	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,252 +0,0 @@
-#!/bin/sh
-
-# lh_binary_grub(1) - installs grub into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs grub into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "grub" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_grub: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_grub
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_grub, foreign architecture."
-	exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Check local templates
-if [ -d config/templates/grub ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/sbin/grub grub
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso|usb-hdd|hdd)
-		DESTDIR_LIVE="binary/live"
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	net)
-		Echo_error "not supported, aborting (FIXME)."
-		exit 1
-	;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
-				;;
-
-			i386)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR_LIVE}" ]
-then
-	mkdir -p "${DESTDIR_LIVE}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
-
-# Assembling kernel configuration
-DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-
-LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz*
-	do
-		if [ -z "${LINUX}" ]
-		then
-			LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-		else
-			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
-		fi
-	done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
-	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
-
-	LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
-fi
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
-	MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
-	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-fi
-
-# Copying templates
-mkdir -p binary/boot/grub
-cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
-
-# Copyring grub
-case ${LIVE_BINARY_IMAGES} in
-	iso)
-		cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
-		;;
-
-	usb-hdd|hdd)
-		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
-		;;
-esac
-
-# Copying splash screen
-if [ -f config/binary_grub/splash.xpm.gz ]
-then
-	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
-fi
-
-if [ -n "${LIVE_GRUB_SPLASH}" ]
-then
-	if [ "${LIVE_GRUB_SPLASH}" = "none" ]
-	then
-		# Removing splash file
-		rm -f binary/boot/grub/splash.xpm.gz
-
-		# Removing splash entry
-		sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
-	else
-		# Overwriting splash file
-		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
-	fi
-fi
-
-# Configure grub templates
-cat >> binary/boot/grub/menu.lst << EOF
-
-title		Other:
-root
-
-LIVE_MEMTEST
-EOF
-
-sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
-sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_grub

Copied: releases/live-helper/1.0~a11-1/helpers/lh_binary_grub (from rev 1726, dists/trunk/live-helper/helpers/lh_binary_grub)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/lh_binary_grub	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_grub	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,293 @@
+#!/bin/sh
+
+# lh_binary_grub(1) - installs grub into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs grub into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "grub" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_grub: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_grub
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_grub, foreign architecture."
+	exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+	if [ -d ../"${LIVE_TEMPLATES}" ]
+	then
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+fi
+
+# Check local templates
+if [ -d config/templates/grub ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/sbin/grub grub
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso|usb-hdd|hdd)
+		DESTDIR_LIVE="binary/live"
+		DESTDIR_INSTALL="binary/install"
+		;;
+
+	net)
+		Echo_error "not supported, aborting (FIXME)."
+		exit 1
+	;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+				;;
+
+			i386)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR_LIVE}" ]
+then
+	mkdir -p "${DESTDIR_LIVE}"
+fi
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_USERNAME}" != "user" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	case "${LIVE_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_HOSTNAME}" != "debian" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+
+# Assembling kernel configuration
+DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+
+LINUX="title\t\tDebian GNU/Linux - live\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
+LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`"
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			LINUX="title\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel\t\t/`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+		else
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+			LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'` (fail-safe mode)\nkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}\ninitrd\t\t/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`"
+		fi
+	done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
+
+	LIVE_LINUX_INSTALL="title\t\tInstaller:\nroot"
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - install\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - installgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expert\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - expertgui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz priority=low video=vesa:ywrap,mtrr vga=788\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescue\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz vga=normal rescue/enable=true -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - rescuegui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz video=vesa:ywrap,mtrr vga=788 rescue/enable=true --\ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+
+	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - auto\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical vga=normal -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/initrd.gz"
+
+	if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+	then
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\ntitle\t\tDebian GNU/Linux - autogui\nkernel\t\t/`basename ${DESTDIR_INSTALL}`/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 -- \ninitrd\t\t/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz"
+	fi
+fi
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+	MEMTEST="title\t\t${LIVE_MEMTEST}\nkernel\t\t/`basename ${DESTDIR_LIVE}`/memtest"
+	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+# Copying templates
+mkdir -p binary/boot/grub
+cp -r "${LIVE_TEMPLATES}"/grub/* binary/boot/grub
+
+# Copyring grub
+case ${LIVE_BINARY_IMAGES} in
+	iso)
+		cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
+		;;
+
+	usb-hdd|hdd)
+		cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
+		;;
+esac
+
+# Copying splash screen
+if [ -f config/binary_grub/splash.xpm.gz ]
+then
+	LIVE_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+fi
+
+if [ -n "${LIVE_GRUB_SPLASH}" ]
+then
+	if [ "${LIVE_GRUB_SPLASH}" = "none" ]
+	then
+		# Removing splash file
+		rm -f binary/boot/grub/splash.xpm.gz
+
+		# Removing splash entry
+		sed -i -e "s/splashimage.*//" binary/boot/grub/menu.lst
+	else
+		# Overwriting splash file
+		cp -f "${LIVE_GRUB_SPLASH}" binary/boot/grub/splash.xpm.gz
+	fi
+fi
+
+# Configure grub templates
+cat >> binary/boot/grub/menu.lst << EOF
+
+title		Other:
+root
+
+LIVE_MEMTEST
+EOF
+
+sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
+sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_grub

Deleted: releases/live-helper/1.0~a11-1/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_includes	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,126 +0,0 @@
-#!/bin/sh
-
-# lh_binary_includes(1) - copy files into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="copy files into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_INCLUDES}" = "none" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_includes: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check user includes
-if [ ! -d "${LIVE_INCLUDES}" ]
-then
-	if [ -d ../"${LIVE_INCLUDES}" ]
-	then
-		LIVE_INCLUDES="../${LIVE_INCLUDES}"
-	else
-		Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
-		exit 1
-	fi
-fi
-
-# Checking local includes
-if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
-then
-	LIVE_INCLUDES="config/includes"
-fi
-
-# Assemble architecture
-case "${LIVE_ARCHITECTURE}" in
-	amd64)
-		ARCH="amd"
-		;;
-
-	i386)
-		ARCH="386"
-		;;
-
-	powerpc)
-		ARCH="ppc"
-		;;
-esac
-
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
-	# Working arround vfat limitations
-	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
-	then
-		CP_OPTIONS="-L"
-	fi
-
-	# Copying d-i templates
-	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
-	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
-	then
-		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
-	fi
-
-	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
-	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
-	then
-		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
-	fi
-
-	# Adjusting d-i templates
-	DEBIAN_NAME="/Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
-	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
-
-	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
-	then
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
-		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
-	else
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
-		DEBIAN_TOOLS_TXT="/tools/"
-	fi
-
-	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
-	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_includes

Copied: releases/live-helper/1.0~a11-1/helpers/lh_binary_includes (from rev 1727, dists/trunk/live-helper/helpers/lh_binary_includes)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/lh_binary_includes	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_includes	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+# lh_binary_includes(1) - copy files into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="copy files into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_INCLUDES}" = "none" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_includes: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check user includes
+if [ ! -d "${LIVE_INCLUDES}" ]
+then
+	if [ -d ../"${LIVE_INCLUDES}" ]
+	then
+		LIVE_INCLUDES="../${LIVE_INCLUDES}"
+	else
+		Echo_error "user specified includes not accessible in ${LIVE_INCLUDES}"
+		exit 1
+	fi
+fi
+
+# Checking local includes
+if [ -d config/includes/"${LIVE_DISTRIBUTION}" ]
+then
+	LIVE_INCLUDES="config/includes"
+fi
+
+# Assemble architecture
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		ARCH="amd"
+		;;
+
+	i386)
+		ARCH="386"
+		;;
+
+	powerpc)
+		ARCH="ppc"
+		;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+	# Working arround vfat limitations
+	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+	then
+		CP_OPTIONS="-L"
+	fi
+
+	# Copying d-i templates
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
+	then
+		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* binary
+	fi
+
+	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}" ] && \
+	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* &> /dev/null
+	then
+		cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install."${ARCH}"/* binary
+	fi
+
+	# Adjusting d-i templates
+	DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
+
+	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
+	then
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
+	else
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+		DEBIAN_TOOLS_TXT="/tools/"
+	fi
+
+	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_HTML}#g" binary/README.html
+	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_includes

Deleted: releases/live-helper/1.0~a11-1/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_linux-image	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# lh_binary_linux-image(1) - install linux-image into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install linux-image into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "binary_linux-image: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_linux-image
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Removing initrd backup files
-rm -f chroot/boot/initrd*bak*
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/live"
-		;;
-
-	net)
-		DESTDIR="tftpboot"
-		;;
-
-	usb-hdd|hdd)
-		DESTDIR="binary/live"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR="${DESTDIR}.amd"
-				;;
-
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-
-			powerpc)
-				DESTDIR="${DESTDIR}.ppc"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
-	mkdir -p "${DESTDIR}"
-fi
-
-# Installing linux-image
-cp chroot/boot/vmlinuz* "${DESTDIR}"
-cp chroot/boot/initrd.img* "${DESTDIR}"
-
-# Creating stage file
-Create_stagefile .stage/binary_linux-image

Copied: releases/live-helper/1.0~a11-1/helpers/lh_binary_linux-image (from rev 1720, dists/trunk/live-helper/helpers/lh_binary_linux-image)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/lh_binary_linux-image	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_linux-image	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+# lh_binary_linux-image(1) - install linux-image into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="install linux-image into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "binary_linux-image: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_linux-image
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Removing initrd backup files
+rm -f chroot/boot/initrd*bak*
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				DESTDIR="binary"
+			else
+				DESTDIR="binary/live"
+			fi
+		else
+			DESTDIR="binary/live"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+
+			powerpc)
+				DESTDIR="${DESTDIR}.ppc"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Installing linux-image
+cp chroot/boot/vmlinuz* "${DESTDIR}"
+cp chroot/boot/initrd.img* "${DESTDIR}"
+
+# Creating stage file
+Create_stagefile .stage/binary_linux-image

Deleted: releases/live-helper/1.0~a11-1/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_memtest	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-# lh_binary_memtest(1) - installs a memtest into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs a memtest into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_MEMTEST}" = "disabled" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_memtest: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_memtest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_memtest, foreign architecture."
-	exit 0
-fi
-
-# Checking depends
-case "${LIVE_MEMTEST}" in
-	memtest86)
-		Check_package chroot/boot/memtest86.bin memtest86
-		;;
-
-	memtest86+)
-		Check_package chroot/boot/memtest86+.bin memtest86+
-		;;
-esac
-
-# Installing depends
-Install_package
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/live"
-		;;
-
-	net)
-		DESTDIR="tftpboot"
-		;;
-
-	usb-hdd|hdd)
-		DESTDIR="binary/live"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assemble multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR="${DESTDIR}.amd"
-				;;
-
-			i386)
-				DESTDIR="${DESTDIR}.386"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
-	mkdir -p "${DESTDIR}"
-fi
-
-# Installing memtest
-case "${LIVE_MEMTEST}" in
-	memtest86)
-		cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
-		;;
-
-	memtest86+)
-		cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
-		;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_memtest

Copied: releases/live-helper/1.0~a11-1/helpers/lh_binary_memtest (from rev 1720, dists/trunk/live-helper/helpers/lh_binary_memtest)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/lh_binary_memtest	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_memtest	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# lh_binary_memtest(1) - installs a memtest into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs a memtest into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_MEMTEST}" = "disabled" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_memtest: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_memtest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_memtest, foreign architecture."
+	exit 0
+fi
+
+# Checking depends
+case "${LIVE_MEMTEST}" in
+	memtest86)
+		Check_package chroot/boot/memtest86.bin memtest86
+		;;
+
+	memtest86+)
+		Check_package chroot/boot/memtest86+.bin memtest86+
+		;;
+esac
+
+# Installing depends
+Install_package
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net)
+		DESTDIR="tftpboot"
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+			then
+				DESTDIR="binary"
+			else
+				DESTDIR="binary/live"
+			fi
+		else
+			DESTDIR="binary/live"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assemble multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR="${DESTDIR}.amd"
+				;;
+
+			i386)
+				DESTDIR="${DESTDIR}.386"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Installing memtest
+case "${LIVE_MEMTEST}" in
+	memtest86)
+		cp -f chroot/boot/memtest86.bin "${DESTDIR}"/memtest
+		;;
+
+	memtest86+)
+		cp -f chroot/boot/memtest86+.bin "${DESTDIR}"/memtest
+		;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_memtest

Deleted: releases/live-helper/1.0~a11-1/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_syslinux	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,388 +0,0 @@
-#!/bin/sh
-
-# lh_binary_syslinux(1) - installs syslinux into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs syslinux into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_syslinux: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_syslinux
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_syslinux, foreign architecture."
-	exit 0
-fi
-
-# Checking user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Check local templates
-if [ -d config/templates/syslinux ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/bin/syslinux syslinux
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR_LIVE="binary/live"
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	net)
-		DESTDIR_LIVE="tftpboot"
-		DESTDIR_INSTALL="tftpboot"
-	;;
-
-	usb-hdd|hdd)
-		DESTDIR_LIVE="binary/live"
-		DESTDIR_INSTALL="binary/install"
-		;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	# Assembling multi-arch
-	if [ -n "${MULTIARCH}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			amd64)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
-				;;
-
-			i386)
-				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
-				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
-				;;
-		esac
-	fi
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR_LIVE}" ]
-then
-	mkdir -p "${DESTDIR_LIVE}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
-then
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-	LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-else
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-	LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-fi
-
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz*
-	do
-		if [ -z "${LINUX}" ]
-		then
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			else
-				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			fi
-		else
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			else
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			fi
-		fi
-	done
-fi
-
-# Removing '//'
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-# Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
-then
-	LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
-	LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz rescue/enable=true -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz rescue/enable=true -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
-	LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/gtk/vmlinuz\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/gtk/initrd.gz -- "
-fi
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
-	if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-	then
-		MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
-		MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
-	else
-		MEMTEST="LABEL memtest\n\tkernel memtest"
-	fi
-fi
-
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		# Copying syslinux
-		mkdir -p binary/isolinux
-		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
-		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
-
-		# Copying splash screen
-		if [ -f config/binary_syslinux/splash.rle ]
-		then
-			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
-		fi
-
-		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
-		then
-			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
-			then
-				rm -f binary/isolinux/splash.rle
-				sed -e "s/.*splash.*//" binary/isolinux/boot.txt
-			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
-			fi
-		fi
-
-		# Configure syslinux templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
-		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
-
-		# Remove unused files
-		rm -f binary/isolinux/pxelinux.cfg
-
-		# Working arround syslinux 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
-				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
-			done
-		else
-			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
-			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
-			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
-		fi
-		;;
-
-	net)
-		# Copying syslinux
-		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
-
-		# Install syslinux templates
-		mkdir -p tftpboot/pxelinux.cfg
-		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
-		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
-		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
-
-		# Copying splash screen
-		if [ -f config/binary_syslinux/splash.rle ]
-		then
-			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
-		fi
-
-		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
-		then
-			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
-			then
-				rm -f tftpboot/pxelinux.cfg/splash.rle
-				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
-			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
-			fi
-		fi
-
-		# Configure syslinux templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
-		sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
-
-		# Remove unused files
-		rm -f tftpboot/pxelinux.cfg/isolinux.cfg
-
-		# Working arround syslinux 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
-				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
-			done
-		else
-			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
-			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
-			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
-		fi
-		;;
-
-	usb-hdd|hdd)
-		# Copying syslinux
-		mkdir -p binary
-		cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
-		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary
-		mv binary/isolinux.cfg binary/syslinux.cfg
-
-		# Copying splash screen
-		if [ -f config/binary_syslinux/splash.rle ]
-		then
-			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
-		fi
-
-		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
-		then
-			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
-			then
-				rm -f binary/splash.rle
-				sed -e "s/.*splash.*//" binary/syslinux.txt
-			else
-				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/splash.rle
-			fi
-		fi
-
-		# Configure syslinux templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/syslinux.cfg
-		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/syslinux.cfg
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/f1.txt
-		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/f10.txt
-
-		# Remove unused files
-		rm -f binary/pxelinux.cfg
-
-		# Working arround syslinux 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
-				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/syslinux.cfg
-			done
-		else
-			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
-			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
-			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/syslinux.cfg
-		fi
-		;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux

Copied: releases/live-helper/1.0~a11-1/helpers/lh_binary_syslinux (from rev 1725, dists/trunk/live-helper/helpers/lh_binary_syslinux)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/lh_binary_syslinux	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_syslinux	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,522 @@
+#!/bin/sh
+
+# lh_binary_syslinux(1) - installs syslinux into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs syslinux into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_syslinux: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_syslinux
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_syslinux, foreign architecture."
+	exit 0
+fi
+
+# Checking user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+	if [ -d ../"${LIVE_TEMPLATES}" ]
+	then
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+fi
+
+# Check local templates
+if [ -d config/templates/syslinux ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/bin/syslinux syslinux
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR_LIVE="binary/live"
+		DESTDIR_INSTALL="binary/install"
+		;;
+
+	net)
+		DESTDIR_LIVE="tftpboot"
+		DESTDIR_INSTALL="tftpboot"
+	;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			DESTDIR_LIVE="binary"
+			DESTDIR_INSTALL="binary"
+		else
+			DESTDIR_LIVE="binary/live"
+			DESTDIR_INSTALL="binary/install"
+		fi
+		;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	# Assembling multi-arch
+	if [ -n "${MULTIARCH}" ]
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.amd"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.amd"
+				;;
+
+			i386)
+				DESTDIR_LIVE="${DESTDIR_LIVE}.386"
+				DESTDIR_INSTALL="${DESTDIR_INSTALL}.386"
+				;;
+		esac
+	fi
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR_LIVE}" ]
+then
+	mkdir -p "${DESTDIR_LIVE}"
+fi
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_USERNAME}" != "user" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	case "${LIVE_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_HOSTNAME}" != "debian" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+then
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+	then
+		LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+		LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+	else
+		LINUX="LABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+		LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+	fi
+else
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+	LINUX="LABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+	LINUX="${LINUX}\n\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+fi
+
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+			then
+				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			else
+				LINUX="LABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			fi
+		else
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+			then
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			else
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+				LINUX="${LINUX}\n\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
+			fi
+		fi
+	done
+fi
+
+# Removing '//'
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+then
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+	then
+		if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+		then
+			VMLINUZ_DI="vmlinuz.di"
+			INITRD_DI="initrddi.gz"
+
+			VMLINUZ_GI="vmlinuz.gi"
+			INITRD_GI="initrdgi.gz"
+		else
+			VMLINUZ_DI="vmlinuz"
+			INITRD_DI="initrd.gz"
+
+			VMLINUZ_GI="gtk/vmlinuz"
+			INITRD_GI="gtk/initrd.gz"
+		fi
+	else
+		VMLINUZ_DI="vmlinuz"
+		INITRD_DI="initrd.gz"
+
+		VMLINUZ_GI="gtk/vmlinuz"
+		INITRD_GI="gtk/initrd.gz"
+	fi
+
+	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+	if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+	then
+		LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+		fi
+
+		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
+		fi
+	else
+		LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+		fi
+
+		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
+		fi
+
+		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
+
+		if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+		then
+			LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
+		fi
+	fi
+fi
+
+LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+	then
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
+		then
+			MEMTEST="LABEL memtest\n\tkernel memtest"
+		else
+			MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
+		fi
+	else
+		MEMTEST="LABEL memtest\n\tkernel memtest"
+	fi
+
+	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
+fi
+
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		# Copying syslinux
+		mkdir -p binary/isolinux
+		cp chroot/usr/lib/syslinux/isolinux.bin binary/isolinux
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* binary/isolinux
+
+		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f binary/isolinux/splash.rle
+				sed -e "s/.*splash.*//" binary/isolinux/boot.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" binary/isolinux/splash.rle
+			fi
+		fi
+
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/isolinux/isolinux.cfg
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
+
+		# Remove unused files
+		rm -f binary/isolinux/pxelinux.cfg
+
+		# Working arround syslinux 8.3 limitation
+		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+			do
+				NUMBER=$(($NUMBER + 1))
+
+				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
+			done
+		else
+			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
+		fi
+		;;
+
+	net)
+		# Copying syslinux
+		cp chroot/usr/lib/syslinux/pxelinux.0 tftpboot
+
+		# Install syslinux templates
+		mkdir -p tftpboot/pxelinux.cfg
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* tftpboot/pxelinux.cfg
+		mv tftpboot/pxelinux.cfg/pxelinux.cfg tftpboot/pxelinux.cfg/default
+		sed -i -e 's#splash.rle#pxelinux.cfg/splash.rle#' tftpboot/pxelinux.cfg/boot.txt
+
+		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f tftpboot/pxelinux.cfg/splash.rle
+				sed -e "s/.*splash.*//" tftpboot/pxelinux.cfg/boot.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" tftpboot/pxelinux.cfg/splash.rle
+			fi
+		fi
+
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
+
+		# Remove unused files
+		rm -f tftpboot/pxelinux.cfg/isolinux.cfg
+
+		# Working arround syslinux 8.3 limitation
+		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+			do
+				NUMBER=$(($NUMBER + 1))
+
+				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
+			done
+		else
+			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
+		fi
+		;;
+
+	usb-hdd|hdd)
+		# Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			DESTDIR="binary"
+		else
+			DESTDIR="binary/syslinux"
+		fi
+
+		# Copying syslinux
+		mkdir -p "${DESTDIR}"
+		cp chroot/usr/lib/syslinux/isolinux.bin "${DESTDIR}"/syslinux.bin
+		cp -r "${LIVE_TEMPLATES}"/syslinux/* "${DESTDIR}"
+		mv binary/isolinux.cfg "${DESTDIR}"/syslinux.cfg
+
+		# Copying splash screen
+		if [ -f config/binary_syslinux/splash.rle ]
+		then
+			LIVE_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+		fi
+
+		if [ -n "${LIVE_SYSLINUX_SPLASH}" ]
+		then
+			if [ "${LIVE_SYSLINUX_SPLASH}" = "none" ]
+			then
+				rm -f "${DESTDIR}"/splash.rle
+				sed -e "s/.*splash.*//" "${DESTDIR}"/boot.txt
+			else
+				cp -f "${LIVE_SYSLINUX_SPLASH}" "${DESTDIR}"/splash.rle
+			fi
+		fi
+
+		# Configure syslinux templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
+		sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+
+		# Remove unused files
+		rm -f "${DESTDIR}"/pxelinux.cfg
+
+		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
+		if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+		then
+			if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+			then
+				for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+				do
+					NUMBER=$(($NUMBER + 1))
+
+					mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
+					mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
+					sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
+				done
+			else
+				mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
+				mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
+				sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+			fi
+		fi
+		;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux

Deleted: releases/live-helper/1.0~a11-1/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_yaboot	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,210 +0,0 @@
-#!/bin/sh
-
-# lh_binary_yaboot(1) - installs yaboot into binary
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-	. ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="installs yaboot into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
-then
-	exit 0
-fi
-
-Breakpoint "binary_yaboot: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_yaboot
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
-then
-	Echo_warning "skipping binary_yaboot, foreign architecture."
-	exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Checking local templates
-if [ -d config/templates/yaboot ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
-
-# Checking depends
-Check_package chroot/usr/lib/yaboot/yaboot yaboot
-
-# Installing depends
-Install_package
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		DESTDIR="binary/live"
-		;;
-
-	net|usb-hdd|hdd)
-		Echo_error "not supported, FIXME"
-	;;
-esac
-
-# Temporary check for broken yaboot
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	case "${LIVE_ARCHITECTURE}" in
-		powerpc)
-			DESTDIR="${DESTDIR}.ppc"
-			;;
-	esac
-fi
-
-# Creating directory
-if [ ! -d "${DESTDIR}" ]
-then
-	mkdir -p "${DESTDIR}"
-fi
-
-# Setting boot parameters
-if [ -n "${LIVE_ENCRYPTION}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
-fi
-
-if [ -n "${LIVE_USERNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
-fi
-
-if [ -n "${LIVE_HOSTNAME}" ]
-then
-	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
-fi
-
-LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
-
-# Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-else
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
-fi
-
-# FIXME
-if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz*
-	do
-		if [ -z "${LINUX}" ]
-		then
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-		then
-				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-			else
-				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-		fi
-		else
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-			else
-				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-			fi
-		fi
-	done
-fi
-
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-
-case "${LIVE_BINARY_IMAGES}" in
-	iso)
-		# Copying yaboot
-		mkdir -p binary/install
-		cp chroot/usr/lib/yaboot/yaboot binary/install
-		cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
-
-		# Configure yaboot templates
-		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf
-		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
-		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
-
-		# Working arround yaboot 8.3 limitation
-		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
-		then
-			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
-			do
-				NUMBER=$(($NUMBER + 1))
-
-				mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
-				mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
-				sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
-			done
-		else
-			mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
-			mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
-			sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
-		fi
-		;;
-esac
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_yaboot

Copied: releases/live-helper/1.0~a11-1/helpers/lh_binary_yaboot (from rev 1724, dists/trunk/live-helper/helpers/lh_binary_yaboot)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/lh_binary_yaboot	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/lh_binary_yaboot	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,232 @@
+#!/bin/sh
+
+# lh_binary_yaboot(1) - installs yaboot into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="installs yaboot into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
+then
+	exit 0
+fi
+
+Breakpoint "binary_yaboot: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_yaboot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
+then
+	Echo_warning "skipping binary_yaboot, foreign architecture."
+	exit 0
+fi
+
+# Check user templates
+if [ ! -d "${LIVE_TEMPLATES}" ]
+then
+	if [ -d ../"${LIVE_TEMPLATES}" ]
+	then
+		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
+	else
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+fi
+
+# Checking local templates
+if [ -d config/templates/yaboot ]
+then
+	LIVE_TEMPLATES="config/templates"
+fi
+
+# Checking depends
+Check_package chroot/usr/lib/yaboot/yaboot yaboot
+
+# Installing depends
+Install_package
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		DESTDIR="binary/live"
+		;;
+
+	net|usb-hdd|hdd)
+		Echo_error "not supported, FIXME"
+	;;
+esac
+
+# Temporary check for broken yaboot
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	case "${LIVE_ARCHITECTURE}" in
+		powerpc)
+			DESTDIR="${DESTDIR}.ppc"
+			;;
+	esac
+fi
+
+# Creating directory
+if [ ! -d "${DESTDIR}" ]
+then
+	mkdir -p "${DESTDIR}"
+fi
+
+# Setting boot parameters
+if [ -n "${LIVE_ENCRYPTION}" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
+fi
+
+if [ -n "${LIVE_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_USERNAME}" != "user" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LIVE_HOSTNAME}" ]
+then
+	case "${LIVE_INITRAMFS}" in
+		casper)
+			LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LIVE_HOSTNAME}" != "debian" ]
+			then
+				LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} username=${LIVE_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
+
+# Assembling kernel configuration
+if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+then
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+	LINUX="image=/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+else
+	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
+	LINUX="image=`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tinitrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'`\n\tlabel=LIVE\n\tappend=\"boot=${INITFS} LIVE_BOOTAPPEND\"\n\tinitrd-size=1048576\n\tread-only"
+fi
+
+# FIXME
+if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz*
+	do
+		if [ -z "${LINUX}" ]
+		then
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+		then
+				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+			else
+				LINUX="label LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+		fi
+		else
+			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
+			then
+				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+			else
+				LINUX="${LINUX}\nlabel LIVE-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n  kernel `basename ${KERNEL}`\n  append initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
+			fi
+		fi
+	done
+fi
+
+LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+
+case "${LIVE_BINARY_IMAGES}" in
+	iso)
+		# Copying yaboot
+		mkdir -p binary/install
+		cp chroot/usr/lib/yaboot/yaboot binary/install
+		cp -r "${LIVE_TEMPLATES}"/yaboot/* binary/yaboot
+
+		# Configure yaboot templates
+		sed -i -e "s#LIVE_LINUX_LIVE#${LINUX}#" -e "s#LIVE_LINUX_INSTALL#${LIVE_LINUX_INSTALL}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/install/yaboot.conf
+		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/yaboot/yaboot.conf
+		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" -e "s/LIVE_VERSION/${VERSION}/" binary/yaboot/boot.msg
+
+		# Working arround yaboot 8.3 limitation
+		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
+		then
+			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
+			do
+				NUMBER=$(($NUMBER + 1))
+
+				mv "${DESTDIR}"/vmlinuz-*-${FLAVOUR} "${DESTDIR}"/vmlinuz${NUMBER}
+				mv "${DESTDIR}"/initrd.img-*-${FLAVOUR} "${DESTDIR}"/initrd${NUMBER}.img
+				sed -i -e "s/LIVE.*-${FLAVOUR}/live${NUMBER}/g" -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+			done
+		else
+			mv "${DESTDIR}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/vmlinuz
+			mv "${DESTDIR}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR}"/initrd.img
+			sed -i -e "s/LIVE.*-${LIVE_LINUX_FLAVOURS}/live/g" -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" -e "s/LIVE/live/" binary/install/yaboot.conf
+		fi
+		;;
+esac
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_yaboot

Deleted: releases/live-helper/1.0~a11-1/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/helpers/make-live	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,394 +0,0 @@
-#!/bin/sh
-
-# make-live(1) - utility to build Debian Live systems
-# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
-
-set -e
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
-        . ${FUNCTION}
-done
-
-# Set static variables
-PROGRAM="`basename ${0}`"
-DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--apt-generic enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
-
-HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
-
-Local_arguments ()
-{
-	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
-
-	if [ "${?}" != "0" ]
-	then
-		echo "Terminating." >&2
-		exit 1
-	fi
-
-	if [ "${1}" = "config" ]
-	then
-		CONFIG="true"
-	fi
-
-	eval set -- "${ARGUMENTS}"
-
-	while true
-	do
-		case "${1}" in
-			# common
-			--mode)
-				LH_MODE="${2}"; shift 2
-				;;
-
-			--config)
-				LH_CONFIG="${2}"; shift 2
-				;;
-
-			--apt)
-				LH_APT="${2}"; shift 2
-				;;
-
-			--apt-ftpproxy)
-				LH_APT_FTPPROXY="${2}"; shift 2
-				;;
-
-			--apt-httpproxy)
-				LH_APT_HTTPPROXY="${2}"; shift 2
-				;;
-
-			--apt-generic)
-				LH_APT_GENERIC="${2}"; shift 2
-				;;
-
-			--apt-pdiffs)
-				LH_APT_PDIFFS="${2}"; shift 2
-				;;
-
-			--apt-recommends)
-				LH_APT_RECOMMENDS="${2}"; shift 2
-				;;
-
-			--apt-secure)
-				LH_APT_SECURE="${2}"; shift 2
-				;;
-
-			--bootstrap)
-				LH_BOOTSTRAP="${2}"; shift 2
-				;;
-
-			--cache)
-				LH_CACHE="${2}"; shift 2
-				;;
-
-			--debconf-frontend)
-				LH_DEBCONF_FRONTEND="${2}"; shift 2
-				;;
-
-			--debconf-priority)
-				LH_DEBCONF_PRIORITY="${2}"; shift 2
-				;;
-
-			--debconf-nowarnings)
-				LH_DEBCONF_NOWARNINGS="${2}"; shift 2
-				;;
-
-			--genisoimage)
-				LH_GENISOIMAGE="${2}"; shift 2
-				;;
-
-			--losetup)
-				LH_LOSETUP="${2}"; shift 2
-				;;
-
-			--tasksel)
-				LH_TASKSEL="${2}"; shift 2
-				;;
-
-			-r|--root)
-				LIVE_ROOT="${2}"; shift 2
-				;;
-
-			--root-command)
-				LIVE_ROOT_COMMAND="${2}"; shift 2
-				;;
-
-			# bootstrap
-			-a|--architecture)
-				LIVE_ARCHITECTURE="${2}"; shift 2
-				;;
-
-			-d|--distribution)
-				LIVE_DISTRIBUTION="${2}"; shift 2
-				export LIVE_DISTRIBUTION
-				;;
-
-			--distribution-config)
-				LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
-				;;
-
-			-f|--bootstrap-flavour)
-				LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
-				;;
-
-			-m|--mirror-bootstrap)
-				LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
-				;;
-
-			--mirror-bootstrap-security)
-				LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
-				;;
-
-			--mirror-binary)
-				LIVE_MIRROR_BINARY="${2}"; shift 2
-				;;
-
-			--mirror-binary-security)
-				LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
-				;;
-
-			--sections)
-				LIVE_SECTIONS="${2}"; shift 2
-				;;
-
-			# chroot
-			--interactive)
-				LIVE_INTERACTIVE="${2}"; shift 2
-				;;
-
-			-k|--linux-flavours)
-				LIVE_LINUX_FLAVOURS="${2}"; shift 2
-				;;
-
-			--linux-packages)
-				LIVE_LINUX_PACKAGES="${2}"; shift 2
-				;;
-
-			--keyring-packages)
-				LIVE_KEYRING_PACKAGS="${2}"; shift 2
-				;;
-
-			--hooks)
-				LIVE_HOOKS="${2}"; shift 2
-				;;
-
-			-l|--language)
-				LIVE_LANGUAGE="${2}"; shift 2
-				;;
-
-			--packages)
-				LIVE_PACKAGES="${2}"; shift 2
-				;;
-
-			-p|--packages-lists)
-				LIVE_PACKAGES_LISTS="${2}"; shift 2
-				;;
-
-			--tasks)
-				LIVE_TASKS="${2}"; shift 2
-				;;
-
-			--security)
-				LIVE_SECURITY="${2}"; shift 2
-				;;
-
-			--symlinks)
-				LIVE_SYMLINKS="${2}"; shift 2
-				;;
-
-			--sysvinit)
-				LIVE_SYSVINIT="${2}"; shift 2
-				;;
-
-			# image
-			--bootappend)
-				LIVE_BOOTAPPEND="${2}"; shift 2
-				;;
-
-			-e|--encryption)
-				LIVE_ENCRYPTION="${2}"; shift 2
-				;;
-
-			--username)
-				LIVE_USERNAME="${2}"; shift 2
-				;;
-
-			--hostname)
-				LIVE_HOSTNAME="${2}"; shift 2
-				;;
-
-			--chroot-filesystem)
-				LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
-				;;
-
-			--memtest)
-				LIVE_MEMTEST="${2}"; shift 2
-				;;
-
-			--iso-volume)
-				LIVE_ISO_VOLUME="${2}"; shift 2
-				;;
-
-			--net-server)
-				LIVE_NET_SERVER="${2}"; shift 2
-				;;
-
-			--net-path)
-				LIVE_NET_PATH="${2}"; shift 2
-				;;
-
-			--source)
-				LIVE_SOURCE="${2}"; shift 2
-				;;
-
-			--bootloader)
-				LIVE_BOOTLOADER="${2}"; shift 2
-				;;
-
-			--grub-splash)
-				LIVE_GRUB_SPLASH="${2}"; shift 2
-				;;
-
-			--syslinux-splash)
-				LIVE_SYSLINUX_SPLASH="${2}"; shift 2
-				;;
-
-			-b|--binary-images)
-				LIVE_BINARY_IMAGES="${2}"; shift 2
-				;;
-
-			-s|--source-images)
-				LIVE_SOURCE_IMAGES="${2}"; shift 2
-				;;
-
-			--includes)
-				LIVE_INCLUDES="${2}"; shift 2
-				;;
-
-			--templates)
-				LIVE_TEMPLATES="${2}"; shift 2
-				;;
-
-			# other
-			-h|--help)
-				Help; shift
-				;;
-
-			-u|--usage)
-				Usage; shift
-				;;
-
-			-v|--version)
-				Version; shift
-				;;
-
-			--breakpoints)
-				LH_BREAKPOINTS="enabled"; shift
-				;;
-
-			--debug)
-				LH_DEBUG="enabled"; shift
-				;;
-
-			--force)
-				LH_FORCE="enabled"; shift
-				;;
-
-			--quiet)
-				LH_QUIET="enabled"; shift
-				;;
-
-			--verbose)
-				LH_VERBOSE="enabled"; shift
-				;;
-
-			--)
-				shift; break
-				;;
-
-			*)
-				echo "Internal error."
-				exit 1
-				;;
-		esac
-	done
-}
-
-Main ()
-{
-	Local_arguments "${@}"
-
-	Set_defaults
-
-	if [ -z "${ROOT}" ]
-	then
-		ROOT="${LIVE_ROOT}"
-	fi
-
-	# Source existing configuration
-	Read_conffile "${ROOT}"/config/common
-	Read_conffile "${ROOT}"/config/bootstrap
-	Read_conffile "${ROOT}"/config/chroot
-	Read_conffile "${ROOT}"/config/image
-
-	Local_arguments "${@}"
-
-	# Configuring (this is really shit!)
-	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_APT_GENERIC="${LH_APT_GENERIC}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" lh_config newconfig
-
-	if [ "${LH_BREAKPOINTS}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --breakpoints"
-	fi
-
-	if [ "${LH_DEBUG}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --debug"
-	fi
-
-	if [ "${LH_FORCE}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --force"
-	fi
-
-	if [ "${LH_QUIET}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --quiet"
-	fi
-
-	if [ "${LH_VERBOSE}" = "enabled" ]
-	then
-		OPTIONS="${OPTIONS} --verbose"
-	fi
-
-	# Building
-	if [ -z "${CONFIG}" ]
-	then
-		cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
-	fi
-}
-
-trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
-      if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
-      0 1 2 3 9 15
-
-Main "${@}"

Copied: releases/live-helper/1.0~a11-1/helpers/make-live (from rev 1683, dists/trunk/live-helper/helpers/make-live)
===================================================================
--- releases/live-helper/1.0~a11-1/helpers/make-live	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/helpers/make-live	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,398 @@
+#!/bin/sh
+
+# make-live(1) - utility to build Debian Live systems
+# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# On Debian systems, the complete text of the GNU General Public License
+# can be found in /usr/share/common-licenses/GPL file.
+
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+        . ${FUNCTION}
+done
+
+# Set static variables
+PROGRAM="`basename ${0}`"
+DESCRIPTION="utility to build Debian Live systems"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+
+HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
+
+Local_arguments ()
+{
+	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+
+	if [ "${?}" != "0" ]
+	then
+		echo "Terminating." >&2
+		exit 1
+	fi
+
+	if [ "${1}" = "config" ]
+	then
+		CONFIG="true"
+	fi
+
+	eval set -- "${ARGUMENTS}"
+
+	while true
+	do
+		case "${1}" in
+			# common
+			--mode)
+				LH_MODE="${2}"; shift 2
+				;;
+
+			--config)
+				LH_CONFIG="${2}"; shift 2
+				;;
+
+			--apt)
+				LH_APT="${2}"; shift 2
+				;;
+
+			--apt-ftpproxy)
+				LH_APT_FTPPROXY="${2}"; shift 2
+				;;
+
+			--apt-httpproxy)
+				LH_APT_HTTPPROXY="${2}"; shift 2
+				;;
+
+			--binary-indices)
+				LH_BINARY_INDICES="${2}"; shift 2
+				;;
+
+			--apt-pdiffs)
+				LH_APT_PDIFFS="${2}"; shift 2
+				;;
+
+			--apt-recommends)
+				LH_APT_RECOMMENDS="${2}"; shift 2
+				;;
+
+			--apt-secure)
+				LH_APT_SECURE="${2}"; shift 2
+				;;
+
+			--bootstrap)
+				LH_BOOTSTRAP="${2}"; shift 2
+				;;
+
+			--cache)
+				LH_CACHE="${2}"; shift 2
+				;;
+
+			--debconf-frontend)
+				LH_DEBCONF_FRONTEND="${2}"; shift 2
+				;;
+
+			--debconf-priority)
+				LH_DEBCONF_PRIORITY="${2}"; shift 2
+				;;
+
+			--debconf-nowarnings)
+				LH_DEBCONF_NOWARNINGS="${2}"; shift 2
+				;;
+
+			--genisoimage)
+				LH_GENISOIMAGE="${2}"; shift 2
+				;;
+
+			--losetup)
+				LH_LOSETUP="${2}"; shift 2
+				;;
+
+			--tasksel)
+				LH_TASKSEL="${2}"; shift 2
+				;;
+
+			-r|--root)
+				LIVE_ROOT="${2}"; shift 2
+				;;
+
+			--root-command)
+				LIVE_ROOT_COMMAND="${2}"; shift 2
+				;;
+
+			# bootstrap
+			-a|--architecture)
+				LIVE_ARCHITECTURE="${2}"; shift 2
+				;;
+
+			-d|--distribution)
+				LIVE_DISTRIBUTION="${2}"; shift 2
+				export LIVE_DISTRIBUTION
+				;;
+
+			--distribution-config)
+				LIVE_DISTRIBUTION_CONFIG="${2}"; shift 2
+				;;
+
+			-f|--bootstrap-flavour)
+				LIVE_BOOTSTRAP_FLAVOUR="${2}"; shift 2
+				;;
+
+			-m|--mirror-bootstrap)
+				LIVE_MIRROR_BOOTSTRAP="${2}"; shift 2
+				;;
+
+			--mirror-bootstrap-security)
+				LIVE_MIRROR_BOOTSTRAP_SECURITY="${2}"; shift 2
+				;;
+
+			--mirror-binary)
+				LIVE_MIRROR_BINARY="${2}"; shift 2
+				;;
+
+			--mirror-binary-security)
+				LIVE_MIRROR_BINARY_SECURITY="${2}"; shift 2
+				;;
+
+			--sections)
+				LIVE_SECTIONS="${2}"; shift 2
+				;;
+
+			# chroot
+			--interactive)
+				LIVE_INTERACTIVE="${2}"; shift 2
+				;;
+
+			--initramfs)
+				LH_INITRAMFS="${2}"; shift 2
+				;;
+
+			-k|--linux-flavours)
+				LIVE_LINUX_FLAVOURS="${2}"; shift 2
+				;;
+
+			--linux-packages)
+				LIVE_LINUX_PACKAGES="${2}"; shift 2
+				;;
+
+			--keyring-packages)
+				LIVE_KEYRING_PACKAGS="${2}"; shift 2
+				;;
+
+			--hooks)
+				LIVE_HOOKS="${2}"; shift 2
+				;;
+
+			-l|--language)
+				LIVE_LANGUAGE="${2}"; shift 2
+				;;
+
+			--packages)
+				LIVE_PACKAGES="${2}"; shift 2
+				;;
+
+			-p|--packages-lists)
+				LIVE_PACKAGES_LISTS="${2}"; shift 2
+				;;
+
+			--tasks)
+				LIVE_TASKS="${2}"; shift 2
+				;;
+
+			--security)
+				LIVE_SECURITY="${2}"; shift 2
+				;;
+
+			--symlinks)
+				LIVE_SYMLINKS="${2}"; shift 2
+				;;
+
+			--sysvinit)
+				LIVE_SYSVINIT="${2}"; shift 2
+				;;
+
+			# image
+			--bootappend)
+				LIVE_BOOTAPPEND="${2}"; shift 2
+				;;
+
+			-e|--encryption)
+				LIVE_ENCRYPTION="${2}"; shift 2
+				;;
+
+			--username)
+				LIVE_USERNAME="${2}"; shift 2
+				;;
+
+			--hostname)
+				LIVE_HOSTNAME="${2}"; shift 2
+				;;
+
+			--chroot-filesystem)
+				LIVE_CHROOT_FILESYSTEM="${2}"; shift 2
+				;;
+
+			--memtest)
+				LIVE_MEMTEST="${2}"; shift 2
+				;;
+
+			--iso-volume)
+				LIVE_ISO_VOLUME="${2}"; shift 2
+				;;
+
+			--net-server)
+				LIVE_NET_SERVER="${2}"; shift 2
+				;;
+
+			--net-path)
+				LIVE_NET_PATH="${2}"; shift 2
+				;;
+
+			--source)
+				LIVE_SOURCE="${2}"; shift 2
+				;;
+
+			--bootloader)
+				LIVE_BOOTLOADER="${2}"; shift 2
+				;;
+
+			--grub-splash)
+				LIVE_GRUB_SPLASH="${2}"; shift 2
+				;;
+
+			--syslinux-splash)
+				LIVE_SYSLINUX_SPLASH="${2}"; shift 2
+				;;
+
+			-b|--binary-images)
+				LIVE_BINARY_IMAGES="${2}"; shift 2
+				;;
+
+			-s|--source-images)
+				LIVE_SOURCE_IMAGES="${2}"; shift 2
+				;;
+
+			--includes)
+				LIVE_INCLUDES="${2}"; shift 2
+				;;
+
+			--templates)
+				LIVE_TEMPLATES="${2}"; shift 2
+				;;
+
+			# other
+			-h|--help)
+				Help; shift
+				;;
+
+			-u|--usage)
+				Usage; shift
+				;;
+
+			-v|--version)
+				Version; shift
+				;;
+
+			--breakpoints)
+				LH_BREAKPOINTS="enabled"; shift
+				;;
+
+			--debug)
+				LH_DEBUG="enabled"; shift
+				;;
+
+			--force)
+				LH_FORCE="enabled"; shift
+				;;
+
+			--quiet)
+				LH_QUIET="enabled"; shift
+				;;
+
+			--verbose)
+				LH_VERBOSE="enabled"; shift
+				;;
+
+			--)
+				shift; break
+				;;
+
+			*)
+				echo "Internal error."
+				exit 1
+				;;
+		esac
+	done
+}
+
+Main ()
+{
+	Local_arguments "${@}"
+
+	Set_defaults
+
+	if [ -z "${ROOT}" ]
+	then
+		ROOT="${LIVE_ROOT}"
+	fi
+
+	# Source existing configuration
+	Read_conffile "${ROOT}"/config/common
+	Read_conffile "${ROOT}"/config/bootstrap
+	Read_conffile "${ROOT}"/config/chroot
+	Read_conffile "${ROOT}"/config/image
+
+	Local_arguments "${@}"
+
+	# Configuring (this is really shit!)
+	LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig
+
+	if [ "${LH_BREAKPOINTS}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --breakpoints"
+	fi
+
+	if [ "${LH_DEBUG}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --debug"
+	fi
+
+	if [ "${LH_FORCE}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --force"
+	fi
+
+	if [ "${LH_QUIET}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --quiet"
+	fi
+
+	if [ "${LH_VERBOSE}" = "enabled" ]
+	then
+		OPTIONS="${OPTIONS} --verbose"
+	fi
+
+	# Building
+	if [ -z "${CONFIG}" ]
+	then
+		cd "${LIVE_ROOT}" && lh_build "${OPTIONS}"
+	fi
+}
+
+trap "if [ -f ${ROOT}/chroot/proc/version ]; then umount ${ROOT}/chroot/proc; fi; \
+      if [ -f ${ROOT}/chroot/sys/kernel ]; then umount ${ROOT}/chroot/sys; fi; exit" \
+      0 1 2 3 9 15
+
+Main "${@}"

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_binary.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_binary.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,61 +0,0 @@
-.TH LH_BINARY 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
-
-.SH SYNTAX
-.B lh_binary [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binary\-Stufe zu vervollst\[:a]ndigen.
-
-.SH BINARY HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-kopiert chroot in chroot.
-.IP "\fIlh_binary_debian\-installer\fR(1)" 4
-kopiert debian\-installer in das Binary\-Image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-verschl\[:u]sselt das Root\-Dateisystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-kopiert grub in das Binary\-Image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-erstellt den Festplatten Binary\-Tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-kopiert Dateien in das Binary\-Image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-erstell das CD/DVD Binary\-Image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-kopiert linux\-image in das Binary\-Image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-kopiert lokale Dateien in das Binary\-Image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-erstellt die Paketliste des Root\-Dateisystemes.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-erstellt md5sum.txt im Binary\-Image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-kopiert ein memtest in das Binary\-Image.
-.IP "\fIlh_binary_net\fR(1)" 4
-erstellt den Netboot Binary\-Tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-erstell das Root\-Dateisystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-kopiert syslinux in das Binary\-Image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-erstellt das USB-hdd Binary\-Image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-kopiert yaboot in das Binary\-Image.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_binary.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_binary.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_binary.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_binary.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,61 @@
+.TH LH_BINARY 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
+
+.SH SYNTAX
+.B lh_binary [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_binary ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die binary\-Stufe zu vervollst\[:a]ndigen.
+
+.SH BINARY HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+kopiert chroot in chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+kopiert debian\-installer in das Binary\-Image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+verschl\[:u]sselt das Root\-Dateisystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+kopiert grub in das Binary\-Image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+erstellt den Festplatten Binary\-Tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+kopiert Dateien in das Binary\-Image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+erstell das CD/DVD Binary\-Image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+kopiert linux\-image in das Binary\-Image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+kopiert lokale Dateien in das Binary\-Image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+erstellt die Paketliste des Root\-Dateisystemes.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+erstellt md5sum.txt im Binary\-Image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+kopiert ein memtest in das Binary\-Image.
+.IP "\fIlh_binary_net\fR(1)" 4
+erstellt den Netboot Binary\-Tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+erstell das Root\-Dateisystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+kopiert syslinux in das Binary\-Image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+erstellt das USB-hdd Binary\-Image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+kopiert yaboot in das Binary\-Image.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_binary.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_binary.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,61 +0,0 @@
-.TH LH_BINARY 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_binary \- meta\-helper for lh_binary_*
-
-.SH SYNOPSIS
-.B lh_binary [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_binary is a meta\-helper. It calls all necessary helpers to complete the binary stage.
-
-.SH BINARY HELPERS
-Here is the complete list of available binary helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-copies chroot into chroot.
-.IP "\fIlh_binary_debian-installer\fR(1)" 4
-copies debian-installer into the binary image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-encrypts the root filesystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-copies grub into the binary image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-creates the harddisk binary tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-copies files into the binary image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-creates the CD/DVD binary image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-copies linux\-image into the binary image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-creates the package list of the root filesystem.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-copies a memtest into the binary image.
-.IP "\fIlh_binary_net\fR(1)" 4
-creates the netboot binary tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-creates the root filesystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-copies syslinux into the binary image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-creates the USB-hdd binary image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-copies yaboot into the binary image.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_binary.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_binary.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_binary.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_binary.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,61 @@
+.TH LH_BINARY 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_binary \- meta\-helper for lh_binary_*
+
+.SH SYNOPSIS
+.B lh_binary [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_binary is a meta\-helper. It calls all necessary helpers to complete the binary stage.
+
+.SH BINARY HELPERS
+Here is the complete list of available binary helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+copies chroot into chroot.
+.IP "\fIlh_binary_debian-installer\fR(1)" 4
+copies debian-installer into the binary image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+encrypts the root filesystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+copies grub into the binary image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+creates the harddisk binary tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+copies files into the binary image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+creates the CD/DVD binary image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+copies linux\-image into the binary image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+creates the package list of the root filesystem.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+creates md5sum.txt in the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
+.IP "\fIlh_binary_net\fR(1)" 4
+creates the netboot binary tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+creates the root filesystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+copies syslinux into the binary image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+creates the USB-hdd binary image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+copies yaboot into the binary image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,31 +0,0 @@
-.TH LH_BOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
-
-.SH SYNTAX
-.B lh_bootstrap [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_bootstrap ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die bootstrap-Stufe zu vervollst\[:a]ndigen.
-
-.SH BOOTSTRAP HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren bootstrap\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-erstellt ein Debian-System mit cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-erstellt ein Debian-System mit debootstrap.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,31 @@
+.TH LH_BOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
+
+.SH SYNTAX
+.B lh_bootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die bootstrap-Stufe zu vervollst\[:a]ndigen.
+
+.SH BOOTSTRAP HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren bootstrap\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+erstellt ein Debian-System mit cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+erstellt ein Debian-System mit debootstrap.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,31 +0,0 @@
-.TH LH_BOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap \- meta\-helper for lh_bootstrap_*
-
-.SH SYNOPSIS
-.B lh_bootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap is a meta\-helper. It calls all necessary helpers to complete the bootstrap stage.
-
-.SH BOOTSTRAP HELPERS
-Here is the complete list of available bootstrap helper commands. See their man pages for additional documentation.
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-bootstraps system with cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-bootstraps system with debootstrap.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,31 @@
+.TH LH_BOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap \- meta\-helper for lh_bootstrap_*
+
+.SH SYNOPSIS
+.B lh_bootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap is a meta\-helper. It calls all necessary helpers to complete the bootstrap stage.
+
+.SH BOOTSTRAP HELPERS
+Here is the complete list of available bootstrap helper commands. See their man pages for additional documentation.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+bootstraps system with cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+bootstraps system with debootstrap.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
-
-.SH SYNTAX
-.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_bootstrap_cdebootstrap benutzt \fIcdebootstrap\fR(1) um ein Debian Grundsystem zu erstellen.
-
-.SH KONFIGURATIONSDATEI
-lh_bootstrap_cdebootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
-
-.SH UMGEBUNG
-lh_bootstrap_cdebootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-w\[:a]hlt die Distribution aus (Standard: etch)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
-
-.SH SIEHE AUCH
-\fIcdebootstrap\fR(1)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
+
+.SH SYNTAX
+.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap_cdebootstrap benutzt \fIcdebootstrap\fR(1) um ein Debian Grundsystem zu erstellen.
+
+.SH KONFIGURATIONSDATEI
+lh_bootstrap_cdebootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
+
+.SH UMGEBUNG
+lh_bootstrap_cdebootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+kontrolliert das zu benutzende bootstrap-Programm (Standard: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+w\[:a]hlt die Distribution aus (Standard: etch)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
+
+.SH SIEHE AUCH
+\fIcdebootstrap\fR(1)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
-
-.SH SYNOPSIS
-.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap_cdebootstrap uses \fIcdebootstrap\fR(1) to create a Debian base system from scratch.
-
-.SH CONFIGURATION FILE
-lh_bootstrap_cdebootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
-
-.SH ENVIRONMENT
-lh_bootstrap_cdebootstrap respects the following environment variables if available, otherwise uses default values for it.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-control the bootstrap program to be used (Default: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-control if downloaded packages should be cached (Default: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-set the mirror to use (Default: http://ftp.debian.org/debian/)
-
-.SH SEE ALSO
-\fIcdebootstrap\fR(1)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_cdebootstrap.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_cdebootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
+
+.SH SYNOPSIS
+.B lh_bootstrap_cdebootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap_cdebootstrap uses \fIcdebootstrap\fR(1) to create a Debian base system from scratch.
+
+.SH CONFIGURATION FILE
+lh_bootstrap_cdebootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
+
+.SH ENVIRONMENT
+lh_bootstrap_cdebootstrap respects the following environment variables if available, otherwise uses default values for it.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+control the bootstrap program to be used (Default: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+control if downloaded packages should be cached (Default: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+select the chroot architecture (Default: autodetected)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+set distribution config directory (Default: empty)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+select the flavour to use (Default: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+select the distribution to use (Default: sid)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+set the mirror to use (Default: http://ftp.debian.org/debian/)
+
+.SH SEE ALSO
+\fIcdebootstrap\fR(1)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
-
-.SH SYNTAX
-.B lh_bootstrap_debootstrap [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_bootstrap_debootstrap benutzt \fIdebootstrap\fR(8) um ein Debian Grundsystem zu erstellen.
-
-.SH KONFIGURATIONSDATEI
-lh_bootstrap_debootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
-
-.SH UMGEBUNG
-lh_bootstrap_debootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-w\[:a]hlt die Distribution aus (Standard: etch)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
-
-.SH SIEHE AUCH
-\fIdebootstrap\fR(8)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
+
+.SH SYNTAX
+.B lh_bootstrap_debootstrap [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_bootstrap_debootstrap benutzt \fIdebootstrap\fR(8) um ein Debian Grundsystem zu erstellen.
+
+.SH KONFIGURATIONSDATEI
+lh_bootstrap_debootstrap liest config/common und config/bootstrap wenn verf\[:u]gbar. Siehe UMGEBUNG zur Benutzung der korrekten Umgebungsvariablen.
+
+.SH UMGEBUNG
+lh_bootstrap_debootstrap respektiert die folgenden Umgebungsvariablen, sofern verf\[:u]gbar, andernfalls werden Standardwerte benutzt.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+kontrolliert das zu benutzende bootstrap-Programm (Standard: debootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+kontrolliert ob heruntergeladene Pakete zwischengespeichert werden sollen (Standard: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+w\[:a]hlt die chroot-Architektur aus (Standard: automatisch)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+bestimmt das Distributions-Konfiguration Verzeichnis (Standard: leer)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+w\[:a]hlt die Bootstrap-Variante aus (Standard: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+w\[:a]hlt die Distribution aus (Standard: etch)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+bestimmt den Spiegelserver (Standard: http://ftp.debian.org/debian/)
+
+.SH SIEHE AUCH
+\fIdebootstrap\fR(8)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,47 +0,0 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
-
-.SH SYNOPSIS
-.B lh_bootstrap_debootstrap [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_bootstrap_debootstrap uses \fIdebootstrap\fR(8) to create a Debian base system from scratch.
-
-.SH CONFIGURATION FILE
-lh_bootstrap_debootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
-
-.SH ENVIRONMENT
-lh_bootstrap_debootstrap respects the following environment variables if available, otherwise uses default values for it.
-.IP "\fI$LH_BOOTSTRAP\fR" 4
-control the bootstrap program to be used (Default: cdebootstrap)
-.IP "\fI$LH_CACHE\fR" 4
-control if downloaded packages should be cached (Default: enabled)
-.PP
-.IP "\fI$LIVE_ARCHITECTURE\fR" 4
-select the chroot architecture (Default: autodetected)
-.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
-set distribution config directory (Default: empty)
-.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
-select the flavour to use (Default: standard)
-.IP "\fI$LIVE_DISTRIBUTION\fR" 4
-select the distribution to use (Default: sid)
-.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
-set the mirror to use (Default: http://ftp.debian.org/debian/)
-
-.SH SEE ALSO
-\fIdebootstrap\fR(8)
-.PP
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_bootstrap_debootstrap.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_bootstrap_debootstrap.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,47 @@
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
+
+.SH SYNOPSIS
+.B lh_bootstrap_debootstrap [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_bootstrap_debootstrap uses \fIdebootstrap\fR(8) to create a Debian base system from scratch.
+
+.SH CONFIGURATION FILE
+lh_bootstrap_debootstrap reads config/common and config/bootstrap if available. See ENVIRONMENT for the correct environment variables to use.
+
+.SH ENVIRONMENT
+lh_bootstrap_debootstrap respects the following environment variables if available, otherwise uses default values for it.
+.IP "\fI$LH_BOOTSTRAP\fR" 4
+control the bootstrap program to be used (Default: cdebootstrap)
+.IP "\fI$LH_CACHE\fR" 4
+control if downloaded packages should be cached (Default: enabled)
+.PP
+.IP "\fI$LIVE_ARCHITECTURE\fR" 4
+select the chroot architecture (Default: autodetected)
+.IP "\fI$LIVE_BOOTSTRAP_CONFIG\fR" 4
+set distribution config directory (Default: empty)
+.IP "\fI$LIVE_BOOTSTRAP_FLAVOUR\fR" 4
+select the flavour to use (Default: standard)
+.IP "\fI$LIVE_DISTRIBUTION\fR" 4
+select the distribution to use (Default: sid)
+.IP "\fI$LIVE_MIRROR_BUILD\fR" 4
+set the mirror to use (Default: http://ftp.debian.org/debian/)
+
+.SH SEE ALSO
+\fIdebootstrap\fR(8)
+.PP
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_build.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_build.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_build.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,35 +0,0 @@
-.TH LH_BUILD 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_build \- erstellen eines Live-Systemes
-
-.SH SYNOPSIS
-.B lh_build [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein Live-System erfolgreich zu erstellen.
-
-.SH META\-HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_binary\fR(1)" 4
-erstellt ein Binary\-Image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-erstellt das Grundsystem.
-.IP "\fIlh_chroot\fR(1)" 4
-individualisiert chroot.
-.IP "\fIlh_source\fR(1)" 4
-erstellt ein Source-Image.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_build.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_build.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_build.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_build.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,35 @@
+.TH LH_BUILD 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_build \- erstellen eines Live-Systemes
+
+.SH SYNOPSIS
+.B lh_build [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_build ist ein Helper-Script. Es ruft alle n\[:o]tigen Meta\-Helper auf um ein Live-System erfolgreich zu erstellen.
+
+.SH META\-HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren Meta\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary\fR(1)" 4
+erstellt ein Binary\-Image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+erstellt das Grundsystem.
+.IP "\fIlh_chroot\fR(1)" 4
+individualisiert chroot.
+.IP "\fIlh_source\fR(1)" 4
+erstellt ein Source-Image.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_build.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_build.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_build.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,35 +0,0 @@
-.TH LH_BUILD 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_build \- building a live system
-
-.SH SYNOPSIS
-.B lh_build [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_build is a helper script. It calls all required meta\-helper scripts to successfully build a live system.
-
-.SH META\-HELPERS
-Here is the complete list of available meta\-helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary\fR(1)" 4
-builds a binary image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-bootstraps a system.
-.IP "\fIlh_chroot\fR(1)" 4
-customizes a chroot.
-.IP "\fIlh_source\fR(1)" 4
-builds a source image.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_build.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_build.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_build.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_build.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,35 @@
+.TH LH_BUILD 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_build \- building a live system
+
+.SH SYNOPSIS
+.B lh_build [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_build is a helper script. It calls all required meta\-helper scripts to successfully build a live system.
+
+.SH META\-HELPERS
+Here is the complete list of available meta\-helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary\fR(1)" 4
+builds a binary image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+bootstraps a system.
+.IP "\fIlh_chroot\fR(1)" 4
+customizes a chroot.
+.IP "\fIlh_source\fR(1)" 4
+builds a source image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_chroot.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_chroot.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_chroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,71 +0,0 @@
-.TH LH_CHROOT 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
-
-.SH SYNOPSIS
-.B lh_chroot [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_chroot ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die chroot\-Stufe zu vervollst\[:a]ndigen.
-
-.SH CHROOT HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren chroot\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-verwaltet /etc/debian_chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-f\[:u]hrt Hacks im chroot aus.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-f\[:u]hrt Hooks im chroot aus.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-verwaltet /etc/hosts.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-macht Bauprozess interaktiv.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-verwaltet /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-f\[:u]hrt lokale Hooks im chroot aus.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-kopiert lokale Dateien in den chroot.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installiert Lokalisierungspakete im chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installiert lokale Pakete im chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installiert lokale Paketlisten im chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installiert Pakete im chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installiert Paketlisten im chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-bindet /proc ein.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-verwaltet /etc/resolv.conf.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-konvertiert symbolische Links.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-bindet /sys ein.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-konfiguriert sysvinit.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-verwaltet /usr/sbin/policy\-rc.d.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installiert Paket-Tasks im chroot.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_chroot.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_chroot.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_chroot.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_chroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,71 @@
+.TH LH_CHROOT 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
+
+.SH SYNOPSIS
+.B lh_chroot [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_chroot ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die chroot\-Stufe zu vervollst\[:a]ndigen.
+
+.SH CHROOT HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren chroot\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+verwaltet /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+f\[:u]hrt Hacks im chroot aus.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+f\[:u]hrt Hooks im chroot aus.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+verwaltet /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+macht Bauprozess interaktiv.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+verwaltet /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+f\[:u]hrt lokale Hooks im chroot aus.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+kopiert lokale Dateien in den chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installiert Lokalisierungspakete im chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installiert lokale Pakete im chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installiert lokale Paketlisten im chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installiert Pakete im chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installiert Paketlisten im chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+bindet /proc ein.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+verwaltet /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+konvertiert symbolische Links.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+bindet /sys ein.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+konfiguriert sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+verwaltet /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installiert Paket-Tasks im chroot.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_chroot.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_chroot.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_chroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,71 +0,0 @@
-.TH LH_CHROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_chroot \- meta\-helper for lh_chroot_*
-
-.SH SYNOPSIS
-.B lh_chroot [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_chroot is a meta\-helper. It calls all necessary helpers to complete the chroot stage.
-
-.SH CHROOT HELPERS
-Here is the complete list of available chroot helper commands. See their man pages for additional documentation.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-manages /etc/apt/apt.conf.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-manages /etc/debian_chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-executes hacks in chroot.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-executes hooks in chroot.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-manages /etc/hosts.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-makes build interactive.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-manages /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-executes local hooks in chroot.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-copies local files into chroot.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installs localization packages into chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installs local packages into chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installs local packages lists into chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installs packages into chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installs packages lists into chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-mounts /proc.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-manages /etc/resolv.conf.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-manages /etc/apt/apt.conf.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-convers symlinks.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-mounts /sys.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-configures sysvinit.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-manages /usr/sbin/policy\-rc.d.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installs tasks into chroot.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_chroot.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_chroot.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_chroot.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_chroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,71 @@
+.TH LH_CHROOT 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_chroot \- meta\-helper for lh_chroot_*
+
+.SH SYNOPSIS
+.B lh_chroot [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_chroot is a meta\-helper. It calls all necessary helpers to complete the chroot stage.
+
+.SH CHROOT HELPERS
+Here is the complete list of available chroot helper commands. See their man pages for additional documentation.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+manages /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+manages /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+executes hacks in chroot.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+executes hooks in chroot.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+manages /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+makes build interactive.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+manages /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+executes local hooks in chroot.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+copies local files into chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installs localization packages into chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installs local packages into chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installs local packages lists into chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installs packages into chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installs packages lists into chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+mounts /proc.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+manages /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+manages /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+convers symlinks.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+mounts /sys.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+configures sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+manages /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installs tasks into chroot.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_clean.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_clean.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_clean.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,44 +0,0 @@
-.TH LH_CLEAN 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_clean \- r\[:a]umt das Build-Verzeichnis auf
-
-.SH SYNOPSIS
-.B lh_clean [\fIlive\-helper\ Optionen\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
-
-.SH BESCHREIBUNG
-lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist.
-
-.SH OPTIONEN
-Die folgenden Optionen werden von lh_clean unterst\[:u]tzt.
-.IP "\fBall\fR" 4
-entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation.
-.IP "\fBcache\fR" 4
-entfernt alle cache-Verzeichnisse.
-.IP "\fBchroot\fR" 4
-entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt.
-.IP "\fBbinary\fR" 4
-entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe.
-.IP "\fBlock\fR" 4
-entfernt alle lock-Dateien.
-.IP "\fBpurge\fR" 4
-entfernt alles (inlusive cache) ausser config.
-.IP "\fBstage\fR" 4
-entfernt alle Stage-Dateien.
-.IP "\fBsource\fR" 4
-entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_clean.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_clean.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_clean.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_clean.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,44 @@
+.TH LH_CLEAN 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_clean \- r\[:a]umt das Build-Verzeichnis auf
+
+.SH SYNOPSIS
+.B lh_clean [\fIlive\-helper\ Optionen\fR\|]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+
+.SH BESCHREIBUNG
+lh_clean ist ein live\-helper\-Program das daf\[:u]r verwantwortlich ist, nach dem Bauen eines Live-Systemes das Build-Verzeichnis aufzur\[:a]umen. Es entfernt das Build-Verzeichnis und auch alle anderen Dateien, inklusive den Stage-Dateien die von einem live\-helper-Programm hinterlassen worden ist.
+
+.SH OPTIONEN
+Die folgenden Optionen werden von lh_clean unterst\[:u]tzt.
+.IP "\fBall\fR" 4
+entfernt chroot, binary, lock, stage und source. Das ist die Standardoperation.
+.IP "\fBcache\fR" 4
+entfernt alle cache-Verzeichnisse.
+.IP "\fBchroot\fR" 4
+entbindet und entfernt das chroot-Verzeichnis. Wenn ein Cache von bootstrap verf\[:u]gbar ist, wird chroot auf diese Stufe zur\[:u]ck gesetzt.
+.IP "\fBbinary\fR" 4
+entfernt alle Caches, Verzeichnisse und Stage-Dateien der Binary-Stufe.
+.IP "\fBlock\fR" 4
+entfernt alle lock-Dateien.
+.IP "\fBpurge\fR" 4
+entfernt alles (inlusive cache) ausser config.
+.IP "\fBstage\fR" 4
+entfernt alle Stage-Dateien.
+.IP "\fBsource\fR" 4
+entfernt alle Caches, Verzeichnisse und Stage-Dateien der Source-Stufe.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_clean.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_clean.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_clean.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,44 +0,0 @@
-.TH LH_CLEAN 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_clean \- clean up system build directories
-
-.SH SYNOPSIS
-.B lh_clean [\fIlive\-helper\ options\fR\|]
-.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
-
-.SH DESCRIPTION
-lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
-
-.SH OPTIONS
-The following command line options are supported by lh_clean.
-.IP "\fBall\fR" 4
-removes chroot, binary, lock, stage, and source. This is the default operation.
-.IP "\fBcache\fR" 4
-removes all cache directories.
-.IP "\fBchroot\fR" 4
-unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
-.IP "\fBbinary\fR" 4
-removes all binary related caches, directories, and stages files.
-.IP "\fBlock\fR" 4
-removes all lock files.
-.IP "\fBpurge\fR" 4
-removes everything (including cache) but config.
-.IP "\fBstage\fR" 4
-removes all stage files.
-.IP "\fBsource\fR" 4
-removes all source related caches, directories, and stage files.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_clean.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_clean.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_clean.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_clean.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,44 @@
+.TH LH_CLEAN 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_clean \- clean up system build directories
+
+.SH SYNOPSIS
+.B lh_clean [\fIlive\-helper\ options\fR\|]
+.B lh_clean [\fRall\fB|\fRcache\fB|\fRchroot\fB|\fRbinary\fB|\fRlock\fB|\fRpurge\fB|\fRstage\fB|\fRsource\fB]
+
+.SH DESCRIPTION
+lh_clean is a live\-helper program that is responsible for cleaning up after a system is built. It removes the system build directories, and removes some other files including stage files, and any detritus left behind by other live\-helper commands.
+
+.SH OPTIONS
+The following command line options are supported by lh_clean.
+.IP "\fBall\fR" 4
+removes chroot, binary, lock, stage, and source. This is the default operation.
+.IP "\fBcache\fR" 4
+removes all cache directories.
+.IP "\fBchroot\fR" 4
+unmounts and removes the chroot directory. If bootstrap cache is available, the system is reset to bootstrap stage.
+.IP "\fBbinary\fR" 4
+removes all binary related caches, directories, and stages files.
+.IP "\fBlock\fR" 4
+removes all lock files.
+.IP "\fBpurge\fR" 4
+removes everything (including cache) but config.
+.IP "\fBstage\fR" 4
+removes all stage files.
+.IP "\fBsource\fR" 4
+removes all source related caches, directories, and stage files.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_source.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_source.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,43 +0,0 @@
-.TH LH_SOURCE 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_source \- Meta\-Helper f\[:u]r lh_source_*
-
-.SH SYNTAX
-.B lh_source [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die source\-Stufe zu vervollst\[:a]ndigen.
-
-.SH SOURCE HELPER
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_source_debian-live\fR(1)" 4
-kopiert debian\-live Konfiguration in source.
-.IP "\fIlh_source_debian\fR(1)" 4
-l\[:a]dt Paketquellen herunter.
-.IP "\fIlh_source_generic\fR(1)" 4
-erstellt den generischen Source-Tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-erstellt den Harddisk Source-Tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-erstellt  CD/DVD Source-Image.
-.IP "\fIlh_source_md5sum\fR(1)" 4
-erstellt md5sum.txt im Source-Image.
-.IP "\fIlh_source_net\fR(1)" 4
-erstellt Netboot Source-Tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-erstellt USB-hdd Source-Tarball.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_source.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_source.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_source.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_source.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,43 @@
+.TH LH_SOURCE 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_source \- Meta\-Helper f\[:u]r lh_source_*
+
+.SH SYNTAX
+.B lh_source [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_source ist ein Meta\-Helper. Es ruft alle n\[:o]tigen Helper auf um die source\-Stufe zu vervollst\[:a]ndigen.
+
+.SH SOURCE HELPER
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_source_debian-live\fR(1)" 4
+kopiert debian\-live Konfiguration in source.
+.IP "\fIlh_source_debian\fR(1)" 4
+l\[:a]dt Paketquellen herunter.
+.IP "\fIlh_source_generic\fR(1)" 4
+erstellt den generischen Source-Tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+erstellt den Harddisk Source-Tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+erstellt  CD/DVD Source-Image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+erstellt md5sum.txt im Source-Image.
+.IP "\fIlh_source_net\fR(1)" 4
+erstellt Netboot Source-Tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+erstellt USB-hdd Source-Tarball.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_source.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_source.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,43 +0,0 @@
-.TH LH_SOURCE 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_source \- meta\-helper for lh_source_*
-
-.SH SYNOPSIS
-.B lh_source [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_source is a meta\-helper. It calls all necessary helpers to complete the source stage.
-
-.SH SOURCE HELPERS
-Here is the complete list of available source helper commands. See their man pages for additional documentation.
-.IP "\fIlh_source_debian-live\fR(1)" 4
-copies debian\-live config into source.
-.IP "\fIlh_source_debian\fR(1)" 4
-downloads sources.
-.IP "\fIlh_source_generic\fR(1)" 4
-creates the generic source tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-creates the harddisk source tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-creates the CD/DVD source image.
-.IP "\fIlh_source_md5sum\fR(1)" 4
-creates md5sum.txt in the source image.
-.IP "\fIlh_source_net\fR(1)" 4
-creates the netboot source tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-creates the USB-hdd source image.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_source.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_source.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_source.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_source.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,43 @@
+.TH LH_SOURCE 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_source \- meta\-helper for lh_source_*
+
+.SH SYNOPSIS
+.B lh_source [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_source is a meta\-helper. It calls all necessary helpers to complete the source stage.
+
+.SH SOURCE HELPERS
+Here is the complete list of available source helper commands. See their man pages for additional documentation.
+.IP "\fIlh_source_debian-live\fR(1)" 4
+copies debian\-live config into source.
+.IP "\fIlh_source_debian\fR(1)" 4
+downloads sources.
+.IP "\fIlh_source_generic\fR(1)" 4
+creates the generic source tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+creates the harddisk source tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+creates the CD/DVD source image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+creates md5sum.txt in the source image.
+.IP "\fIlh_source_net\fR(1)" 4
+creates the netboot source tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+creates the USB-hdd source image.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_testroot.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_testroot.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_testroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,24 +0,0 @@
-.TH LH_TESTROOT 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_testroot \- stellt sicher dass das System als root gebaut wird
-
-.SH SYNTAX
-.B lh_testroot [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit einem Fehler. Debian Live-Images m\[:u]ssen momentan als root gebaut werden, \fIfakeroot\fR(1) oder \fIsudo\fR(8) funktioniert nicht.
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_testroot.de.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_testroot.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_testroot.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_testroot.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,24 @@
+.TH LH_TESTROOT 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_testroot \- stellt sicher dass das System als root gebaut wird
+
+.SH SYNTAX
+.B lh_testroot [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+lh_testroot kontrolliert ob root-Rechte vorhanden sind. Wenn nicht, endet es mit einem Fehler. Debian Live-Images m\[:u]ssen momentan als root gebaut werden, \fIfakeroot\fR(1) oder \fIsudo\fR(8) funktioniert nicht.
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/lh_testroot.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_testroot.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/lh_testroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,24 +0,0 @@
-.TH LH_TESTROOT 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-lh_testroot \- ensure that a system is built as root
-
-.SH SYNOPSIS
-.B lh_testroot [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-lh_testroot simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root, \fIfakeroot\fR(1) or \fIsudo\fR(8) does not work.
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/lh_testroot.en.1 (from rev 1679, dists/trunk/live-helper/manpages/lh_testroot.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/lh_testroot.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/lh_testroot.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,24 @@
+.TH LH_TESTROOT 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+lh_testroot \- ensure that a system is built as root
+
+.SH SYNOPSIS
+.B lh_testroot [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+lh_testroot simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root, \fIfakeroot\fR(1) or \fIsudo\fR(8) does not work.
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/live-helper.de.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.de.7	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/live-helper.de.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,178 +0,0 @@
-.TH LIVE\-HELPER 7 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-live\-helper \- Debian Live Helper-Programme
-
-.SH SYNTAX
-.B lh_* [\fIlive\-helper\ Optionen\fR\|]
-
-.SH BESCHREIBUNG
-Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen.
-.PP
-Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \fImake\-live\fR(1).
-
-.\" .SH CONFIGURATION FILE
-.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
-
-.\" .SH ENVIRONMENT
-.\" Every live\-helper command respects the following environment variables if available.
-.\" .IP "\fI$LH_DEBUG\fR" 4
-.\" enables debug (Default: false)
-.\" .IP "\fI$LH_QUIET\fR" 4
-.\" be quiet (Default: false)
-.\" .IP "\fI$LH_VERBOSE\fR" 4
-.\" be verbose (Default: false)
-
-.SH LIVE\-HELPER KOMMANDOS
-Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_binary\fR(1)" 4
-Meta\-Helper f\[:u]r lh_binary_*
-.IP "\fIlh_binary_chroot\fR(1)" 4
-kopiert chroot in chroot.
-.IP "\fIlh_binary_debian\-installer\fR(1)" 4
-kopiert debian-\installer in das Binary\-Image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-verschl\[:u]sselt das Root\-Dateisystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-kopiert grub in das Binary\-Image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-erstellt den Festplatten Binary\-Tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-kopiert Dateien in das Binary\-Image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-erstell das CD/DVD Binary\-Image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-kopiert linux\-image in das Binary\-Image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-kopiert lokale Dateien in das Binary\-Image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-erstellt die Paketliste des Root\-Dateisystemes.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-erstellt md5sum.txt im Binary\-Image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-kopiert ein memtest in das Binary\-Image.
-.IP "\fIlh_binary_net\fR(1)" 4
-erstellt den Netboot Binary\-Tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-erstell das Root\-Dateisystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-kopiert syslinux in das Binary\-Image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-erstellt das USB-hdd Binary\-Image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-kopiert yaboot in das Binary\-Image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-Meta\-Helper f\[:u]r lh_bootstrap_*
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-erstellt ein Debian-System mit cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-erstellt ein Debian-System mit debootstrap.
-.IP "\fIlh_build\fR(1)" 4
-erstellen eines Live-Systemes
-.IP "\fIlh_chroot\fR(1)" 4
-Meta\-Helper f\[:u]r lh_chroot_*
-.IP "\fIlh_chroot_apt\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-verwaltet /etc/debian_chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-f\[:u]hrt Hacks im chroot aus.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-f\[:u]hrt Hooks im chroot aus.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-verwaltet /etc/hosts.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-macht Bauprozess interaktiv.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-verwaltet /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-f\[:u]hrt lokale Hooks im chroot aus.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-kopiert lokale Dateien in den chroot.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installiert Lokalisierungspakete im chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installiert lokale Pakete im chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installiert lokale Paketlisten im chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installiert Pakete im chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installiert Paketlisten im chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-bindet /proc ein.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-verwaltet /etc/resolv.conf.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-verwaltet /etc/apt/apt.conf.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-konvertiert symbolische Links.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-bindet /sys ein.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-konfiguriert sysvinit.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-verwaltet /usr/sbin/policy\-rc.d.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installiert Paket-Tasks im chroot.
-.IP "\fIlh_clean\fR(1)" 4
-r\[:a]umt das Build-Verzeichnis auf
-.IP "\fIlh_config\fR(1)" 4
-erstellt eine Beispielkonfiguration
-.IP "\fIlh_losetup\fR(1)" 4
-verwaltet Loop-Ger\[:a]te
-.IP "\fIlh_source\fR(1)" 4
-Meta\-Helper f\[:u]r lh_source_*
-.IP "\fIlh_source_debian-live\fR(1)" 4
-kopiert debian\-live Konfiguration in source.
-.IP "\fIlh_source_debian\fR(1)" 4
-l\[:a]dt Paketquellen herunter.
-.IP "\fIlh_source_generic\fR(1)" 4
-erstellt den generischen Source-Tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-erstellt den Harddisk Source-Tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-erstellt  CD/DVD Source-Image.
-.IP "\fIlh_source_md5sum\fR(1)" 4
-erstellt md5sum.txt im Source-Image.
-.IP "\fIlh_source_net\fR(1)" 4
-erstellt Netboot Source-Tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-erstellt USB-hdd Source-Tarball.
-.IP "\fIlh_testroot\fR(1)" 4
-stellt sicher dass das System als root gebaut wird.
-
-.SH LIVE\-HELPER OPTIONEN
-Die folgenden Kommandozeilenoptionen werden von allen live\-helper-Programmen unterst\[:u]tzt.
-.IP "\fB\-\-breakpoints\fR" 4
-Ausf\[:u]hrung mit Breakpoints.
-.IP "\fB\-\-conffile\fR" 4
-benutzen von eigenen Konfigurationsdateien.
-.IP "\fB\-\-debug\fR" 4
-zeigt Debug Informationen.
-.IP "\fB\-\-force\fR" 4
-erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert.
-.IP "\fB\-h, \-\-help\fR" 4
-zeigt Hilfe Informationen und stoppt.
-.IP "\fB\-\-logfile\fR" 4
-benutzen von eigener Log-Datei.
-.IP "\fB\-\-quiet\fR" 4
-still
-.IP "\fB\-u, \-\-usage\fR" 4
-zeigt Anwedungshinweise und stoppt.
-.IP "\fB\-\-verbose\fR" 4
-gespr\[:a]chig
-.IP "\fB\-v, \-\-version\fR" 4
-gibt Versionsinformationen aus und stoppt.
-
-.SH SIEHE AUCH
-\fIlive\-initramfs\fR(7)
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/live-helper.de.7 (from rev 1679, dists/trunk/live-helper/manpages/live-helper.de.7)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/live-helper.de.7	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/live-helper.de.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,178 @@
+.TH LIVE\-HELPER 7 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+live\-helper \- Debian Live Helper-Programme
+
+.SH SYNTAX
+.B lh_* [\fIlive\-helper\ Optionen\fR\|]
+
+.SH BESCHREIBUNG
+Live\-helper ist eine Sammlung von programmen die dazu benutzt werden k\[:o]nnen, Debian Live Systeme zu erstellen. Die Philosophie hinter live\-helper ist eine kleine Sammlung von kleinen, kurzen und einfach zu verstehenden Werkzeugen zur verf\[:u]gung zu stellen, welche auch in anderen Programmen benutzt werden k\[:o]nnen um automatisch Live-Systeme erstellen.
+.PP
+Ein typisches Programm das live\-helper benutzt wird verschiedene live\-helper Kommandos nacheinander aufrufen. Live\-helper Kommandos haben alle einen "lh_"-Pr\[:a]fix im Namen. Beispiele eines solchen Programmes das live\-helper benutzt ist \fImake\-live\fR(1).
+
+.\" .SH CONFIGURATION FILE
+.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
+
+.\" .SH ENVIRONMENT
+.\" Every live\-helper command respects the following environment variables if available.
+.\" .IP "\fI$LH_DEBUG\fR" 4
+.\" enables debug (Default: false)
+.\" .IP "\fI$LH_QUIET\fR" 4
+.\" be quiet (Default: false)
+.\" .IP "\fI$LH_VERBOSE\fR" 4
+.\" be verbose (Default: false)
+
+.SH LIVE\-HELPER KOMMANDOS
+Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren live\-helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
+.IP "\fIlh_binary\fR(1)" 4
+Meta\-Helper f\[:u]r lh_binary_*
+.IP "\fIlh_binary_chroot\fR(1)" 4
+kopiert chroot in chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+kopiert debian-\installer in das Binary\-Image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+verschl\[:u]sselt das Root\-Dateisystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+kopiert grub in das Binary\-Image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+erstellt den Festplatten Binary\-Tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+kopiert Dateien in das Binary\-Image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+erstell das CD/DVD Binary\-Image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+kopiert linux\-image in das Binary\-Image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+kopiert lokale Dateien in das Binary\-Image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+erstellt die Paketliste des Root\-Dateisystemes.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+erstellt md5sum.txt im Binary\-Image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+kopiert ein memtest in das Binary\-Image.
+.IP "\fIlh_binary_net\fR(1)" 4
+erstellt den Netboot Binary\-Tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+erstell das Root\-Dateisystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+kopiert syslinux in das Binary\-Image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+erstellt das USB-hdd Binary\-Image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+kopiert yaboot in das Binary\-Image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+Meta\-Helper f\[:u]r lh_bootstrap_*
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+erstellt ein Debian-System mit cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+erstellt ein Debian-System mit debootstrap.
+.IP "\fIlh_build\fR(1)" 4
+erstellen eines Live-Systemes
+.IP "\fIlh_chroot\fR(1)" 4
+Meta\-Helper f\[:u]r lh_chroot_*
+.IP "\fIlh_chroot_apt\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+verwaltet /etc/debian_chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+f\[:u]hrt Hacks im chroot aus.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+f\[:u]hrt Hooks im chroot aus.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+verwaltet /etc/hosts.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+macht Bauprozess interaktiv.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+verwaltet /etc/kernel\-img.conf.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+f\[:u]hrt lokale Hooks im chroot aus.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+kopiert lokale Dateien in den chroot.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installiert Lokalisierungspakete im chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installiert lokale Pakete im chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installiert lokale Paketlisten im chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installiert Pakete im chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installiert Paketlisten im chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+bindet /proc ein.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+verwaltet /etc/resolv.conf.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+verwaltet /etc/apt/apt.conf.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+konvertiert symbolische Links.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+bindet /sys ein.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+konfiguriert sysvinit.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+verwaltet /usr/sbin/policy\-rc.d.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installiert Paket-Tasks im chroot.
+.IP "\fIlh_clean\fR(1)" 4
+r\[:a]umt das Build-Verzeichnis auf
+.IP "\fIlh_config\fR(1)" 4
+erstellt eine Beispielkonfiguration
+.IP "\fIlh_losetup\fR(1)" 4
+verwaltet Loop-Ger\[:a]te
+.IP "\fIlh_source\fR(1)" 4
+Meta\-Helper f\[:u]r lh_source_*
+.IP "\fIlh_source_debian-live\fR(1)" 4
+kopiert debian\-live Konfiguration in source.
+.IP "\fIlh_source_debian\fR(1)" 4
+l\[:a]dt Paketquellen herunter.
+.IP "\fIlh_source_generic\fR(1)" 4
+erstellt den generischen Source-Tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+erstellt den Harddisk Source-Tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+erstellt  CD/DVD Source-Image.
+.IP "\fIlh_source_md5sum\fR(1)" 4
+erstellt md5sum.txt im Source-Image.
+.IP "\fIlh_source_net\fR(1)" 4
+erstellt Netboot Source-Tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+erstellt USB-hdd Source-Tarball.
+.IP "\fIlh_testroot\fR(1)" 4
+stellt sicher dass das System als root gebaut wird.
+
+.SH LIVE\-HELPER OPTIONEN
+Die folgenden Kommandozeilenoptionen werden von allen live\-helper-Programmen unterst\[:u]tzt.
+.IP "\fB\-\-breakpoints\fR" 4
+Ausf\[:u]hrung mit Breakpoints.
+.IP "\fB\-\-conffile\fR" 4
+benutzen von eigenen Konfigurationsdateien.
+.IP "\fB\-\-debug\fR" 4
+zeigt Debug Informationen.
+.IP "\fB\-\-force\fR" 4
+erzwingt Helper Ausf\[:u]hrung, auch wenn Stage-Datei existiert.
+.IP "\fB\-h, \-\-help\fR" 4
+zeigt Hilfe Informationen und stoppt.
+.IP "\fB\-\-logfile\fR" 4
+benutzen von eigener Log-Datei.
+.IP "\fB\-\-quiet\fR" 4
+still
+.IP "\fB\-u, \-\-usage\fR" 4
+zeigt Anwedungshinweise und stoppt.
+.IP "\fB\-\-verbose\fR" 4
+gespr\[:a]chig
+.IP "\fB\-v, \-\-version\fR" 4
+gibt Versionsinformationen aus und stoppt.
+
+.SH SIEHE AUCH
+\fIlive\-initramfs\fR(7)
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/live-helper.en.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.en.7	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/live-helper.en.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,176 +0,0 @@
-.TH LIVE\-HELPER 7 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-live\-helper \- Debian Live helper programs
-
-.SH SYNOPSIS
-.B lh_* [\fIlive\-helper\ options\fR\|]
-
-.SH DESCRIPTION
-Live\-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live\-helper is to provide a collection of small, simple, and easily understood tools that can be used in your own program to automate building of a Live system.
-.PP
-A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1).
-
-.\" .SH CONFIGURATION FILE
-.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
-
-.\" .SH ENVIRONMENT
-.\" Every live\-helper command respects the following environment variables if available.
-.\" .IP "\fI$LH_DEBUG\fR" 4
-.\" enables debug (Default: false)
-.\" .IP "\fI$LH_QUIET\fR" 4
-.\" be quiet (Default: false)
-.\" .IP "\fI$LH_VERBOSE\fR" 4
-.\" be verbose (Default: false)
-
-.SH LIVE\-HELPER COMMANDS
-Here is the complete list of available live\-helper commands. See their man pages for additional documentation.
-.IP "\fIlh_binary\fR(1)" 4
-meta\-helper for lh_binary_*.
-.IP "\fIlh_binary_chroot\fR(1)" 4
-copies chroot into chroot.
-.IP "\fIlh_binary_debian\-installer\fR(1)" 4
-copies debian-installer into the binary image.
-.IP "\fIlh_binary_encryption\fR(1)" 4
-encrypts the root filesystem.
-.IP "\fIlh_binary_grub\fR(1)" 4
-copies grub into the binary image.
-.IP "\fIlh_binary_hdd\fR(1)" 4
-creates the harddisk binary tarball.
-.IP "\fIlh_binary_includes\fR(1)" 4
-copies files into the binary image.
-.IP "\fIlh_binary_iso\fR(1)" 4
-creates the CD/DVD binary image.
-.IP "\fIlh_binary_linux-image\fR(1)" 4
-copies linux\-image into the binary image.
-.IP "\fIlh_binary_local-includes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_binary_manifest\fR(1)" 4
-creates the package list of the root filesystem.
-.IP "\fIlh_binary_md5sum\fR(1)" 4
-creates md5sum.txt in the binary image.
-.IP "\fIlh_binary_memtest\fR(1)" 4
-copies a memtest into the binary image.
-.IP "\fIlh_binary_net\fR(1)" 4
-creates the netboot binary tarball.
-.IP "\fIlh_binary_rootfs\fR(1)" 4
-creates the root filesystem.
-.IP "\fIlh_binary_syslinux\fR(1)" 4
-copies syslinux into the binary image.
-.IP "\fIlh_binary_usb-hdd\fR(1)" 4
-creates the USB-hdd binary image.
-.IP "\fIlh_binary_yaboot\fR(1)" 4
-copies yaboot into the binary image.
-.IP "\fIlh_bootstrap\fR(1)" 4
-meta\-helper for lh_bootstrap_*.
-.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
-bootstraps system with cdebootstrap.
-.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
-bootstraps system with debootstrap.
-.IP "\fIlh_build\fR(1)" 4
-meta\-helper for lh_bootstrap, lh_chroot, lh_binary and lh_source.
-.IP "\fIlh_chroot\fR(1)" 4
-meta\-helper for lh_chroot_*.
-.IP "\fIlh_chroot_apt\fR(1)" 4
-configures /etc/apt/apt.conf in chroot.
-.IP "\fIlh_chroot_debianchroot\fR(1)" 4
-configures /etc/debian_chroot in chroot.
-.IP "\fIlh_chroot_hacks\fR(1)" 4
-does evil (temporary) hacks in the chroot.
-.IP "\fIlh_chroot_hooks\fR(1)" 4
-executes additional commands in the chroot.
-.IP "\fIlh_chroot_hosts\fR(1)" 4
-configures /etc/hosts in the chroot.
-.IP "\fIlh_chroot_interactive\fR(1)" 4
-makes build interactive.
-.IP "\fIlh_chroot_linux-image\fR(1)" 4
-configures /etc/kernel\-img.conf in the chroot.
-.IP "\fIlh_chroot_local-hooks\fR(1)" 4
-executes additional local commands in the chroot.
-.IP "\fIlh_chroot_local-includes\fR(1)" 4
-copies local files into the binary image.
-.IP "\fIlh_chroot_localization\fR(1)" 4
-installs localization packages in the chroot.
-.IP "\fIlh_chroot_local-packages\fR(1)" 4
-installs local packages in the chroot.
-.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
-installs local packages lists in the chroot.
-.IP "\fIlh_chroot_packages\fR(1)" 4
-installs packages in the chroot.
-.IP "\fIlh_chroot_packageslists\fR(1)" 4
-installs packages lists in the chroot.
-.IP "\fIlh_chroot_proc\fR(1)" 4
-mounts /proc in the chroot.
-.IP "\fIlh_chroot_resolv\fR(1)" 4
-configures /etc/resolf.conf in the chroot.
-.IP "\fIlh_chroot_sources\fR(1)" 4
-configures /etc/apt/sources.list in the chroot.
-.IP "\fIlh_chroot_symlinks\fR(1)" 4
-converts symlinks in the chroot.
-.IP "\fIlh_chroot_sysfs\fR(1)" 4
-mounts /sys in the chroot.
-.IP "\fIlh_chroot_sysvinit\fR(1)" 4
-minimizes daemon startup in the chroot.
-.IP "\fIlh_chroot_sysvrc\fR(1)" 4
-installs policy\-id hack in the chroot.
-.IP "\fIlh_chroot_tasks\fR(1)" 4
-installs packages tasks in the chroot.
-.IP "\fIlh_clean\fR(1)" 4
-cleans up build directory.
-.IP "\fIlh_config\fR(1)" 4
-creates sample configuration.
-.IP "\fIlh_losetup\fR(1)" 4
-manages loop device handling
-.IP "\fIlh_source\fR(1)" 4
-meta\-helper for lh_source_*.
-.IP "\fIlh_source_debian-live\fR(1)" 4
-copies config into source directory.
-.IP "\fIlh_source_debian\fR(1)" 4
-downloads source packages.
-.IP "\fIlh_source_generic\fR(1)" 4
-creates generic source tarball.
-.IP "\fIlh_source_hdd\fR(1)" 4
-creates harddisk source tarball.
-.IP "\fIlh_source_iso\fR(1)" 4
-creates CD/DVD source image.
-.IP "\fIlh_source_net\fR(1)" 4
-creates netboot source tarball.
-.IP "\fIlh_source_usb-hdd\fR(1)" 4
-creates USB-hdd source image.
-.IP "\fIlh_testroot\fR(1)" 4
-checks for root privileges.
-
-.SH LIVE\-HELPER OPTIONS
-The following command line options are supported by all live\-helper programs.
-.IP "\fB\-\-breakpoints\fR" 4
-run with breakpoints
-.IP "\fB\-\-conffile\fR" 4
-use custom configuration file
-.IP "\fB\-\-debug\fR" 4
-show debug information
-.IP "\fB\-\-force\fR" 4
-force helper execution, even if stage file exists.
-.IP "\fB\-h, \-\-help\fR" 4
-display help and exit
-.IP "\fB\-\-logfile\fR" 4
-use custom log file
-.IP "\fB\-\-quiet\fR" 4
-be quiet
-.IP "\fB\-u, \-\-usage\fR" 4
-show usage and exit
-.IP "\fB\-\-verbose\fR" 4
-be verbose
-.IP "\fB\-v, \-\-version\fR" 4
-output version information and exit
-
-.SH SEE ALSO
-\fIlive\-initramfs\fR(7)
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/live-helper.en.7 (from rev 1679, dists/trunk/live-helper/manpages/live-helper.en.7)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/live-helper.en.7	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/live-helper.en.7	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,176 @@
+.TH LIVE\-HELPER 7 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+live\-helper \- Debian Live helper programs
+
+.SH SYNOPSIS
+.B lh_* [\fIlive\-helper\ options\fR\|]
+
+.SH DESCRIPTION
+Live\-helper is a collection of programs that can be used to build Debian Live system images. The philosophy behind live\-helper is to provide a collection of small, simple, and easily understood tools that can be used in your own program to automate building of a Live system.
+.PP
+A typical program that uses live\-helper will call several live\-helper commands in sequence. Live\-helper commands are all named with a "lh_" prefix. Examples of such a program that uses live\-helper is \fImake\-live\fR(1).
+
+.\" .SH CONFIGURATION FILE
+.\" live\-helper reads debian\-live/config/live\-helper if available. See ENVIRONMENT for the correct environment variables to use.
+
+.\" .SH ENVIRONMENT
+.\" Every live\-helper command respects the following environment variables if available.
+.\" .IP "\fI$LH_DEBUG\fR" 4
+.\" enables debug (Default: false)
+.\" .IP "\fI$LH_QUIET\fR" 4
+.\" be quiet (Default: false)
+.\" .IP "\fI$LH_VERBOSE\fR" 4
+.\" be verbose (Default: false)
+
+.SH LIVE\-HELPER COMMANDS
+Here is the complete list of available live\-helper commands. See their man pages for additional documentation.
+.IP "\fIlh_binary\fR(1)" 4
+meta\-helper for lh_binary_*.
+.IP "\fIlh_binary_chroot\fR(1)" 4
+copies chroot into chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+copies debian-installer into the binary image.
+.IP "\fIlh_binary_encryption\fR(1)" 4
+encrypts the root filesystem.
+.IP "\fIlh_binary_grub\fR(1)" 4
+copies grub into the binary image.
+.IP "\fIlh_binary_hdd\fR(1)" 4
+creates the harddisk binary tarball.
+.IP "\fIlh_binary_includes\fR(1)" 4
+copies files into the binary image.
+.IP "\fIlh_binary_iso\fR(1)" 4
+creates the CD/DVD binary image.
+.IP "\fIlh_binary_linux-image\fR(1)" 4
+copies linux\-image into the binary image.
+.IP "\fIlh_binary_local-includes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_binary_manifest\fR(1)" 4
+creates the package list of the root filesystem.
+.IP "\fIlh_binary_md5sum\fR(1)" 4
+creates md5sum.txt in the binary image.
+.IP "\fIlh_binary_memtest\fR(1)" 4
+copies a memtest into the binary image.
+.IP "\fIlh_binary_net\fR(1)" 4
+creates the netboot binary tarball.
+.IP "\fIlh_binary_rootfs\fR(1)" 4
+creates the root filesystem.
+.IP "\fIlh_binary_syslinux\fR(1)" 4
+copies syslinux into the binary image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+creates the USB-hdd binary image.
+.IP "\fIlh_binary_yaboot\fR(1)" 4
+copies yaboot into the binary image.
+.IP "\fIlh_bootstrap\fR(1)" 4
+meta\-helper for lh_bootstrap_*.
+.IP "\fIlh_bootstrap_cdebootstrap\fR(1)" 4
+bootstraps system with cdebootstrap.
+.IP "\fIlh_bootstrap_debootstrap\fR(1)" 4
+bootstraps system with debootstrap.
+.IP "\fIlh_build\fR(1)" 4
+meta\-helper for lh_bootstrap, lh_chroot, lh_binary and lh_source.
+.IP "\fIlh_chroot\fR(1)" 4
+meta\-helper for lh_chroot_*.
+.IP "\fIlh_chroot_apt\fR(1)" 4
+configures /etc/apt/apt.conf in chroot.
+.IP "\fIlh_chroot_debianchroot\fR(1)" 4
+configures /etc/debian_chroot in chroot.
+.IP "\fIlh_chroot_hacks\fR(1)" 4
+does evil (temporary) hacks in the chroot.
+.IP "\fIlh_chroot_hooks\fR(1)" 4
+executes additional commands in the chroot.
+.IP "\fIlh_chroot_hosts\fR(1)" 4
+configures /etc/hosts in the chroot.
+.IP "\fIlh_chroot_interactive\fR(1)" 4
+makes build interactive.
+.IP "\fIlh_chroot_linux-image\fR(1)" 4
+configures /etc/kernel\-img.conf in the chroot.
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
+executes additional local commands in the chroot.
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
+copies local files into the binary image.
+.IP "\fIlh_chroot_localization\fR(1)" 4
+installs localization packages in the chroot.
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
+installs local packages in the chroot.
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
+installs local packages lists in the chroot.
+.IP "\fIlh_chroot_packages\fR(1)" 4
+installs packages in the chroot.
+.IP "\fIlh_chroot_packageslists\fR(1)" 4
+installs packages lists in the chroot.
+.IP "\fIlh_chroot_proc\fR(1)" 4
+mounts /proc in the chroot.
+.IP "\fIlh_chroot_resolv\fR(1)" 4
+configures /etc/resolf.conf in the chroot.
+.IP "\fIlh_chroot_sources\fR(1)" 4
+configures /etc/apt/sources.list in the chroot.
+.IP "\fIlh_chroot_symlinks\fR(1)" 4
+converts symlinks in the chroot.
+.IP "\fIlh_chroot_sysfs\fR(1)" 4
+mounts /sys in the chroot.
+.IP "\fIlh_chroot_sysvinit\fR(1)" 4
+minimizes daemon startup in the chroot.
+.IP "\fIlh_chroot_sysvrc\fR(1)" 4
+installs policy\-id hack in the chroot.
+.IP "\fIlh_chroot_tasks\fR(1)" 4
+installs packages tasks in the chroot.
+.IP "\fIlh_clean\fR(1)" 4
+cleans up build directory.
+.IP "\fIlh_config\fR(1)" 4
+creates sample configuration.
+.IP "\fIlh_losetup\fR(1)" 4
+manages loop device handling
+.IP "\fIlh_source\fR(1)" 4
+meta\-helper for lh_source_*.
+.IP "\fIlh_source_debian-live\fR(1)" 4
+copies config into source directory.
+.IP "\fIlh_source_debian\fR(1)" 4
+downloads source packages.
+.IP "\fIlh_source_generic\fR(1)" 4
+creates generic source tarball.
+.IP "\fIlh_source_hdd\fR(1)" 4
+creates harddisk source tarball.
+.IP "\fIlh_source_iso\fR(1)" 4
+creates CD/DVD source image.
+.IP "\fIlh_source_net\fR(1)" 4
+creates netboot source tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+creates USB-hdd source image.
+.IP "\fIlh_testroot\fR(1)" 4
+checks for root privileges.
+
+.SH LIVE\-HELPER OPTIONS
+The following command line options are supported by all live\-helper programs.
+.IP "\fB\-\-breakpoints\fR" 4
+run with breakpoints
+.IP "\fB\-\-conffile\fR" 4
+use custom configuration file
+.IP "\fB\-\-debug\fR" 4
+show debug information
+.IP "\fB\-\-force\fR" 4
+force helper execution, even if stage file exists.
+.IP "\fB\-h, \-\-help\fR" 4
+display help and exit
+.IP "\fB\-\-logfile\fR" 4
+use custom log file
+.IP "\fB\-\-quiet\fR" 4
+be quiet
+.IP "\fB\-u, \-\-usage\fR" 4
+show usage and exit
+.IP "\fB\-\-verbose\fR" 4
+be verbose
+.IP "\fB\-v, \-\-version\fR" 4
+output version information and exit
+
+.SH SEE ALSO
+\fIlive\-initramfs\fR(7)
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Deleted: releases/live-helper/1.0~a11-1/manpages/make-live.de.1
===================================================================
--- dists/trunk/live-helper/manpages/make-live.de.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/make-live.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,88 +0,0 @@
-.TH MAKE\-LIVE 1 "14.05.2007" "1.0~a10" "live\-helper"
-
-.SH NAME
-make\-live \- erstellt ein Debian Live-System
-
-.SH SYNOPSIS
-.B make\-live
-[config]
-[\-\-mode \fIMODE\fR]
-[\-\-config \fICONFIG\fR]
-[\-\-apt \fIapt\fR|\fIaptitude\fR]
-[\-\-apt\-ftpproxy \fIURL\fR]
-[\-\-apt\-httpproxy \fIURL\fR]
-[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
-[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
-[\-\-cache \fIenabled\fR|\fIdisabled\fR]
-[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
-[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
-[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
-[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
-[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
-[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
-[\-r|\-\-root \fIDIRECTORY\fR]
-[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
-[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
-[\-\-distribution\-config \fIDIRECTORY\fR]
-[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
-[\-m|\-\-mirror\-build \fIURL\fR]
-[\-\-mirror\-build\-security \fIURL\fR]
-[\-\-mirror\-image \fIURL\fR]
-[\-\-mirror\-image\-security \fIURL\fR]
-[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
-[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
-[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
-[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
-[\-l|\-\-language \fILANGUAGE\fR]
-[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
-[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
-[\-\-security \fIenabled\fR|\fIdisabled\fR]
-[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
-[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
-[\-e|\-\-encryption \fIALGORITHM\fR]
-[\-\-username \fINAME\fR]
-[\-\-hostname \fINAME\fR]
-[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
-[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
-[\-\-iso\-volume \fISTRING\fR]
-[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
-[\-\-server\-path \fIDIRECTORY\fR]
-[\-\-source \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
-[\-\-grub\-splash \fIFILE\fR]
-[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-\-includes \fIPATH\fR]
-[\-\-templates \fIPATH\fR]
-[\-\-breakpoints]
-[\-\-debug]
-[\-\-force]
-[\-\-quiet]
-[\-\-verbose]
-
-.SH BESCHREIBUNG
-make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen.
-
-.SH OPTIONEN
-
-.SH SIEHE AUCH
-\fIlive\-helper\fR(7)
-.PP
-Dieses Programm ist Teil von live\-helper.
-
-.SH FEHLER
-Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
-
-.SH HOMEPAGE
-Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
-
-.SH AUTOR
-live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Copied: releases/live-helper/1.0~a11-1/manpages/make-live.de.1 (from rev 1679, dists/trunk/live-helper/manpages/make-live.de.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/make-live.de.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/make-live.de.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,88 @@
+.TH MAKE\-LIVE 1 "21.05.2007" "1.0~a11" "live\-helper"
+
+.SH NAME
+make\-live \- erstellt ein Debian Live-System
+
+.SH SYNOPSIS
+.B make\-live
+[config]
+[\-\-mode \fIMODE\fR]
+[\-\-config \fICONFIG\fR]
+[\-\-apt \fIapt\fR|\fIaptitude\fR]
+[\-\-apt\-ftpproxy \fIURL\fR]
+[\-\-apt\-httpproxy \fIURL\fR]
+[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
+[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
+[\-\-cache \fIenabled\fR|\fIdisabled\fR]
+[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
+[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
+[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
+[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
+[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
+[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
+[\-r|\-\-root \fIDIRECTORY\fR]
+[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
+[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
+[\-\-distribution\-config \fIDIRECTORY\fR]
+[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
+[\-m|\-\-mirror\-build \fIURL\fR]
+[\-\-mirror\-build\-security \fIURL\fR]
+[\-\-mirror\-image \fIURL\fR]
+[\-\-mirror\-image\-security \fIURL\fR]
+[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
+[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
+[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
+[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
+[\-l|\-\-language \fILANGUAGE\fR]
+[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
+[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
+[\-\-security \fIenabled\fR|\fIdisabled\fR]
+[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
+[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
+[\-e|\-\-encryption \fIALGORITHM\fR]
+[\-\-username \fINAME\fR]
+[\-\-hostname \fINAME\fR]
+[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
+[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
+[\-\-iso\-volume \fISTRING\fR]
+[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
+[\-\-server\-path \fIDIRECTORY\fR]
+[\-\-source \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
+[\-\-grub\-splash \fIFILE\fR]
+[\-\-syslinux\-splash \fIFILE\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-\-includes \fIPATH\fR]
+[\-\-templates \fIPATH\fR]
+[\-\-breakpoints]
+[\-\-debug]
+[\-\-force]
+[\-\-quiet]
+[\-\-verbose]
+
+.SH BESCHREIBUNG
+make\-live is ein Script das alle n\[:o]tigen live\-helper Programme aufruft um ein Live-System zu erstellen.
+
+.SH OPTIONEN
+
+.SH SIEHE AUCH
+\fIlive\-helper\fR(7)
+.PP
+Dieses Programm ist Teil von live\-helper.
+
+.SH FEHLER
+Fehler k\[:o]nnen gegen live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR> gemeldet werden.
+
+.SH HOMEPAGE
+Mehr Informationen \[:u]ber das Debian Live\-Projekt k\[:o]nnen auf <\fIhttp://debian\-live.alioth.debian.org/\fR> und <\fIhttp://wiki.debian.org/DebianLive/\fR> gefunden werden.
+
+.SH AUTOR
+live\-helper wurde von Daniel Baumann <\fIdaniel at debian.org\fR> f\[:u]r das Debian\-Projekt geschrieben.

Deleted: releases/live-helper/1.0~a11-1/manpages/make-live.en.1
===================================================================
--- dists/trunk/live-helper/manpages/make-live.en.1	2007-05-24 09:27:39 UTC (rev 1670)
+++ releases/live-helper/1.0~a11-1/manpages/make-live.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -1,88 +0,0 @@
-.TH MAKE\-LIVE 1 "2007\-05\-14" "1.0~a10" "live\-helper"
-
-.SH NAME
-make\-live \- build a Debian Live system
-
-.SH SYNOPSIS
-.B make\-live
-[config]
-[\-\-mode \fIMODE\fR]
-[\-\-config \fICONFIG\fR]
-[\-\-apt \fIapt\fR|\fIaptitude\fR]
-[\-\-apt\-ftpproxy \fIURL\fR]
-[\-\-apt\-httpproxy \fIURL\fR]
-[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
-[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
-[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
-[\-\-cache \fIenabled\fR|\fIdisabled\fR]
-[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
-[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
-[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
-[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
-[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
-[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
-[\-r|\-\-root \fIDIRECTORY\fR]
-[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
-[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
-[\-\-distribution\-config \fIDIRECTORY\fR]
-[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
-[\-m|\-\-mirror\-build \fIURL\fR]
-[\-\-mirror\-build\-security \fIURL\fR]
-[\-\-mirror\-image \fIURL\fR]
-[\-\-mirror\-image\-security \fIURL\fR]
-[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
-[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
-[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
-[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
-[\-l|\-\-language \fILANGUAGE\fR]
-[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
-[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
-[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
-[\-\-security \fIenabled\fR|\fIdisabled\fR]
-[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
-[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
-[\-e|\-\-encryption \fIALGORITHM\fR]
-[\-\-username \fINAME\fR]
-[\-\-hostname \fINAME\fR]
-[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
-[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
-[\-\-iso\-volume \fISTRING\fR]
-[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
-[\-\-server\-path \fIDIRECTORY\fR]
-[\-\-source \fIenabled\fR|\fIdisabled\fR]
-[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
-[\-\-grub\-splash \fIFILE\fR]
-[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
-[\-\-includes \fIPATH\fR]
-[\-\-templates \fIPATH\fR]
-[\-\-breakpoints]
-[\-\-debug]
-[\-\-force]
-[\-\-quiet]
-[\-\-verbose]
-
-.SH DESCRIPTION
-make\-live is a script calling all required live\-helper(7) programs to build a live system.
-
-.SH OPTIONS
-
-.SH SEE ALSO
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH BUGS
-Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
-
-.SH HOMEPAGE
-More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.

Copied: releases/live-helper/1.0~a11-1/manpages/make-live.en.1 (from rev 1679, dists/trunk/live-helper/manpages/make-live.en.1)
===================================================================
--- releases/live-helper/1.0~a11-1/manpages/make-live.en.1	                        (rev 0)
+++ releases/live-helper/1.0~a11-1/manpages/make-live.en.1	2007-05-24 21:52:20 UTC (rev 1731)
@@ -0,0 +1,88 @@
+.TH MAKE\-LIVE 1 "2007\-05\-21" "1.0~a11" "live\-helper"
+
+.SH NAME
+make\-live \- build a Debian Live system
+
+.SH SYNOPSIS
+.B make\-live
+[config]
+[\-\-mode \fIMODE\fR]
+[\-\-config \fICONFIG\fR]
+[\-\-apt \fIapt\fR|\fIaptitude\fR]
+[\-\-apt\-ftpproxy \fIURL\fR]
+[\-\-apt\-httpproxy \fIURL\fR]
+[\-\-apt\-generic \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-pdiffs \fIenabled\fR|\fIdisabled\fR]
+[\-\-apt\-recommends \fIenabled\fR|\fIdisabled]
+[\-\-apt\-secure \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootstrap \fIcdebootstrap\fR|\fIdeboostrap\fR]
+[\-\-cache \fIenabled\fR|\fIdisabled\fR]
+[\-\-debconf\-frontend \fIdialog\fR|\fIreadline\fR|\fInoninteractive\fR]
+[\-\-debconf\-priority \fIlow\fR|\fImedium\fR|\fIhigh\fR|\fIcritical\fR]
+[\-\-debconf\-nowarnings \fIyes\fR|\fIno\fR]
+[\-\-genisoimage \fIgenisoimage\fR|\fImkisofs\fR]
+[\-\-losetup \fIlosetup\fR|\fIlosetup.org\fR]
+[\-\-tasksel \fIaptitude\fR|\fItasksel\fR]
+[\-r|\-\-root \fIDIRECTORY\fR]
+[\-a|\-\-archi\fItecture \fIARCHITECTURE\fR]
+[\-d|\-\-distribution \fIstable\fR|\fItesting\fR|\fIunstable\fR|\fIetch\fR|\fIlenny\fR|\fIsid\fR]
+[\-\-distribution\-config \fIDIRECTORY\fR]
+[\-f|\-\-bootstrap\-flavour \fIminimal\fR|\fIstandard\fR]
+[\-m|\-\-mirror\-build \fIURL\fR]
+[\-\-mirror\-build\-security \fIURL\fR]
+[\-\-mirror\-image \fIURL\fR]
+[\-\-mirror\-image\-security \fIURL\fR]
+[\-\-sections \fISECTION\fR|\fI\"SECTIONS\"\fR]
+[\-\-interactive \fIshell\fR|\fIx11\fR|\fIxnest\fR]
+[\-k|\-\-kernel\-flavour \fIFLAVOUR\fR]
+[\-\-kernel\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-keyring\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-\-hooks \fI\"COMMAND\"\fR|\fI\"COMMANDS\"\fR]
+[\-l|\-\-language \fILANGUAGE\fR]
+[\-\-packages \fIPACKAGE\fR|\fI\"PACKAGES\"\fR]
+[\-p|\-\-packages\-lists \fILIST\fR|\fI\"LISTS\"\fR]
+[\-\-tasks \fITASK\fR|\fI\"TASKS\"\fR]
+[\-\-security \fIenabled\fR|\fIdisabled\fR]
+[\-\-symlinks \fIenabled\fR|\fIdisabled\fR]
+[\-\-sysvinit \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootappend \fIKERNEL_PARAMETER\fR|\fI\"KERNEL_PARAMETERS\"\fR]
+[\-e|\-\-encryption \fIALGORITHM\fR]
+[\-\-username \fINAME\fR]
+[\-\-hostname \fINAME\fR]
+[\-\-filesystem \fIext2\fR|\fIplain\fR|\fIsquashfs\fR]
+[\-\-memtest \fImemtest86\fR|\fImemtest86+\fR]
+[\-\-iso\-volume \fISTRING\fR]
+[\-\-server\-address \fIHOSTNAME\fR|\fIIP\fR]
+[\-\-server\-path \fIDIRECTORY\fR]
+[\-\-source \fIenabled\fR|\fIdisabled\fR]
+[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
+[\-\-grub\-splash \fIFILE\fR]
+[\-\-syslinux\-splash \fIFILE\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-\-includes \fIPATH\fR]
+[\-\-templates \fIPATH\fR]
+[\-\-breakpoints]
+[\-\-debug]
+[\-\-force]
+[\-\-quiet]
+[\-\-verbose]
+
+.SH DESCRIPTION
+make\-live is a script calling all required live\-helper(7) programs to build a live system.
+
+.SH OPTIONS
+
+.SH SEE ALSO
+\fIlive\-helper\fR(7)
+.PP
+This program is a part of live\-helper.
+
+.SH BUGS
+Report bugs against live\-helper <\fIhttp://packages.qa.debian.org/live\-helper/\fR>.
+
+.SH HOMEPAGE
+More information about the Debian Live project can be found at <\fIhttp://debian\-live.alioth.debian.org/\fR> and <\fIhttp://wiki.debian.org/DebianLive/\fR>.
+
+.SH AUTHOR
+live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.




More information about the Debian-live-changes mailing list