[SCM] live-build branch, debian-next, updated. debian/2.0.0-1-2-g4e61707
Daniel Baumann
daniel at debian.org
Sun Sep 26 10:38:54 UTC 2010
The following commit has been merged in the debian-next branch:
commit aa489c23da590e5a6d2ba31e6111e88011b9064a
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Sep 26 12:34:39 2010 +0200
Removing lenny support.
diff --git a/data/debian-cd/lenny/alpha_businesscard_udeb_include b/data/debian-cd/lenny/alpha_businesscard_udeb_include
deleted file mode 100644
index eea4461..0000000
--- a/data/debian-cd/lenny/alpha_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 70df4f6..0000000
--- a/data/debian-cd/lenny/alpha_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/debian-cd/lenny/alpha_udeb_include b/data/debian-cd/lenny/alpha_udeb_include
deleted file mode 100644
index 70df4f6..0000000
--- a/data/debian-cd/lenny/alpha_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-fdisk-udeb
diff --git a/data/debian-cd/lenny/amd64_businesscard_udeb_include b/data/debian-cd/lenny/amd64_businesscard_udeb_include
deleted file mode 100644
index 0089df0..0000000
--- a/data/debian-cd/lenny/amd64_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-pcmciautils-udeb
diff --git a/data/debian-cd/lenny/amd64_netinst_udeb_include b/data/debian-cd/lenny/amd64_netinst_udeb_include
deleted file mode 100644
index 1553277..0000000
--- a/data/debian-cd/lenny/amd64_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-pcmciautils-udeb
diff --git a/data/debian-cd/lenny/amd64_udeb_include b/data/debian-cd/lenny/amd64_udeb_include
deleted file mode 100644
index 1553277..0000000
--- a/data/debian-cd/lenny/amd64_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-pcmciautils-udeb
diff --git a/data/debian-cd/lenny/arm_businesscard_udeb_include b/data/debian-cd/lenny/arm_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/arm_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/arm_netinst_udeb_include b/data/debian-cd/lenny/arm_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/arm_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/arm_udeb_include b/data/debian-cd/lenny/arm_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/arm_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/exclude-udebs b/data/debian-cd/lenny/exclude-udebs
deleted file mode 100644
index db20967..0000000
--- a/data/debian-cd/lenny/exclude-udebs
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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
-archdetect
-rootskel
-main-menu
-cdebconf-udeb
-udpkg
-anna
-di-utils
-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 as dependencies
-libdebconfclient0-udeb
-libdebian-installer4-udeb
-libdebian-installer-extra4-udeb
-# These udebs are only useful in building the boot floppy image.
-busybox-floppy-udeb
-rootskel-bootfloppy
-# gtk stuff included in initrd if needed
-rootskel-gtk
-cdebconf-gtk-udeb
-fontconfig-udeb
-gtk2-engines-udeb
-libatk1.0-udeb
-libcairo-directfb2-udeb
-libdirectfb-*-udeb
-libexpat1-udeb
-libfreetype6-udeb
-libglib2.0-udeb
-libgtk-directfb-2.0-0-udeb
-libgtk2-engines-udeb
-libpango1.0-udeb
-libpcre3-udeb
-libpixman-1-0-udeb
-libpng12-0-udeb
-libsdl1.2debian-udeb
-mouse-modules-*
-ttf-*
-fbset-udeb
-# terminal for gtk frontend is also included in initrd
-cdebconf-gtk-terminal
-libvte9-udeb
-# Not currently used
-cdebootstrap-udeb
-hdparm-udeb
-dhcp-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
-# 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
-# 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
-# live CD stuff
-live-installer
-simple-cdd-profiles
-# If needed, will be on the initrd already.
-module-init-tools-udeb
-env-preseed
-rescue-check
-cdebconf-text-udeb
-brltty-udeb
-klibc-utils-udeb
-libklibc-udeb
-udev-udeb
-ai-choosers
-auto-install
-libslang2-udeb
-# Currently unused
-nbd-client-udeb
-pwgen-udeb
-# Eh?
-gnumach-udeb
-# Exclude kbd and console-setup udebs, they're not currently used
-kbd-udeb
-console-setup-*
diff --git a/data/debian-cd/lenny/exclude-udebs-amd64 b/data/debian-cd/lenny/exclude-udebs-amd64
deleted file mode 100644
index 8f81f6e..0000000
--- a/data/debian-cd/lenny/exclude-udebs-amd64
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.
-console-keymaps-at
-console-keymaps-usb
-kbd-chooser
-acpi-modules-*
-ata-modules-*
-cdrom-core-modules-*
-core-modules-*
-fat-modules-*
-fb-modules-*
-ide-core-modules-*
-ide-modules-*
-input-modules-*
-isofs-modules-*
-mmc-modules-*
-nls-core-modules-*
-parport-modules-*
-pcmcia-modules-*
-sata-modules-*
-scsi-common-modules-*
-scsi-core-modules-*
-scsi-modules-*
-serial-modules-*
-speakup-modules-*
-usb-modules-*
-usb-serial-modules-*
-usb-storage-modules-*
-zlib-modules-*
-# Not used on amd64
-console-keymaps-acorn
-console-keymaps-amiga
-console-keymaps-atari
-console-keymaps-dec
-console-keymaps-sun
-# Not needed with the 2.6 kernel on amd64.
-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-i386 b/data/debian-cd/lenny/exclude-udebs-i386
deleted file mode 100644
index eeed470..0000000
--- a/data/debian-cd/lenny/exclude-udebs-i386
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.
-console-keymaps-at
-console-keymaps-usb
-kbd-chooser
-acpi-modules-*
-ata-modules-*
-cdrom-core-modules-*
-core-modules-*
-fat-modules-*
-fb-modules-*
-ide-core-modules-*
-ide-modules-*
-input-modules-*
-isofs-modules-*
-mmc-modules-*
-nls-core-modules-*
-parport-modules-*
-pcmcia-modules-*
-sata-modules-*
-scsi-common-modules-*
-scsi-core-modules-*
-scsi-modules-*
-serial-modules-*
-speakup-modules-*
-usb-modules-*
-usb-serial-modules-*
-usb-storage-modules-*
-zlib-modules-*
-# 686-bigmem kernel udebs are only used for the Xen netboot image
-*-686-bigmem-di
-# Not used on i386
-console-keymaps-acorn
-console-keymaps-amiga
-console-keymaps-atari
-console-keymaps-dec
-console-keymaps-sun
-# Not needed with the 2.4 kernel on i386.
-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-powerpc b/data/debian-cd/lenny/exclude-udebs-powerpc
deleted file mode 100644
index 5a7df81..0000000
--- a/data/debian-cd/lenny/exclude-udebs-powerpc
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
deleted file mode 100644
index e075e4b..0000000
--- a/data/debian-cd/lenny/exclude-udebs-s390
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
deleted file mode 100644
index d11a81b..0000000
--- a/data/debian-cd/lenny/exclude-udebs-sparc
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/hppa_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/hppa_netinst_udeb_include b/data/debian-cd/lenny/hppa_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/hppa_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/hppa_udeb_include b/data/debian-cd/lenny/hppa_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/hppa_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/i386_businesscard_udeb_include b/data/debian-cd/lenny/i386_businesscard_udeb_include
deleted file mode 100644
index 0089df0..0000000
--- a/data/debian-cd/lenny/i386_businesscard_udeb_include
+++ /dev/null
@@ -1,4 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
-pcmciautils-udeb
diff --git a/data/debian-cd/lenny/i386_netinst_udeb_include b/data/debian-cd/lenny/i386_netinst_udeb_include
deleted file mode 100644
index 1553277..0000000
--- a/data/debian-cd/lenny/i386_netinst_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-pcmciautils-udeb
diff --git a/data/debian-cd/lenny/i386_udeb_include b/data/debian-cd/lenny/i386_udeb_include
deleted file mode 100644
index 1553277..0000000
--- a/data/debian-cd/lenny/i386_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-pcmciautils-udeb
diff --git a/data/debian-cd/lenny/ia64_businesscard_udeb_include b/data/debian-cd/lenny/ia64_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/ia64_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/ia64_netinst_udeb_include b/data/debian-cd/lenny/ia64_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/ia64_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/ia64_udeb_include b/data/debian-cd/lenny/ia64_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/ia64_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/m68k_businesscard_udeb_include b/data/debian-cd/lenny/m68k_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/m68k_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/m68k_netinst_udeb_include b/data/debian-cd/lenny/m68k_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/m68k_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/m68k_udeb_include b/data/debian-cd/lenny/m68k_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/m68k_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/mips_businesscard_udeb_include b/data/debian-cd/lenny/mips_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/mips_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/mips_netinst_udeb_include b/data/debian-cd/lenny/mips_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/mips_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/mips_udeb_include b/data/debian-cd/lenny/mips_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/mips_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/mipsel_businesscard_udeb_include b/data/debian-cd/lenny/mipsel_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/mipsel_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/mipsel_netinst_udeb_include b/data/debian-cd/lenny/mipsel_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/mipsel_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/mipsel_udeb_include b/data/debian-cd/lenny/mipsel_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/mipsel_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/powerpc_businesscard_udeb_include b/data/debian-cd/lenny/powerpc_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/powerpc_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/powerpc_netinst_udeb_include b/data/debian-cd/lenny/powerpc_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/powerpc_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/powerpc_udeb_include b/data/debian-cd/lenny/powerpc_udeb_include
deleted file mode 100644
index 1553277..0000000
--- a/data/debian-cd/lenny/powerpc_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-netcfg
-ethdetect
-pcmciautils-udeb
diff --git a/data/debian-cd/lenny/s390_businesscard_udeb_include b/data/debian-cd/lenny/s390_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/s390_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/s390_netinst_udeb_include b/data/debian-cd/lenny/s390_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/s390_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/s390_udeb_include b/data/debian-cd/lenny/s390_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/s390_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/sparc_businesscard_udeb_include b/data/debian-cd/lenny/sparc_businesscard_udeb_include
deleted file mode 100644
index 6326d6c..0000000
--- a/data/debian-cd/lenny/sparc_businesscard_udeb_include
+++ /dev/null
@@ -1,3 +0,0 @@
-choose-mirror
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/sparc_netinst_udeb_include b/data/debian-cd/lenny/sparc_netinst_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/sparc_netinst_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/sparc_udeb_include b/data/debian-cd/lenny/sparc_udeb_include
deleted file mode 100644
index 6f1c801..0000000
--- a/data/debian-cd/lenny/sparc_udeb_include
+++ /dev/null
@@ -1,2 +0,0 @@
-netcfg
-ethdetect
diff --git a/data/debian-cd/lenny/udeb_exclude b/data/debian-cd/lenny/udeb_exclude
deleted file mode 100644
index 2e372f6..0000000
--- a/data/debian-cd/lenny/udeb_exclude
+++ /dev/null
@@ -1 +0,0 @@
-apt-mirror-setup
diff --git a/debian/control b/debian/control
index 539c330..fae32f9 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,6 @@ Vcs-Git: git://live.debian.net/git/live-build.git
Package: live-build
Architecture: all
Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static
-Conflicts: live-helper (<< 2.0~a20)
-Replaces: live-helper
Recommends: cpio, gettext-base, gnu-fdisk
Suggests:
dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted,
@@ -26,22 +24,10 @@ Description: Debian Live - System Build Scripts
Package: live-build-cgi
Architecture: all
-Depends: ${misc:Depends}, live-helper (= ${source:Version})
-Conflicts: live-helper (<< 2.0~a20)
-Replaces: live-helper
+Depends: ${misc:Depends}
Recommends: apache2 | httpd
Description: Debian Live - System Build Scripts (cgi frontend)
live-build contains the scripts that build a Debian Live system image from a
configuration directory.
.
This package contains the cgi frontend.
-
-Package: live-helper
-Architecture: all
-Depends: ${misc:Depends}, live-build
-Description: Debian Live - System Build Scripts (transitional package)
- Package to ease upgrading from older live-helper packages to the new
- live-build package.
- .
- This package can be purged at anytime once the live-build package has been
- installed.
diff --git a/debian/live-helper.links b/debian/live-helper.links
deleted file mode 100644
index 691e14a..0000000
--- a/debian/live-helper.links
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/bin/lb /usr/bin/lh
-/usr/share/man/man1/lb.1.gz /usr/share/man/man1/lh.1.gz
-/usr/bin/live-build /usr/bin/live-helper
-/usr/share/man/man7/live-build.7.gz /usr/share/man/man7/live-helper.7.gz
diff --git a/examples/hooks/lenny_binary_live-installer-usbfix.sh b/examples/hooks/lenny_binary_live-installer-usbfix.sh
deleted file mode 100755
index ded8b80..0000000
--- a/examples/hooks/lenny_binary_live-installer-usbfix.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-echo "BINARY-HOOK: fix install from USB in Lenny."
-
-# This is a *binary-hook* to allow disk installations from USB for
-# Debian 5.0.x Lenny. Place this file in config/binary_local-hooks/,
-# make it executable and rebuild your live image (binary only).
-
-# This workaround for debian-installer was adapted from Chris Lamb
-original patch:
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=498143#5
-
-# It works by fooling apt-setup. With an existing /hd-media directory
-# apt-setup will not try to umount /cdrom. Enable live installer with
-# lh_config:
-#
-# lh_config --debian-installer "live"
-#
-# Rebuild your binary image. No options needed on boot.
-
-cat > cdrom-detect.postinst.patch << 'EOF'
-@@ -44,6 +44,30 @@ do
- fi
- done
-
-+ # Try disk partitions masquerading as Debian CDs for Debian Live
-+ # "usb-hdd" images. Only vfat and ext are supported.
-+ modprobe vfat >/dev/null 2>&1 || true
-+ for device in $(list-devices partition); do
-+ if mount -t vfat -o ro,exec $device /cdrom ||
-+ mount -t ext2 -o ro,exec $device /cdrom; then
-+ log "Pseudo CD-ROM mount succeeded: device=$device"
-+
-+ # Test whether it's a Debian CD
-+ if [ -e /cdrom/.disk/info ]; then
-+ mounted=1
-+ db_set cdrom-detect/cdrom_device $device
-+ # fake hd-media install so that apt-setup doesn't break.
-+ mkdir /hd-media
-+ break
-+ else
-+ log "Ignoring pseudo CD-ROM device $device - it is not a Debian CD"
-+ umount /cdrom 2>/dev/null || true
-+ fi
-+ else
-+ log "Psuedo CD-ROM mount failed: device=$device"
-+ fi
-+ done
-+
- if [ "$mounted" = "1" ]; then
- break
- fi
-
-EOF
-
-# for the syslinux installer
-mkdir usb-install-syslinux
-cd usb-install-syslinux
-zcat ../binary/install/initrd.gz | cpio -iv
-patch ./var/lib/dpkg/info/cdrom-detect.postinst < ../cdrom-detect.postinst.patch
-PATCH_ERROR=${?}
-if [ "${PATCH_ERROR}" != 0 ]
-then
- # if there was an error, say it and undo everything.
- echo "ERROR: error while patching cdrom-detect.postinst."
- cd ..
- rmdir -rf usb-install-syslinux
- exit 0
-fi
-# rebuild the initrd
-find . -print0 | cpio -0 -H newc -ov | gzip -c > ../initrd-new.gz
-cd ..
-mv initrd-new.gz binary/install/initrd.gz
-rm -rf usb-install-syslinux
-
-# for the gtk installer
-mkdir usb-install-gtk
-cd usb-install-gtk
-zcat ../binary/install/gtk/initrd.gz | cpio -iv
-patch ./var/lib/dpkg/info/cdrom-detect.postinst < ../cdrom-detect.postinst.patch
-PATCH_ERROR=${?}
-if [ "${PATCH_ERROR}" != 0 ]
-then
- # if there was an error, say it and undo everything
- echo "ERROR: error while patching cdrom-detect.postinst."
- cd ..
- rmdir -rf usb-install-gtk
- exit 0
-fi
-# rebuild the initrd
-find . -print0 | cpio -0 -H newc -ov | gzip -c > ../initrd-new.gz
-cd ..
-mv initrd-new.gz binary/install/gtk/initrd.gz
-rm -rf usb-install-gtk
-
-rm cdrom-detect.postinst.patch
diff --git a/examples/hooks/lenny_chroot_aufs-modules.sh b/examples/hooks/lenny_chroot_aufs-modules.sh
deleted file mode 100755
index 2d0d16e..0000000
--- a/examples/hooks/lenny_chroot_aufs-modules.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-build(7) to install aufs drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: You only want to use this hook if there is no prebuild aufs-modules-*
-# package available for your kernel flavour.
-
-apt-get install --yes build-essential
-
-# Building kernel module
-which module-assistant || apt-get install --yes module-assistant
-module-assistant update
-
-for KERNEL in /boot/vmlinuz-*
-do
- VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
-
- module-assistant --non-inter --quiet auto-install aufs -l ${VERSION}
-done
-
-module-assistant clean aufs
diff --git a/examples/hooks/lenny_chroot_kpdf-nodrm.sh b/examples/hooks/lenny_chroot_kpdf-nodrm.sh
deleted file mode 100755
index 20a4f9f..0000000
--- a/examples/hooks/lenny_chroot_kpdf-nodrm.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-build(7) to configure KDE's PDF viewer to ignore
-# manipulation restriction on "DRM protect" PDF documents.
-#
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-
-if [ -d /usr/share/config ]
-then
-
-cat > /usr/share/config/kpdfpartrc << EOF
-[General]
-ObeyDRM=false
-EOF
-
-fi
diff --git a/examples/hooks/lenny_chroot_madwifi-modules.sh b/examples/hooks/lenny_chroot_madwifi-modules.sh
deleted file mode 100755
index 336e84c..0000000
--- a/examples/hooks/lenny_chroot_madwifi-modules.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-build(7) to install madwifi drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: This hook requires packages from the contrib category. Make sure you enabled
-# it in your configuration.
-
-apt-get install --yes build-essential
-
-# Building kernel module
-which module-assistant || apt-get install --yes module-assistant
-module-assistant update
-
-for KERNEL in /boot/vmlinuz-*
-do
- VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
-
- module-assistant --non-inter --quiet auto-install madwifi -l ${VERSION}
-done
-
-module-assistant clean madwifi
-
-# Installing additional stuff
-apt-get install --yes madwifi-tools
diff --git a/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh b/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh
deleted file mode 100755
index 7374ce4..0000000
--- a/examples/hooks/lenny_chroot_nvidia-legacy-modules.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-build(7) to install nvidia-kernel-legacy drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: This hook requires packages from the non-free category. Make sure you
-# enabled it in your configuration.
-
-apt-get install --yes build-essential
-
-# Building kernel module
-which module-assistant || apt-get install --yes module-assistant nvidia-kernel-common
-module-assistant update
-
-for KERNEL in /boot/vmlinuz-*
-do
- VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
-
- module-assistant --non-inter --quiet auto-install nvidia-kernel-legacy -l ${VERSION}
-done
-
-module-assistant clean nvidia-kernel-legacy
-
-# Installing additional stuff
-apt-get install --yes nvidia-glx-legacy nvidia-xconfig discover
-
-# Fix #421028
-if [ -f /usr/lib/xorg/modules/drivers/nvidia_drv.o ]
-then
- cd /usr/lib/xorg/modules/drivers
- gcc -shared -o nvidia_drv.so nvidia_drv.o
- cd ${OLDPWD}
-fi
-
-# Adding init script
-cat > /etc/init.d/nvidia-debian-live << EOF
-#!/bin/sh
-# script that modify xorg configuration enabling
-# the nvidia proprietary module if the card is detected
-# as an NVidia
-
-if discover --type-summary display | grep -i nvidia
-then
- # forcing depth to 24, bad detection on some card (e.g my GeForce4 440 Go)
- echo "Configuring Xorg for nvidia ..."
- nvidia-xconfig -d 24
-else
- # not with nvidia h/w ? remove those GLX diversions
- # (FIXME)
- apt-get --quiet --yes remove nvidia-glx-legacy
-fi
-EOF
-
-chmod 0755 /etc/init.d/nvidia-debian-live
-update-rc.d nvidia-debian-live defaults
diff --git a/examples/hooks/lenny_chroot_squashfs-modules.sh b/examples/hooks/lenny_chroot_squashfs-modules.sh
deleted file mode 100755
index cfa2f77..0000000
--- a/examples/hooks/lenny_chroot_squashfs-modules.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-build(7) to install squashfs drivers
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: You only want to use this hook if there is no prebuild
-# squashfs-modules-* package available for your kernel flavour.
-
-apt-get install --yes build-essential
-
-# Building kernel module
-which module-assistant || apt-get install --yes module-assistant
-module-assistant update
-
-for KERNEL in /boot/vmlinuz-*
-do
- VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
-
- module-assistant --non-inter --quiet auto-install squashfs -l ${VERSION}
-done
-
-module-assistant clean squashfs
diff --git a/examples/hooks/lenny_chroot_sun-java5.sh b/examples/hooks/lenny_chroot_sun-java5.sh
deleted file mode 100755
index 27034a7..0000000
--- a/examples/hooks/lenny_chroot_sun-java5.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-build(7) to install sun-java.
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-# Note: This hook requires packages from the non-free category. Make sure you
-# enabled it in your configuration.
-
-# live-build sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not
-# ask any questions while installing packages. Suns redistribution terms for
-# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for
-# this apt-get call only.
-
-# In case you do accept the license terms, you can also preseed the values
-# for a complete non-interactive build, by uncommenting the following three lines:
-
-#echo "sun-java5-bin shared/accepted-sun-dlj-v1-1 boolean true" > /root/preseed
-#debconf-set-selections < /root/preseed
-#rm -f /root/preseed
-
-DEBIAN_FRONTEND="dialog" apt-get install --yes sun-java5-bin sun-java5-demo \
- sun-java5-doc sun-java5-fonts sun-java5-jdk sun-java5-jre \
- sun-java5-plugin sun-java5-source
-
-# Ensure that /tmp has the right permissions; apparently sun-java5-doc tampers
-# with it
-chmod 1777 /tmp
diff --git a/includes/sid b/includes/sid
index fb5b653..20f08b4 120000
--- a/includes/sid
+++ b/includes/sid
@@ -1 +1 @@
-lenny
\ No newline at end of file
+squeeze
\ No newline at end of file
diff --git a/includes/squeeze b/includes/squeeze
deleted file mode 120000
index fb5b653..0000000
--- a/includes/squeeze
+++ /dev/null
@@ -1 +0,0 @@
-lenny
\ No newline at end of file
diff --git a/includes/lenny/common/doc/00-INDEX b/includes/squeeze/common/doc/00-INDEX
similarity index 100%
rename from includes/lenny/common/doc/00-INDEX
rename to includes/squeeze/common/doc/00-INDEX
diff --git a/includes/lenny/common/doc/FAQ/debian-faq.en.html.tar.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.html.tar.gz
similarity index 100%
rename from includes/lenny/common/doc/FAQ/debian-faq.en.html.tar.gz
rename to includes/squeeze/common/doc/FAQ/debian-faq.en.html.tar.gz
diff --git a/includes/lenny/common/doc/FAQ/debian-faq.en.pdf.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.pdf.gz
similarity index 100%
rename from includes/lenny/common/doc/FAQ/debian-faq.en.pdf.gz
rename to includes/squeeze/common/doc/FAQ/debian-faq.en.pdf.gz
diff --git a/includes/lenny/common/doc/FAQ/debian-faq.en.ps.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.ps.gz
similarity index 100%
rename from includes/lenny/common/doc/FAQ/debian-faq.en.ps.gz
rename to includes/squeeze/common/doc/FAQ/debian-faq.en.ps.gz
diff --git a/includes/lenny/common/doc/FAQ/debian-faq.en.txt.gz b/includes/squeeze/common/doc/FAQ/debian-faq.en.txt.gz
similarity index 100%
rename from includes/lenny/common/doc/FAQ/debian-faq.en.txt.gz
rename to includes/squeeze/common/doc/FAQ/debian-faq.en.txt.gz
diff --git a/includes/lenny/common/doc/FAQ/html/ch-basic_defs.en.html b/includes/squeeze/common/doc/FAQ/html/ch-basic_defs.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-basic_defs.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-basic_defs.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-basic_defs.html b/includes/squeeze/common/doc/FAQ/html/ch-basic_defs.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-basic_defs.html
rename to includes/squeeze/common/doc/FAQ/html/ch-basic_defs.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-choosing.en.html b/includes/squeeze/common/doc/FAQ/html/ch-choosing.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-choosing.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-choosing.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-choosing.html b/includes/squeeze/common/doc/FAQ/html/ch-choosing.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-choosing.html
rename to includes/squeeze/common/doc/FAQ/html/ch-choosing.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-compat.en.html b/includes/squeeze/common/doc/FAQ/html/ch-compat.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-compat.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-compat.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-compat.html b/includes/squeeze/common/doc/FAQ/html/ch-compat.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-compat.html
rename to includes/squeeze/common/doc/FAQ/html/ch-compat.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-contributing.en.html b/includes/squeeze/common/doc/FAQ/html/ch-contributing.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-contributing.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-contributing.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-contributing.html b/includes/squeeze/common/doc/FAQ/html/ch-contributing.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-contributing.html
rename to includes/squeeze/common/doc/FAQ/html/ch-contributing.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-customizing.en.html b/includes/squeeze/common/doc/FAQ/html/ch-customizing.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-customizing.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-customizing.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-customizing.html b/includes/squeeze/common/doc/FAQ/html/ch-customizing.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-customizing.html
rename to includes/squeeze/common/doc/FAQ/html/ch-customizing.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-faqinfo.en.html b/includes/squeeze/common/doc/FAQ/html/ch-faqinfo.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-faqinfo.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-faqinfo.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-faqinfo.html b/includes/squeeze/common/doc/FAQ/html/ch-faqinfo.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-faqinfo.html
rename to includes/squeeze/common/doc/FAQ/html/ch-faqinfo.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-ftparchives.en.html b/includes/squeeze/common/doc/FAQ/html/ch-ftparchives.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-ftparchives.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-ftparchives.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-ftparchives.html b/includes/squeeze/common/doc/FAQ/html/ch-ftparchives.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-ftparchives.html
rename to includes/squeeze/common/doc/FAQ/html/ch-ftparchives.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-getting.en.html b/includes/squeeze/common/doc/FAQ/html/ch-getting.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-getting.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-getting.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-getting.html b/includes/squeeze/common/doc/FAQ/html/ch-getting.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-getting.html
rename to includes/squeeze/common/doc/FAQ/html/ch-getting.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-kernel.en.html b/includes/squeeze/common/doc/FAQ/html/ch-kernel.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-kernel.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-kernel.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-kernel.html b/includes/squeeze/common/doc/FAQ/html/ch-kernel.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-kernel.html
rename to includes/squeeze/common/doc/FAQ/html/ch-kernel.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-nexttime.en.html b/includes/squeeze/common/doc/FAQ/html/ch-nexttime.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-nexttime.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-nexttime.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-nexttime.html b/includes/squeeze/common/doc/FAQ/html/ch-nexttime.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-nexttime.html
rename to includes/squeeze/common/doc/FAQ/html/ch-nexttime.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-pkg_basics.en.html b/includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-pkg_basics.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-pkg_basics.html b/includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-pkg_basics.html
rename to includes/squeeze/common/doc/FAQ/html/ch-pkg_basics.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-pkgtools.en.html b/includes/squeeze/common/doc/FAQ/html/ch-pkgtools.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-pkgtools.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-pkgtools.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-pkgtools.html b/includes/squeeze/common/doc/FAQ/html/ch-pkgtools.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-pkgtools.html
rename to includes/squeeze/common/doc/FAQ/html/ch-pkgtools.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-redistrib.en.html b/includes/squeeze/common/doc/FAQ/html/ch-redistrib.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-redistrib.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-redistrib.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-redistrib.html b/includes/squeeze/common/doc/FAQ/html/ch-redistrib.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-redistrib.html
rename to includes/squeeze/common/doc/FAQ/html/ch-redistrib.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-software.en.html b/includes/squeeze/common/doc/FAQ/html/ch-software.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-software.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-software.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-software.html b/includes/squeeze/common/doc/FAQ/html/ch-software.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-software.html
rename to includes/squeeze/common/doc/FAQ/html/ch-software.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-support.en.html b/includes/squeeze/common/doc/FAQ/html/ch-support.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-support.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-support.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-support.html b/includes/squeeze/common/doc/FAQ/html/ch-support.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-support.html
rename to includes/squeeze/common/doc/FAQ/html/ch-support.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-uptodate.en.html b/includes/squeeze/common/doc/FAQ/html/ch-uptodate.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-uptodate.en.html
rename to includes/squeeze/common/doc/FAQ/html/ch-uptodate.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/ch-uptodate.html b/includes/squeeze/common/doc/FAQ/html/ch-uptodate.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/ch-uptodate.html
rename to includes/squeeze/common/doc/FAQ/html/ch-uptodate.html
diff --git a/includes/lenny/common/doc/FAQ/html/footnotes.en.html b/includes/squeeze/common/doc/FAQ/html/footnotes.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/footnotes.en.html
rename to includes/squeeze/common/doc/FAQ/html/footnotes.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/footnotes.html b/includes/squeeze/common/doc/FAQ/html/footnotes.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/footnotes.html
rename to includes/squeeze/common/doc/FAQ/html/footnotes.html
diff --git a/includes/lenny/common/doc/FAQ/html/index.en.html b/includes/squeeze/common/doc/FAQ/html/index.en.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/index.en.html
rename to includes/squeeze/common/doc/FAQ/html/index.en.html
diff --git a/includes/lenny/common/doc/FAQ/html/index.html b/includes/squeeze/common/doc/FAQ/html/index.html
similarity index 100%
rename from includes/lenny/common/doc/FAQ/html/index.html
rename to includes/squeeze/common/doc/FAQ/html/index.html
diff --git a/includes/lenny/common/doc/bug-log-access.txt b/includes/squeeze/common/doc/bug-log-access.txt
similarity index 100%
rename from includes/lenny/common/doc/bug-log-access.txt
rename to includes/squeeze/common/doc/bug-log-access.txt
diff --git a/includes/lenny/common/doc/bug-log-mailserver.txt b/includes/squeeze/common/doc/bug-log-mailserver.txt
similarity index 100%
rename from includes/lenny/common/doc/bug-log-mailserver.txt
rename to includes/squeeze/common/doc/bug-log-mailserver.txt
diff --git a/includes/lenny/common/doc/bug-mailserver-refcard.txt b/includes/squeeze/common/doc/bug-mailserver-refcard.txt
similarity index 100%
rename from includes/lenny/common/doc/bug-mailserver-refcard.txt
rename to includes/squeeze/common/doc/bug-mailserver-refcard.txt
diff --git a/includes/lenny/common/doc/bug-maint-info.txt b/includes/squeeze/common/doc/bug-maint-info.txt
similarity index 100%
rename from includes/lenny/common/doc/bug-maint-info.txt
rename to includes/squeeze/common/doc/bug-maint-info.txt
diff --git a/includes/lenny/common/doc/bug-maint-mailcontrol.txt b/includes/squeeze/common/doc/bug-maint-mailcontrol.txt
similarity index 100%
rename from includes/lenny/common/doc/bug-maint-mailcontrol.txt
rename to includes/squeeze/common/doc/bug-maint-mailcontrol.txt
diff --git a/includes/lenny/common/doc/bug-reporting.txt b/includes/squeeze/common/doc/bug-reporting.txt
similarity index 100%
rename from includes/lenny/common/doc/bug-reporting.txt
rename to includes/squeeze/common/doc/bug-reporting.txt
diff --git a/includes/lenny/common/doc/constitution.txt b/includes/squeeze/common/doc/constitution.txt
similarity index 100%
rename from includes/lenny/common/doc/constitution.txt
rename to includes/squeeze/common/doc/constitution.txt
diff --git a/includes/lenny/common/doc/debian-manifesto b/includes/squeeze/common/doc/debian-manifesto
similarity index 100%
rename from includes/lenny/common/doc/debian-manifesto
rename to includes/squeeze/common/doc/debian-manifesto
diff --git a/includes/lenny/common/doc/mailing-lists.txt b/includes/squeeze/common/doc/mailing-lists.txt
similarity index 100%
rename from includes/lenny/common/doc/mailing-lists.txt
rename to includes/squeeze/common/doc/mailing-lists.txt
diff --git a/includes/lenny/common/doc/social-contract.txt b/includes/squeeze/common/doc/social-contract.txt
similarity index 100%
rename from includes/lenny/common/doc/social-contract.txt
rename to includes/squeeze/common/doc/social-contract.txt
diff --git a/includes/lenny/common/doc/source-unpack.txt b/includes/squeeze/common/doc/source-unpack.txt
similarity index 100%
rename from includes/lenny/common/doc/source-unpack.txt
rename to includes/squeeze/common/doc/source-unpack.txt
diff --git a/includes/lenny/install/README.html b/includes/squeeze/install/README.html
similarity index 100%
rename from includes/lenny/install/README.html
rename to includes/squeeze/install/README.html
diff --git a/includes/lenny/install/README.mirrors.html b/includes/squeeze/install/README.mirrors.html
similarity index 100%
rename from includes/lenny/install/README.mirrors.html
rename to includes/squeeze/install/README.mirrors.html
diff --git a/includes/lenny/install/README.mirrors.txt b/includes/squeeze/install/README.mirrors.txt
similarity index 100%
rename from includes/lenny/install/README.mirrors.txt
rename to includes/squeeze/install/README.mirrors.txt
diff --git a/includes/lenny/install/README.txt b/includes/squeeze/install/README.txt
similarity index 100%
rename from includes/lenny/install/README.txt
rename to includes/squeeze/install/README.txt
diff --git a/includes/lenny/install/autorun.inf b/includes/squeeze/install/autorun.inf
similarity index 100%
rename from includes/lenny/install/autorun.inf
rename to includes/squeeze/install/autorun.inf
diff --git a/includes/lenny/install/css/debinstall-print.css b/includes/squeeze/install/css/debinstall-print.css
similarity index 100%
rename from includes/lenny/install/css/debinstall-print.css
rename to includes/squeeze/install/css/debinstall-print.css
diff --git a/includes/lenny/install/css/debinstall.css b/includes/squeeze/install/css/debinstall.css
similarity index 100%
rename from includes/lenny/install/css/debinstall.css
rename to includes/squeeze/install/css/debinstall.css
diff --git a/includes/lenny/install/pics/blue-lowerleft.png b/includes/squeeze/install/pics/blue-lowerleft.png
similarity index 100%
rename from includes/lenny/install/pics/blue-lowerleft.png
rename to includes/squeeze/install/pics/blue-lowerleft.png
diff --git a/includes/lenny/install/pics/blue-lowerright.png b/includes/squeeze/install/pics/blue-lowerright.png
similarity index 100%
rename from includes/lenny/install/pics/blue-lowerright.png
rename to includes/squeeze/install/pics/blue-lowerright.png
diff --git a/includes/lenny/install/pics/blue-upperleft.png b/includes/squeeze/install/pics/blue-upperleft.png
similarity index 100%
rename from includes/lenny/install/pics/blue-upperleft.png
rename to includes/squeeze/install/pics/blue-upperleft.png
diff --git a/includes/lenny/install/pics/blue-upperright.png b/includes/squeeze/install/pics/blue-upperright.png
similarity index 100%
rename from includes/lenny/install/pics/blue-upperright.png
rename to includes/squeeze/install/pics/blue-upperright.png
diff --git a/includes/lenny/install/pics/debian-61.png b/includes/squeeze/install/pics/debian-61.png
similarity index 100%
rename from includes/lenny/install/pics/debian-61.png
rename to includes/squeeze/install/pics/debian-61.png
diff --git a/includes/lenny/install/pics/debian.jpg b/includes/squeeze/install/pics/debian.jpg
similarity index 100%
rename from includes/lenny/install/pics/debian.jpg
rename to includes/squeeze/install/pics/debian.jpg
diff --git a/includes/lenny/install/pics/dot_bw.gif b/includes/squeeze/install/pics/dot_bw.gif
similarity index 100%
rename from includes/lenny/install/pics/dot_bw.gif
rename to includes/squeeze/install/pics/dot_bw.gif
diff --git a/includes/lenny/install/pics/gradient.png b/includes/squeeze/install/pics/gradient.png
similarity index 100%
rename from includes/lenny/install/pics/gradient.png
rename to includes/squeeze/install/pics/gradient.png
diff --git a/includes/lenny/install/pics/logo-50.jpg b/includes/squeeze/install/pics/logo-50.jpg
similarity index 100%
rename from includes/lenny/install/pics/logo-50.jpg
rename to includes/squeeze/install/pics/logo-50.jpg
diff --git a/includes/lenny/install/pics/openlogo-nd-50.png b/includes/squeeze/install/pics/openlogo-nd-50.png
similarity index 100%
rename from includes/lenny/install/pics/openlogo-nd-50.png
rename to includes/squeeze/install/pics/openlogo-nd-50.png
diff --git a/includes/lenny/install/pics/red-lowerleft.png b/includes/squeeze/install/pics/red-lowerleft.png
similarity index 100%
rename from includes/lenny/install/pics/red-lowerleft.png
rename to includes/squeeze/install/pics/red-lowerleft.png
diff --git a/includes/lenny/install/pics/red-lowerright.png b/includes/squeeze/install/pics/red-lowerright.png
similarity index 100%
rename from includes/lenny/install/pics/red-lowerright.png
rename to includes/squeeze/install/pics/red-lowerright.png
diff --git a/includes/lenny/install/pics/red-upperleft.png b/includes/squeeze/install/pics/red-upperleft.png
similarity index 100%
rename from includes/lenny/install/pics/red-upperleft.png
rename to includes/squeeze/install/pics/red-upperleft.png
diff --git a/includes/lenny/install/pics/red-upperright.png b/includes/squeeze/install/pics/red-upperright.png
similarity index 100%
rename from includes/lenny/install/pics/red-upperright.png
rename to includes/squeeze/install/pics/red-upperright.png
diff --git a/includes/wheezy b/includes/wheezy
index fb5b653..20f08b4 120000
--- a/includes/wheezy
+++ b/includes/wheezy
@@ -1 +1 @@
-lenny
\ No newline at end of file
+squeeze
\ No newline at end of file
diff --git a/lists/debian-forensics b/lists/debian-forensics
index 4c7a356..27a3a2b 100644
--- a/lists/debian-forensics
+++ b/lists/debian-forensics
@@ -29,7 +29,6 @@ wipe
## Packages available as of squeeze
-#if DISTRIBUTION squeeze wheezy sid
aesfix
aeskeyfind
afflib-tools
@@ -47,4 +46,3 @@ rifiuti
rifiuti2
safecopy
shed
-#endif
diff --git a/lists/debian-live-devel b/lists/debian-live-devel
index 9057bc5..4e963b0 100644
--- a/lists/debian-live-devel
+++ b/lists/debian-live-devel
@@ -6,17 +6,9 @@
# http://qa.debian.org/developer.php?login=debian-live@lists.debian.org
# debian-live
-#if DISTRIBUTION lenny
-live-helper
-git-core
-grub
-#endif
-
-#if DISTRIBUTION squeeze wheezy sid
live-build
git
grub-pc grub-legacy
-#endif
debootstrap cdebootstrap
syslinux
@@ -25,18 +17,10 @@ dosfstools genisoimage mtools parted squashfs-tools genext2fs mtd-tools
fakeroot fakechroot sudo
# kernel
-#if DISTRIBUTION lenny squeeze sid
aufs-tools
-#endif
-#if DISTRIBUTION lenny
-aufs-source
-#endif
qemu kqemu-source
kvm kvm-source
squashfs-tools
-#if DISTRIBUTION lenny
-squashfs-source
-#endif
#linux-headers-2.6-all
# some other stuff
diff --git a/lists/debian-live-pxe-server b/lists/debian-live-pxe-server
index 91d9be5..586f38c 100644
--- a/lists/debian-live-pxe-server
+++ b/lists/debian-live-pxe-server
@@ -5,18 +5,10 @@
bind9
-#if DISTRIBUTION lenny
-dhcp3-server
-#endif
-#if DISTRIBUTION squeeze wheezy sid
isc-dhcp-server
-#endif
-
nfs-kernel-server
syslinux-common
tftpd-hpa
-#if DISTRIBUTION squeeze wheezy sid
debian-installer-netboot-amd64
debian-installer-netboot-i386
-#endif
diff --git a/lists/gnome b/lists/gnome
index d003a38..98b324f 100644
--- a/lists/gnome
+++ b/lists/gnome
@@ -3,9 +3,6 @@
## LH: GNOME Desktop
#include <gnome-core>
-#if DISTRIBUTION lenny
-gdm-themes
-#endif
gnome-desktop-environment gnome-screensaver gnome-themes-extras
#if MODE debian
system-config-printer
diff --git a/lists/gnome-core b/lists/gnome-core
index faa7774..525f4e2 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -4,11 +4,6 @@
#include <standard-x11>
gnome-core
-#if DISTRIBUTION lenny
-gdm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
gdm3
-#endif
desktop-base
gnome-themes
diff --git a/lists/gnome-full b/lists/gnome-full
index bd717cf..1f4c6d7 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -4,9 +4,4 @@
#include <gnome>
gnome
-#if DISTRIBUTION lenny
-gdm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
gdm3
-#endif
diff --git a/lists/kde b/lists/kde
index b781fe8..3778e78 100644
--- a/lists/kde
+++ b/lists/kde
@@ -3,11 +3,6 @@
## LH: KDE
#include <kde-core>
-#if DISTRIBUTION lenny
-kde
-#endif
-#if DISTRIBUTION squeeze wheezy sid
kde-standard
-#endif
kdm
desktop-base
diff --git a/lists/kde-core b/lists/kde-core
index 174eeb6..68d07df 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -3,11 +3,6 @@
## LH: KDE Core
#include <standard-x11>
-#if DISTRIBUTION lenny
-kde-core
-#endif
-#if DISTRIBUTION squeeze wheezy sid
kde-plasma-desktop
-#endif
kdm
desktop-base
diff --git a/lists/kde-full b/lists/kde-full
index b375ee2..fb44f19 100644
--- a/lists/kde-full
+++ b/lists/kde-full
@@ -3,9 +3,5 @@
## LH: KDE Full
#include <kde>
-#if DISTRIBUTION lenny
koffice
-#endif
-#if DISTRIBUTION squeeze wheezy sid
kde-full
-#endif
diff --git a/lists/lxde b/lists/lxde
index 3884bfd..9d983ce 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -5,10 +5,5 @@
lxde
gdm
-#if DISTRIBUTION lenny
-lxnm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
network-manager-gnome
-#endif
desktop-base
diff --git a/lists/minimal b/lists/minimal
index 6a48fa4..b3c9eea 100644
--- a/lists/minimal
+++ b/lists/minimal
@@ -13,6 +13,4 @@ eject file user-setup sudo
gnupg
#endif
-#if DISTRIBUTION wheezy
live-config
-#endif
diff --git a/lists/rescue b/lists/rescue
index 736924b..ccb4f0c 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -7,14 +7,10 @@
#include <debian-forensics>
# Other forensic packages
-#if DISTRIBUTION lenny squeeze wheezy sid
scalpel
-#endif
# Bootloaders
-#if DISTRIBUTION lenny squeeze wheezy sid
syslinux-common
-#endif
#if ARCHITECTURE amd64 i386
grub lilo mbr syslinux
#endif
@@ -99,9 +95,6 @@ gkermit
netcat
netcat6
netmask
-#if DISTRIBUTION lenny
-openntpd
-#endif
openssl
openvpn
strongswan
@@ -130,17 +123,11 @@ iptables
knockd
portsentry
vlan
-#if DISTRIBUTION lenny
-zorp
-#endif
# Essential networking
netbase
rdate
ntpdate
-#if DISTRIBUTION lenny
-msntp
-#endif
dhcp3-client
ppp
pppconfig
@@ -211,9 +198,6 @@ hping3
icmpush
macchanger
medusa
-#if DISTRIBUTION lenny
-ndiff
-#endif
netdiag
netpipe-tcp
nmap
@@ -221,10 +205,6 @@ ndisc6
ngrep
p0f
packit
-#if DISTRIBUTION lenny
-paketto
-sing
-#endif
python-scapy
xprobe
@@ -251,9 +231,7 @@ sysfsutils
udftools
xfsdump
xfsprogs
-#if DISTRIBUTION sid
btrfs-tools
-#endif
cryptsetup
dmraid
e2fsprogs
@@ -323,12 +301,7 @@ hostap-utils
hostapd
# Flab
-#if DISTRIBUTION lenny
-emacs22-nox
-#endif
-#if DISTRIBUTON squeeze wheezy sid
emacs23-nox
-#endif
build-essential gdb gfortran gnat
#if ARCHITECTURE i386
diff --git a/lists/standard-x11 b/lists/standard-x11
index 1f76f05..bddc006 100644
--- a/lists/standard-x11
+++ b/lists/standard-x11
@@ -5,7 +5,4 @@
xorg xresprobe menu
alsa-base alsa-utils
-
-#if DISTRIBUTION squeeze wheezy sid
keyboard-configuration
-#endif
diff --git a/lists/studio b/lists/studio
index f7e4e5f..d6251f9 100644
--- a/lists/studio
+++ b/lists/studio
@@ -8,9 +8,6 @@
alsa-tools
alsa-tools-gui
-#if DISTRIBUTION sid
-ardour-gtk
-#endif
ams
amsynth
artsbuilder
diff --git a/lists/xfce b/lists/xfce
index 86561a8..77b807b 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -4,10 +4,5 @@
#include <standard-x11>
xfce4
-#if DISTRIBUTION lenny
-gdm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
gdm3
-#endif
desktop-base
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 9868041..e1b7b09 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -367,17 +367,8 @@ then
case "${LB_MODE}" in
debian)
- case "${LB_DISTRIBUTION}" in
- lenny)
- DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup kbd"
- DI_PACKAGES="${DI_PACKAGES} console-setup kbd"
- ;;
-
- *)
- DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd"
- DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd"
- ;;
- esac
+ DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd"
+ DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd"
;;
esac
diff --git a/scripts/build/lb_binary_win32-loader b/scripts/build/lb_binary_win32-loader
index 5c1de98..d3a8bd8 100755
--- a/scripts/build/lb_binary_win32-loader
+++ b/scripts/build/lb_binary_win32-loader
@@ -45,20 +45,10 @@ Create_lockfile .lock
case "${LB_ARCHITECTURE}" in
amd64|i386)
- case "${LB_DISTRIBUTION}" in
- lenny)
- WIN32_LOADER="/usr/lib/win32-loader"
- ;;
-
- *)
- WIN32_LOADER="/usr/share/win32"
- ;;
- esac
-
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
# Checking depends
- Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader
+ Check_package chroot/usr/share/win32/win32-loader.exe win32-loader
# Restoring cache
Restore_cache cache/packages_binary
@@ -67,9 +57,9 @@ case "${LB_ARCHITECTURE}" in
Install_package
# Copying win32-loader
- cp -r chroot/${WIN32_LOADER}/* binary
+ cp -r chroot/usr/share/win32/* binary
else
- cp -r ${WIN32_LOADER}/* binary
+ cp -r usr/share/win32/* binary
fi
mv binary/win32-loader.exe binary/setup.exe
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index c0052da..47124be 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -211,33 +211,8 @@ fi
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
# This is a temporary hack to get rid of fstab;
- # needs cleanup in live-initramfs first to proper fix.
+ # needs cleanup in live-boot first to proper fix.
rm -f chroot/etc/fstab
-
- # There is a timing issue somewhere when using live-installer
- # and the apt-get update waypoint: At the time when we're installing
- # bootloader, it tries to fetch them from the net but the e.g.
- # 'chroot /target apt-get install grub' fails because of missing
- # packages lists. As a very cheap workaround, we ensure that the
- # bootloader is already installed in the image. Very ugly, but it's to
- # late to fix it in d-i because lenny rc2 has been already released.
- case "${LB_ARCHITECTURE}" in
- amd64|i386)
- case "${LB_BOOTLOADER}" in
- grub)
- Apt install grub
- ;;
-
- grub2)
- Apt install grub2
- ;;
- esac
- ;;
-
- powerpc)
- Apt install yaboot
- ;;
- esac
fi
if [ "${LB_EXPOSED_ROOT}" = "true" ]
diff --git a/scripts/build/lb_chroot_localization b/scripts/build/lb_chroot_localization
index ffe3318..6aded7a 100755
--- a/scripts/build/lb_chroot_localization
+++ b/scripts/build/lb_chroot_localization
@@ -612,12 +612,7 @@ then
Check_installed chroot/usr/bin/icedove icedove
if [ $INSTALL_STATUS -eq 0 ]
then
- if [ "${LB_DISTRIBUTION}" = lenny ]
- then
- Check_package "" icedove-locale-"${ICEDOVE}"
- else
- Check_package "" icedove-l10n-"${ICEDOVE}"
- fi
+ Check_package "" icedove-l10n-"${ICEDOVE}"
fi
;;
@@ -639,11 +634,6 @@ then
esac
done
- if [ "${LB_DISTRIBUTION}" = "lenny" ]
- then
- Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n
- fi
-
Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
# Restoring cache
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index dda7a95..f46b829 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -379,8 +379,8 @@ Local_arguments ()
shift 2
case "${LB_DISTRIBUTION}" in
- lenny-backports)
- LB_DISTRIBUTION="lenny"
+ squeeze-backports)
+ LB_DISTRIBUTION="squeeze"
BACKPORTS="true"
;;
esac
--
live-build
More information about the debian-live-changes
mailing list