diff options
83 files changed, 607 insertions, 208 deletions
@@ -91,9 +91,9 @@ uninstall: update: set -e; for FILE in functions/*.sh examples/cron/*.sh manpages/*.de.* manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-09\\-03/2007\\-09\\-10/' \ - -e 's/03.09.2007/10.09.2007/' \ - -e 's/1.0~a26/1.0~a27/' \ + sed -i -e 's/2007\\-09\\-10/2007\\-09\\-17/' \ + -e 's/10.09.2007/17.09.2007/' \ + -e 's/1.0~a27/1.0~a28/' \ $$FILE; \ done diff --git a/data/debian-cd/lenny b/data/debian-cd/lenny deleted file mode 120000 index 190cf35..0000000 --- a/data/debian-cd/lenny +++ /dev/null @@ -1 +0,0 @@ -etch
\ No newline at end of file diff --git a/data/debian-cd/lenny/alpha_businesscard_udeb_include b/data/debian-cd/lenny/alpha_businesscard_udeb_include new file mode 100644 index 0000000..eea4461 --- /dev/null +++ b/data/debian-cd/lenny/alpha_businesscard_udeb_include @@ -0,0 +1,4 @@ +choose-mirror +netcfg +ethdetect +fdisk-udeb diff --git a/data/debian-cd/lenny/alpha_netinst_udeb_include b/data/debian-cd/lenny/alpha_netinst_udeb_include new file mode 100644 index 0000000..70df4f6 --- /dev/null +++ b/data/debian-cd/lenny/alpha_netinst_udeb_include @@ -0,0 +1,3 @@ +netcfg +ethdetect +fdisk-udeb diff --git a/data/debian-cd/lenny/alpha_udeb_include b/data/debian-cd/lenny/alpha_udeb_include new file mode 100644 index 0000000..70df4f6 --- /dev/null +++ b/data/debian-cd/lenny/alpha_udeb_include @@ -0,0 +1,3 @@ +netcfg +ethdetect +fdisk-udeb diff --git a/data/debian-cd/lenny/amd64_businesscard_udeb_include b/data/debian-cd/lenny/amd64_businesscard_udeb_include new file mode 100644 index 0000000..bfc81f0 --- /dev/null +++ b/data/debian-cd/lenny/amd64_businesscard_udeb_include @@ -0,0 +1,5 @@ +choose-mirror +netcfg +ethdetect +pcmciautils-udeb +wireless-tools-udeb diff --git a/data/debian-cd/lenny/amd64_netinst_udeb_include b/data/debian-cd/lenny/amd64_netinst_udeb_include new file mode 100644 index 0000000..e5ed873 --- /dev/null +++ b/data/debian-cd/lenny/amd64_netinst_udeb_include @@ -0,0 +1,4 @@ +netcfg +ethdetect +pcmciautils-udeb +wireless-tools-udeb diff --git a/data/debian-cd/lenny/amd64_udeb_include b/data/debian-cd/lenny/amd64_udeb_include new file mode 100644 index 0000000..e5ed873 --- /dev/null +++ b/data/debian-cd/lenny/amd64_udeb_include @@ -0,0 +1,4 @@ +netcfg +ethdetect +pcmciautils-udeb +wireless-tools-udeb diff --git a/data/debian-cd/lenny/arm_businesscard_udeb_include b/data/debian-cd/lenny/arm_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/arm_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/arm_netinst_udeb_include b/data/debian-cd/lenny/arm_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/arm_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/arm_udeb_include b/data/debian-cd/lenny/arm_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/arm_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/exclude-udebs b/data/debian-cd/lenny/exclude-udebs new file mode 100644 index 0000000..cbf0f21 --- /dev/null +++ b/data/debian-cd/lenny/exclude-udebs @@ -0,0 +1,125 @@ +# These udebs build the d-i cdrom initrd. As such, there is no reason +# to keep another copy of them on the CD in udeb form. +# +# This duplicates data found in the file build/pkg-lists/kernel, in d-i svn +kernel-image-* +# build/pkg-lists/base in d-i svn +rootskel +main-menu +cdebconf-udeb +udpkg +anna +di-utils-shell +di-utils-reboot +lowmemcheck +# build/pkg-lists/cdrom/common, in d-i svn (also included in the +# root+cd-drivers floppies) +busybox-udeb +installation-locale +localechooser +iso-3166-udeb +hw-detect +cdrom-detect +cdrom-retriever +load-cdrom +cdrom-checker +bogl-bterm-udeb +di-utils-terminfo +cdebconf-priority +cdebconf-newt-udeb +usb-discover +preseed-common +initrd-preseed +file-preseed +nano-udeb +floppy-retriever +libfribidi0-udeb +# Already on the initrd, thanks to library reduction. +libdebconfclient0-udeb +libdebian-installer-extra4-udeb +# These udebs are only useful in building the boot floppy image. +busybox-floppy-udeb +rootskel-bootfloppy +# gtk stuff +cdebconf-gtk-udeb +fontconfig-udeb +libatk1.0-udeb +libcairo-directfb2-udeb +libdirectfb-0.9-22-udeb +libdirectfb-0.9-25-udeb +libexpat1-udeb +libfreetype6-udeb +libglib2.0-udeb +libgtk-directfb-2.0-0-udeb +libgtk2-engines-udeb +libpango1.0-udeb +libpng12-0-udeb +libsdl1.2debian-udeb +mouse-modules-* +ttf-* +fbset-udeb +# We're currently using busybox's own shell, and do not need this one. +dash-udeb +# Not currently used +cdebootstrap-udeb +hdparm-udeb +laptop-detect-udeb +# These dhcp clients are not the currently preferred one. +# Exclusion disabled during switchover from DHCP v2 to v3. +#dhcp3-client-udeb +# This package is only useful in the d-i-demo. +di-utils-exit-installer +# No need for these loaders. +download-installer +load-floppy +# Only useful in the hd-media initrd. +iso-scan +load-iso +# We're using busybox's modutils these days. +modutils-basic +modutils-full +# Nothing currently depends on this, and it seems not useful on its own. +reiserfsprogs-udeb +# reiser4 is not in the Debian kernel. +mkreiser4-udeb +reiser4progs-udeb +# No longer used by parted. +libreiserfs0.3-udeb +# These are not really needed, the regular netcfg subsumes them. +netcfg-static +# skolelinux stuff, not for the stock CDs +debian-edu-install-udeb +debian-edu-profile-udeb +debian-edu-archive-keyring-udeb +ltsp-client-builder +autopartkit +lvm10-udeb +# live CD stuff +live-installer +simple-cdd-profiles +# If needed, will be on the initrd already. +modutils-full +module-init-tools-udeb +env-preseed +rescue-check +rootskel-gtk +cdebconf-text-udeb +brltty-udeb +klibc-utils-udeb +libklibc-udeb +udev-udeb +ai-choosers +auto-install +# Currently unused +nbd-client-udeb +pwgen-udeb +# Obsolete +libslang1-utf8-udeb +discover-udeb +discover-data-udeb +discover1-udeb +discover1-data-udeb +libdiscover1-udeb +# Eh? +gnumach-udeb +# Exclude apt-setup components; they will be included diff --git a/data/debian-cd/lenny/exclude-udebs-amd64 b/data/debian-cd/lenny/exclude-udebs-amd64 new file mode 100644 index 0000000..c3d32fe --- /dev/null +++ b/data/debian-cd/lenny/exclude-udebs-amd64 @@ -0,0 +1,28 @@ +# These udebs are in the d-i cdrom initrd and the hd-media initrd. +# As such, there is no reason to keep another copy of them on the CD +# in udeb form. +isa-pnp-modules-* +socket-modules-* +console-keymaps-at +console-keymaps-usb +fat-modules-* +cdrom-core-modules-* +cdrom-modules-* +ide-modules-* +ide-core-modules-* +input-modules-* +fb-modules-* +kbd-chooser +usb-modules-* +usb-storage-modules-* +scsi-core-modules-* +# Not needed with the 2.6 kernel on amd64. +userdevfs +# The speakup kernel modules are not useful unless the access images are +# provided. +*-speakup-di +# Only needed on arches that use partconf or autopartkit. +partconf-mkfstab +# Not needed on arches that use partman +mdcfg +lvmcfg diff --git a/data/debian-cd/lenny/exclude-udebs-i386 b/data/debian-cd/lenny/exclude-udebs-i386 new file mode 100644 index 0000000..05a376b --- /dev/null +++ b/data/debian-cd/lenny/exclude-udebs-i386 @@ -0,0 +1,28 @@ +# These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies. +# As such, there is no reason to keep another copy of them on the CD +# in udeb form. +isa-pnp-modules-* +socket-modules-* +console-keymaps-at +console-keymaps-usb +floppy-modules-* +cdrom-core-modules-* +cdrom-modules-* +ide-modules-* +ide-core-modules-* +input-modules-* +fb-modules-* +kbd-chooser +usb-modules-* +usb-storage-modules-* +scsi-core-modules-* +# Not needed with the 2.4 kernel on i386. +userdevfs +# The speakup kernel modules are not useful unless the access images are +# provided. +*-speakup-di +# Only needed on arches that use partconf or autopartkit. +partconf-mkfstab +# Not needed on arches that use partman +mdcfg +lvmcfg diff --git a/data/debian-cd/lenny/exclude-udebs-powerpc b/data/debian-cd/lenny/exclude-udebs-powerpc new file mode 100644 index 0000000..5a7df81 --- /dev/null +++ b/data/debian-cd/lenny/exclude-udebs-powerpc @@ -0,0 +1,28 @@ +# These udebs build the d-i cdrom initrd. As such, there is no reason +# to keep another copy of them on the CD in udeb form. +# +# This duplicates data found in the file build/pkg-lists/cdrom/powerpc, +# in d-i Subversion. + +cdrom-core-modules-* +console-keymaps-at +console-keymaps-usb +eject-udeb +firewire-core-modules-* +fs-common-modules-* +ide-modules-* +input-modules-* +kbd-chooser +scsi-common-modules-* +scsi-core-modules-* +scsi-modules-* +socket-modules-* +usb-modules-* +usb-storage-modules-* +# Not needed with the 2.4 kernel on powerpc. +userdevfs +# Only needed on arches that use partconf or autopartkit. +partconf-mkfstab +# Not needed on arches that use partman +mdcfg +lvmcfg diff --git a/data/debian-cd/lenny/exclude-udebs-s390 b/data/debian-cd/lenny/exclude-udebs-s390 new file mode 100644 index 0000000..e075e4b --- /dev/null +++ b/data/debian-cd/lenny/exclude-udebs-s390 @@ -0,0 +1,3 @@ +# S/390 does not support loading udebs off the CD image, +# so we can exclude all udebs from it +* diff --git a/data/debian-cd/lenny/exclude-udebs-sparc b/data/debian-cd/lenny/exclude-udebs-sparc new file mode 100644 index 0000000..d11a81b --- /dev/null +++ b/data/debian-cd/lenny/exclude-udebs-sparc @@ -0,0 +1,5 @@ +# Only needed on arches that use partconf or autopartkit. +partconf-mkfstab +# Not needed on arches that use partman +mdcfg +lvmcfg diff --git a/data/debian-cd/lenny/hppa_businesscard_udeb_include b/data/debian-cd/lenny/hppa_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/hppa_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/hppa_netinst_udeb_include b/data/debian-cd/lenny/hppa_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/hppa_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/hppa_udeb_include b/data/debian-cd/lenny/hppa_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/hppa_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/i386_businesscard_udeb_include b/data/debian-cd/lenny/i386_businesscard_udeb_include new file mode 100644 index 0000000..bfc81f0 --- /dev/null +++ b/data/debian-cd/lenny/i386_businesscard_udeb_include @@ -0,0 +1,5 @@ +choose-mirror +netcfg +ethdetect +pcmciautils-udeb +wireless-tools-udeb diff --git a/data/debian-cd/lenny/i386_netinst_udeb_include b/data/debian-cd/lenny/i386_netinst_udeb_include new file mode 100644 index 0000000..e5ed873 --- /dev/null +++ b/data/debian-cd/lenny/i386_netinst_udeb_include @@ -0,0 +1,4 @@ +netcfg +ethdetect +pcmciautils-udeb +wireless-tools-udeb diff --git a/data/debian-cd/lenny/i386_udeb_include b/data/debian-cd/lenny/i386_udeb_include new file mode 100644 index 0000000..e5ed873 --- /dev/null +++ b/data/debian-cd/lenny/i386_udeb_include @@ -0,0 +1,4 @@ +netcfg +ethdetect +pcmciautils-udeb +wireless-tools-udeb diff --git a/data/debian-cd/lenny/ia64_businesscard_udeb_include b/data/debian-cd/lenny/ia64_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/ia64_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/ia64_netinst_udeb_include b/data/debian-cd/lenny/ia64_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/ia64_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/ia64_udeb_include b/data/debian-cd/lenny/ia64_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/ia64_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/m68k_businesscard_udeb_include b/data/debian-cd/lenny/m68k_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/m68k_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/m68k_netinst_udeb_include b/data/debian-cd/lenny/m68k_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/m68k_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/m68k_udeb_include b/data/debian-cd/lenny/m68k_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/m68k_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/mips_businesscard_udeb_include b/data/debian-cd/lenny/mips_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/mips_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/mips_netinst_udeb_include b/data/debian-cd/lenny/mips_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/mips_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/mips_udeb_include b/data/debian-cd/lenny/mips_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/mips_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/mipsel_businesscard_udeb_include b/data/debian-cd/lenny/mipsel_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/mipsel_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/mipsel_netinst_udeb_include b/data/debian-cd/lenny/mipsel_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/mipsel_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/mipsel_udeb_include b/data/debian-cd/lenny/mipsel_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/mipsel_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/powerpc_businesscard_udeb_include b/data/debian-cd/lenny/powerpc_businesscard_udeb_include new file mode 100644 index 0000000..b5c5e7e --- /dev/null +++ b/data/debian-cd/lenny/powerpc_businesscard_udeb_include @@ -0,0 +1,4 @@ +choose-mirror +netcfg +ethdetect +wireless-tools-udeb diff --git a/data/debian-cd/lenny/powerpc_netinst_udeb_include b/data/debian-cd/lenny/powerpc_netinst_udeb_include new file mode 100644 index 0000000..4a83dd2 --- /dev/null +++ b/data/debian-cd/lenny/powerpc_netinst_udeb_include @@ -0,0 +1,3 @@ +netcfg +ethdetect +wireless-tools-udeb diff --git a/data/debian-cd/lenny/powerpc_udeb_include b/data/debian-cd/lenny/powerpc_udeb_include new file mode 100644 index 0000000..e5ed873 --- /dev/null +++ b/data/debian-cd/lenny/powerpc_udeb_include @@ -0,0 +1,4 @@ +netcfg +ethdetect +pcmciautils-udeb +wireless-tools-udeb diff --git a/data/debian-cd/lenny/s390_businesscard_udeb_include b/data/debian-cd/lenny/s390_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/s390_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/s390_netinst_udeb_include b/data/debian-cd/lenny/s390_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/s390_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/s390_udeb_include b/data/debian-cd/lenny/s390_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/s390_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/sparc_businesscard_udeb_include b/data/debian-cd/lenny/sparc_businesscard_udeb_include new file mode 100644 index 0000000..6326d6c --- /dev/null +++ b/data/debian-cd/lenny/sparc_businesscard_udeb_include @@ -0,0 +1,3 @@ +choose-mirror +netcfg +ethdetect diff --git a/data/debian-cd/lenny/sparc_netinst_udeb_include b/data/debian-cd/lenny/sparc_netinst_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/sparc_netinst_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/sparc_udeb_include b/data/debian-cd/lenny/sparc_udeb_include new file mode 100644 index 0000000..6f1c801 --- /dev/null +++ b/data/debian-cd/lenny/sparc_udeb_include @@ -0,0 +1,2 @@ +netcfg +ethdetect diff --git a/data/debian-cd/lenny/udeb_exclude b/data/debian-cd/lenny/udeb_exclude new file mode 100644 index 0000000..2e372f6 --- /dev/null +++ b/data/debian-cd/lenny/udeb_exclude @@ -0,0 +1 @@ +apt-mirror-setup diff --git a/data/debian-cd/sid b/data/debian-cd/sid index 190cf35..fb5b653 120000 --- a/data/debian-cd/sid +++ b/data/debian-cd/sid @@ -1 +1 @@ -etch
\ No newline at end of file +lenny
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 50cef1b..2a345dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-helper (1.0~a27-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 10 Sep 2007 00:00:00 +0200 + live-helper (1.0~a26-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index c773493..6a2af6b 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,9 @@ Maintainer: Debian Live <debian-live-maint@lists.alioth.debian.org> Uploaders: Daniel Baumann <daniel@debian.org> Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 -XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-helper/ -XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-helper/ +XS-Upstream-Depends: git-core +XS-VCS-Git: git://git.debian.org/git/users/daniel/live-helper.git +XS-VCS-Browse: http://git.debian.org/?p=users/daniel/live-helper.git Package: live-helper Architecture: all diff --git a/debian/rules b/debian/rules index 92b7fff..0da777e 100755 --- a/debian/rules +++ b/debian/rules @@ -4,9 +4,8 @@ #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 + cd .. && git clone git://git.debian.org/git/users/daniel/live-helper.git || true + rm -rf ../live-helper/.git build: diff --git a/docs/ChangeLog b/docs/ChangeLog index 951f1df..b25e12d 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,32 @@ +2007-09-09 Daniel Baumann <daniel@debian.org> + + * functions/defaults.sh: + - Fixing typing error. + * data/debian-cd: + - Merging debian-cd 3.0.3 data files. + * functions/defaults.sh, helpers/lh_config: + - Adding debian-installer daily images option. + * helpers/lh_binary_debian-installer: + - Reworking debian-installer flavours and urls. + - Failing when no bootstrap package cache. + * helpers/lh_binary_disk: + - Reworking disk information. + * helpers/lh_bootstrap_cache: + - Creating bootstrap stagefile when restoring cache. + * helpers/lh_bootstrap_cache, lh_chroot_cache: + - Refactoring stage caching. + * helpers/lh_clean: + - Removing cache/stages_bootstrap restore. + * lists/devel-live: + - Moving from svn to git. + * Uploading 1.0~a27-1. + +2007-09-04 Daniel Baumann <daniel@debian.org> + + * helpers/lh_chroot_cache: + - Added forgotten creation of the stagefile as mentioned by + Peter Holik <peter@holik.at>. + 2007-09-04 Daniel Baumann <daniel@debian.org> * helpers/lh_binary_syslinux, lh_config: @@ -8,6 +37,7 @@ * helpers/lh_bootstrap_cache: - Added forgotten creation of the stagefile as mentioned by Peter Holik <peter@holik.at>. + * Uploading 1.0~a26-1. 2007-08-28 Daniel Baumann <daniel@debian.org> diff --git a/examples/cron/manpages.sh b/examples/cron/manpages.sh index 571ea14..cac2b70 100755 --- a/examples/cron/manpages.sh +++ b/examples/cron/manpages.sh @@ -1,9 +1,9 @@ #!/bin/sh -# Needs: man2html svn +# Needs: man2html git-core # Static variables -PACKAGES="live-helper live-initramfs live-initscripts live-webhelper" +PACKAGES="live-helper live-initramfs" TEMPDIR="/srv/tmp/manpages" SERVER="/srv/debian-live/www/other/manpages" @@ -48,7 +48,7 @@ do # Getting sources cd "${TEMPDIR}" - svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE} + git clone git://git.debian.org/git/users/daniel/${PACKAGE}.git # Building manpages for MANPAGE in "${TEMPDIR}"/${PACKAGE}/manpages/* diff --git a/examples/cron/snapshots.sh b/examples/cron/snapshots.sh index bdf6433..2075388 100755 --- a/examples/cron/snapshots.sh +++ b/examples/cron/snapshots.sh @@ -1,9 +1,9 @@ #!/bin/sh -# Needs: build-essential fakeroot lsb-release svn [...] +# Needs: build-essential fakeroot lsb-release git-core [...] # Static variables -PACKAGES="live-helper live-initramfs live-initscripts live-magic live-webhelper" +PACKAGES="live-helper live-initramfs" DEBEMAIL="debian-live-devel@lists.alioth.debian.org" EMAIL="debian-live-devel@lists.alioth.debian.org" @@ -52,7 +52,7 @@ do # Getting sources cd "${TEMPDIR}" - svn co svn://svn.debian.org/debian-live/dists/trunk/${PACKAGE} ${PACKAGE} + git clone git://git.debian.org/git/users/daniel/${PACKAGE}.git # Getting version cd "${TEMPDIR}"/${PACKAGE} @@ -60,7 +60,8 @@ do # Getting revision cd "${TEMPDIR}"/${PACKAGE} - REVISION="`svn info | awk '/Last Changed Rev:/ { print $4 }'`" + REVISION="`git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's/+.*$//'`" + REVISION="`date -d "${REVISION}" +%Y%m%d.%H%M%S`" # Check for existing package if [ ! -f "${SERVER}"/${PACKAGE}_${VERSION}~${REVISION}.dsc ] || [ "${1}" = "--force" ] @@ -72,7 +73,7 @@ do # Building package cd "${TEMPDIR}"/${PACKAGE}-${VERSION}~${REVISION} - find . -type d -name .svn | xargs rm -rf + rm -rf .git dch --force-bad-version --newversion ${VERSION}~${REVISION} --distribution UNRELEASED Autobuild snapshot of SVN r${REVISION}. dpkg-buildpackage -rfakeroot -sa -uc -us diff --git a/functions/common.sh b/functions/common.sh index 90f883e..ca420c0 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -10,4 +10,4 @@ set -e PROGRAM="`basename ${0}`" -VERSION="1.0~a26" +VERSION="1.0~a27" diff --git a/functions/defaults.sh b/functions/defaults.sh index e548744..81fee44 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -633,6 +633,9 @@ Set_defaults () # Setting debian-installer option LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER:-disabled}" + # Setting debian-install daily images + LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY:-disabled}" + # Setting encryption # LH_ENCRYPTION diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index b407878..7d5cace 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -35,22 +35,22 @@ Set_defaults # Setting remote d-i directories case "${LH_DEBIAN_INSTALLER}" in - enabled|cdrom|live) + cdrom|netinst|businesscard) DI="cdrom" DI_GTK="${DI}/gtk" DI_KERNEL="vmlinuz" ;; - disabled) - exit 0 - ;; - netboot) - DI="netboot/debian-installer/i386" - DI_GTK="netboot/gtk/debian-installer/i386" + DI="netboot/debian-installer/${LH_ARCHITECTURE}" + DI_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}" DI_KERNEL="linux" ;; + disabled) + exit 0 + ;; + *) Echo_error "debian-installer flavor ${LH_DEBIAN_INSTALLER} not supported." exit 1 @@ -121,61 +121,66 @@ then fi fi -# Debian Installer daily builds -case "${LH_ARCHITECTURE}" in - alpha) - URL="http://people.debian.org/~vorlon/d-i/alpha/daily/" - ;; +if [ "${LH_DEBIAN_INSTALLER_DAILY}" = "enabled" ] +then + # Debian Installer daily builds + case "${LH_ARCHITECTURE}" in + alpha) + URL="http://people.debian.org/~vorlon/d-i/alpha/daily/" + ;; - amd64) - URL="http://people.debian.org/~aba/d-i/images/daily/" - ;; + amd64) + URL="http://people.debian.org/~aba/d-i/images/daily/" + ;; - arm) - URL="http://people.debian.org/~kmuto/d-i/images/daily/" - ;; + arm) + URL="http://people.debian.org/~kmuto/d-i/images/daily/" + ;; - hppa) - URL="http://people.debian.org/~kyle/d-i/hppa/daily/" - ;; + hppa) + URL="http://people.debian.org/~kyle/d-i/hppa/daily/" + ;; - i386) - URL="http://people.debian.org/~joeyh/d-i/images/daily/" - ;; + i386) + URL="http://people.debian.org/~joeyh/d-i/images/daily/" + ;; - ia64) - URL="http://people.debian.org/~dannf/d-i/images/daily/" - ;; + ia64) + URL="http://people.debian.org/~dannf/d-i/images/daily/" + ;; - m68k) - URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/" - ;; + m68k) + URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/" + ;; - mips) - URL="http://people.debian.org/~ths/d-i/mips/images/daily/" - ;; + mips) + URL="http://people.debian.org/~ths/d-i/mips/images/daily/" + ;; - mipsel) - URL="http://people.debian.org/~ths/d-i/mipsel/images/daily/" - ;; + mipsel) + URL="http://people.debian.org/~ths/d-i/mipsel/images/daily/" + ;; - powerpc) - URL="http://people.debian.org/~wouter/d-i/powerpc/daily/" - ;; + powerpc) + URL="http://people.debian.org/~wouter/d-i/powerpc/daily/" + ;; - s390) - URL="http://lophos.multibuild.org/d-i/images/daily/" - ;; + s390) + URL="http://lophos.multibuild.org/d-i/images/daily/" + ;; - sparc) - URL="http://people.debian.org/~stappers/d-i/images/daily/" - ;; + sparc) + URL="http://people.debian.org/~stappers/d-i/images/daily/" + ;; - *) - Echo_error "No daily-builds found for your architecture." - exit 1 - ;; -esac + *) + Echo_error "No daily-builds found for your architecture." + exit 1 + ;; + esac +else + URL="${LH_MIRROR_BOOTSTRAP}/dists/${LH_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/" +fi # Downloading debian-installer mkdir -p "${DESTDIR_DI}" @@ -259,6 +264,9 @@ then # Move files cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}" done +else + Echo_error "E: Could not find cache/packages_bootstrap" + exit 1 fi # Including local debs diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk index 65470be..65c671c 100755 --- a/helpers/lh_binary_disk +++ b/helpers/lh_binary_disk @@ -61,38 +61,54 @@ eval VERSION="$`echo VERSION_${LH_DISTRIBUTION}`" case "${LH_MODE}" in debian) - if [ -d binary/pool/main/b/base-installer ] - then - if [ -d binary/pool/main/l/live-installer ] - then - TYPE="LIVE/INSTALL" - fi - - TYPE="LIVE/NETINST" - else - TYPE="LIVE" - fi - - echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info - ;; + case "${LH_DEBIAN_INSTALLER}" in + cdrom) + echo "main" > binary/.disk/base_components - ubuntu) - echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info - # Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418) - ;; -esac + touch binary/.disk/base_installable -if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ] -then - echo "main" > binary/.disk/base_components + echo "full_cd" > binary/.disk/cd_type + + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} CD Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info + +cat > binary/.disk/udeb_include << EOF +netcfg +ethdetect +pcmcia-cs-udeb +pcmciautils-udeb +wireless-tools-udeb +EOF + + ;; + + netinst) + echo "main" > binary/.disk/base_components + + touch binary/.disk/base_installable + + echo "not_complete" > binary/.disk/cd_type - touch binary/.disk/base_installable + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info - echo "not_complete" > binary/.disk/cd_type +cat > binary/.disk/udeb_include << EOF +netcfg +ethdetect +pcmcia-cs-udeb +pcmciautils-udeb +wireless-tools-udeb +EOF + + ;; + + businesscard) + echo "main" > binary/.disk/base_components + + echo "not_complete" > binary/.disk/cd_type - #touch binary/.disk/mkisofs + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} BC Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info cat > binary/.disk/udeb_include << EOF +choose-mirror netcfg ethdetect pcmcia-cs-udeb @@ -100,10 +116,24 @@ pcmciautils-udeb wireless-tools-udeb EOF - if [ -d binary/pool/main/l/live-installer ] - then - echo "live-installer" >> binary/.disk/udeb_include - fi + ;; + + disabled) + echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info + ;; + esac + ;; + + ubuntu) + # FIXME + echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info + # Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418) + ;; +esac + +if [ -d binary/pool/main/l/live-installer ] +then + echo "live-installer" >> binary/.disk/udeb_include fi # Creating stage file diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache index 8d811a9..b253b5d 100755 --- a/helpers/lh_bootstrap_cache +++ b/helpers/lh_bootstrap_cache @@ -37,49 +37,50 @@ Echo_message "Begin caching bootstrap stage..." for STAGE in ${LH_CACHE_STAGES} do - case "${1}" in - restore) - # Checking stage file - Check_stagefile .stage/bootstrap_cache.restore + if [ "${STAGE}" = "bootstrap" ] + then + case "${1}" in + restore) + # Checking stage file + Check_stagefile .stage/bootstrap_cache.restore + + if [ -d cache/stages_bootstrap ] + then + # Checking lock file + Check_lockfile .lock - # Checking lock file - Check_lockfile .lock + # Creating lock file + Create_lockfile .lock - # Creating lock file - Create_lockfile .lock + # Removing old chroot + rm -rf chroot - if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] - then - # Removing old chroot - rm -rf chroot + # Restoring old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot - # Restoring old cache - ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot + fi - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot - fi + # Creating stage file + Create_stagefile .stage/bootstrap_cache.restore + Create_stagefile .stage/bootstrap - # Creating stage file - Create_stagefile .stage/bootstrap_cache.restore - - exit 0 - fi - ;; + exit 0 + fi + ;; - save) - # Checking stage file - Check_stagefile .stage/bootstrap_cache.save + save) + # Checking stage file + Check_stagefile .stage/bootstrap_cache.save - # Checking lock file - Check_lockfile .lock + # Checking lock file + Check_lockfile .lock - # Creating lock file - Create_lockfile .lock + # Creating lock file + Create_lockfile .lock - if [ "${STAGE}" = "bootstrap" ] - then rm -rf cache/stages_bootstrap mkdir -p cache @@ -93,7 +94,7 @@ do # Creating stage file Create_stagefile .stage/bootstrap_cache.save - fi - ;; - esac + ;; + esac + fi done diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache index 157a48e..4ec2d13 100755 --- a/helpers/lh_chroot_cache +++ b/helpers/lh_chroot_cache @@ -37,49 +37,49 @@ Echo_message "Begin caching chroot stage..." for STAGE in ${LH_CACHE_STAGES} do - case "${1}" in - restore) - # Checking stage file - Check_stagefile .stage/chroot_cache.restore + if [ "${STAGE}" = "chroot" ] + then + case "${1}" in + restore) + # Checking stage file + Check_stagefile .stage/chroot_cache.restore + + if [ -d cache/stages_chroot ] + then + # Checking lock file + Check_lockfile .lock - # Checking lock file - Check_lockfile .lock + # Creating lock file + Create_lockfile .lock - # Creating lock file - Create_lockfile .lock + # Removing old chroot + rm -rf chroot - if [ "${STAGE}" = "chroot" ] && [ -d cache/stages_chroot ] - then - # Removing old chroot - rm -rf chroot + # Restoring old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot - # Restoring old cache - ${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot + fi - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot - fi + # Creating stage file + Create_stagefile .stage/chroot_cache.restore - # Creating stage file - Create_stagefile .stage/chroot_cache.restore - - exit 0 - fi - ;; + exit 0 + fi + ;; - save) - # Checking stage file - Check_stagefile .stage/chroot_cache.save + save) + # Checking stage file + Check_stagefile .stage/chroot_cache.save - # Checking lock file - Check_lockfile .lock + # Checking lock file + Check_lockfile .lock - # Creating lock file - Create_lockfile .lock + # Creating lock file + Create_lockfile .lock - if [ "${STAGE}" = "chroot" ] - then rm -rf cache/stages_chroot mkdir -p cache @@ -90,7 +90,10 @@ do then ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_chroot fi - fi - ;; - esac + + # Creating stage file + Create_stagefile .stage/chroot_cache.save + ;; + esac + fi done diff --git a/helpers/lh_clean b/helpers/lh_clean index 021100f..0858a27 100755 --- a/helpers/lh_clean +++ b/helpers/lh_clean @@ -43,12 +43,6 @@ do "${0}" binary "${0}" stage "${0}" source - - if [ -d chroot ] - then - mkdir -p .stage - touch .stage/bootstrap - fi ;; cache) @@ -67,13 +61,6 @@ do ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp - if [ "${PURGE}" != "true" ] && [ -d cache/stages_bootstrap ] - then - ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot - mkdir -p .stage - touch .stage/bootstrap - fi - rm -f .stage/chroot* ;; @@ -92,7 +79,7 @@ do ;; purge) - PURGE="true" "${0}" all + "${0}" all "${0}" cache ;; diff --git a/helpers/lh_config b/helpers/lh_config index 43633a0..5144c1f 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -48,6 +48,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--debconf-nowarnings enabled|disabled]\n\ \t [--debconf-priority low|medium|high|critical]\n\ \t [--debian-installer enabled|disabled]\n\ +\t [--debian-installer-daily enabled|disabled]\n\ \t [--debug]\n\ \t [-d|--distribution CODENAME]\n\ \t [-e|--encryption aes128|aes192|aes256]\n\ @@ -99,7 +100,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ Local_arguments () { - ARGUMENTS="`getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,losetup:,mode:,root-command:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-images:,binary-indices:,bootappend:,bootloader:,chroot-build:,debian-installer:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,syslinux-timeout:,username:,source:,source-images:,breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}"`" + ARGUMENTS="`getopt --longoptions apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,genisoimage:,initramfs:,losetup:,mode:,root-command:,tasksel:,includes:,templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,distribution:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,chroot-filesystem:,union-filesystem:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,binary-images:,binary-indices:,bootappend:,bootloader:,chroot-build:,debian-installer:,debian-installer-daily:,encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,iso-memtest:,net-filesystem:,net-mountoptions:,net-path:,net-server:,syslinux-splash:,syslinux-timeout:,username:,source:,source-images:,breakpoints,conffile:,debug,force,help,quiet,usage,verbose,version --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:s:c:huv --shell sh -- "${@}"`" if [ "${?}" != "0" ] then @@ -411,6 +412,11 @@ Local_arguments () shift 2 ;; + --debian-installer-daily) + LH_DEBIAN_INSTALLER_DAILY="${2}" + shift 2 + ;; + -e|--encryption) LH_ENCRYPTION="${2}" shift 2 @@ -847,6 +853,10 @@ LH_CHROOT_BUILD="${LH_CHROOT_BUILD}" # (Default: ${LH_DEBIAN_INSTALLER}) LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}" +# \$LH_DEBIAN_INSTALLER_DAILY: set daily images +# (Default: ${LH_DEBIAN_INSTALLER_DAILY}) +LH_DEBIAN_INSTALLER_DAILY="${LH_DEBIAN_INSTALLER_DAILY}" + # \$LH_ENCRYPTION: set encrytion # (Default: empty) LH_ENCRYPTION="${LH_ENCRYPTION}" diff --git a/lists/devel-live b/lists/devel-live index e29184f..ea02768 100644 --- a/lists/devel-live +++ b/lists/devel-live @@ -5,7 +5,7 @@ # live-helper cdebootstrap debootstrap -live-helper subversion +live-helper git-core dosfstools genisoimage mkisofs memtest86+ memtest86 mtools parted genext2fs syslinux grub # kernel diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1 index 539dcec..a89d6fe 100644 --- a/manpages/lh_binary.de.1 +++ b/manpages/lh_binary.de.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_BINARY 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_binary \- Meta\-Helper f\[:u]r lh_binary_* diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1 index 87daab4..9407e8e 100644 --- a/manpages/lh_binary.en.1 +++ b/manpages/lh_binary.en.1 @@ -1,4 +1,4 @@ -.TH LH_BINARY 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_BINARY 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_binary \- meta\-helper for lh_binary_* diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1 index f7214b7..9efc60e 100644 --- a/manpages/lh_bootstrap.de.1 +++ b/manpages/lh_bootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_BOOTSTRAP 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_* diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1 index 13df890..2e0941f 100644 --- a/manpages/lh_bootstrap.en.1 +++ b/manpages/lh_bootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_BOOTSTRAP 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_bootstrap \- meta\-helper for lh_bootstrap_* diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1 index 6981f76..3dec598 100644 --- a/manpages/lh_bootstrap_cdebootstrap.de.1 +++ b/manpages/lh_bootstrap_cdebootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1 index ee8b2e0..15b3152 100644 --- a/manpages/lh_bootstrap_cdebootstrap.en.1 +++ b/manpages/lh_bootstrap_cdebootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1) diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1 index 401f6b3..0c852e2 100644 --- a/manpages/lh_bootstrap_debootstrap.de.1 +++ b/manpages/lh_bootstrap_debootstrap.de.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8) diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1 index aa1a488..aedd078 100644 --- a/manpages/lh_bootstrap_debootstrap.en.1 +++ b/manpages/lh_bootstrap_debootstrap.en.1 @@ -1,4 +1,4 @@ -.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8) diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1 index 4317662..c783756 100644 --- a/manpages/lh_build.de.1 +++ b/manpages/lh_build.de.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_BUILD 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_build \- erstellen eines Live-Systemes diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1 index 1415fff..8327b7c 100644 --- a/manpages/lh_build.en.1 +++ b/manpages/lh_build.en.1 @@ -1,4 +1,4 @@ -.TH LH_BUILD 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_BUILD 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_build \- building a live system diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1 index 7280156..ee66139 100644 --- a/manpages/lh_chroot.de.1 +++ b/manpages/lh_chroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_CHROOT 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_* diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1 index 6c4f457..f177140 100644 --- a/manpages/lh_chroot.en.1 +++ b/manpages/lh_chroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_CHROOT 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_CHROOT 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_chroot \- meta\-helper for lh_chroot_* diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1 index 0b86257..dcd1423 100644 --- a/manpages/lh_clean.de.1 +++ b/manpages/lh_clean.de.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_CLEAN 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_clean \- r\[:a]umt das Build-Verzeichnis auf diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1 index 121a6dd..18b5ba0 100644 --- a/manpages/lh_clean.en.1 +++ b/manpages/lh_clean.en.1 @@ -1,4 +1,4 @@ -.TH LH_CLEAN 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_CLEAN 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_clean \- clean up system build directories diff --git a/manpages/lh_config.de.1 b/manpages/lh_config.de.1 index bfe9a40..d250e7f 100644 --- a/manpages/lh_config.de.1 +++ b/manpages/lh_config.de.1 @@ -1,4 +1,4 @@ -.TH LH_CONFIG 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_CONFIG 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_config \- erstellt live-helper(7) Konfiguration diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1 index 95e7632..868323d 100644 --- a/manpages/lh_config.en.1 +++ b/manpages/lh_config.en.1 @@ -1,4 +1,4 @@ -.TH LH_CONFIG 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_CONFIG 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_config \- create configuration for live-helper(7) diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1 index a5d5d30..c7546c5 100644 --- a/manpages/lh_source.de.1 +++ b/manpages/lh_source.de.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_SOURCE 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_source \- Meta\-Helper f\[:u]r lh_source_* diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1 index f6b61ec..09e3039 100644 --- a/manpages/lh_source.en.1 +++ b/manpages/lh_source.en.1 @@ -1,4 +1,4 @@ -.TH LH_SOURCE 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_SOURCE 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_source \- meta\-helper for lh_source_* diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1 index ca99499..c3b20f6 100644 --- a/manpages/lh_testroot.de.1 +++ b/manpages/lh_testroot.de.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "03.09.2007" "1.0~a26" "live\-helper" +.TH LH_TESTROOT 1 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME lh_testroot \- stellt sicher dass das System als root gebaut wird diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1 index f1776e8..8d58a4d 100644 --- a/manpages/lh_testroot.en.1 +++ b/manpages/lh_testroot.en.1 @@ -1,4 +1,4 @@ -.TH LH_TESTROOT 1 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LH_TESTROOT 1 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME lh_testroot \- ensure that a system is built as root diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7 index 303d5e4..32a2cc8 100644 --- a/manpages/live-helper.de.7 +++ b/manpages/live-helper.de.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "03.09.2007" "1.0~a26" "live\-helper" +.TH LIVE\-HELPER 7 "10.09.2007" "1.0~a27" "live\-helper" .SH NAME live\-helper \- Debian Live Helper-Programme diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7 index 313104e..8d9f58f 100644 --- a/manpages/live-helper.en.7 +++ b/manpages/live-helper.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-HELPER 7 "2007\-09\-03" "1.0~a26" "live\-helper" +.TH LIVE\-HELPER 7 "2007\-09\-10" "1.0~a27" "live\-helper" .SH NAME live\-helper \- Debian Live helper programs |