Adding live-package 0.99.15-1.

29 files changed, 85 insertions, 64 deletions

diff --git a/ChangeLog b/ChangeLog
index 09d583ff2..957d16d29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-01-16 Daniel Baumann <daniel@debian.org>
+
+	* Switched default distribution back to unstable, as unstable is usable
+	  again from the kernel point of view.
+	* Added file to the minimal package list.
+
+2007-01-04 Daniel Baumann <daniel@debian.org>
+
+	* Added workaround for new xorg packages by including
+	  xserver-xorg-input-all and xserver-xorg-video-all in all X11 package
+	  lists. See #405639 for more information.
+	* Added xdebconfigurator to all X11 package lists.
+	* Adding workaround for initrd backup files.
+
 2006-11-05 Daniel Baumann <daniel@debian.org>
 
 	* Applied patch from Markus Bauer <bauer-markus@web.de>:
diff --git a/debian/changelog b/debian/changelog
index 8350ce33c..fe1fc3442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-live-package (0.99.14-4) testing; urgency=medium
+live-package (0.99.15-1) unstable; urgency=low
 
-  * 02defaults.sh: Updated kernel flavours to match etch.
-  * 14chroot.sh: Removed xorg hack, not needed in etch.
-  * 14chroot.sh: Fixed misspelling of aptitude.
-  * main.sh: Updated release codenames to match etch.
+  * New upstream release:
+    - switched default distribution back to unstable, as unstable is usable
+      again from the kernel point of view (Closes: #400457).
+    - added file to the minimal package list (Closes: #400485).
 
- -- Daniel Baumann <daniel@debian.org>  Thu,  8 Mar 2007 10:55:00 +0100
+ -- Daniel Baumann <daniel@debian.org>  Tue, 16 Jan 2007 21:24:00 +0100
 
 live-package (0.99.14-3) unstable; urgency=high
 
diff --git a/debian/compat b/debian/compat
index b8626c4cf..7ed6ff82d 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 7beaed033..4afdd985b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: misc
 Priority: optional
 Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org>
 Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmail.com>
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 
 Package: live-package
 Architecture: all
-Depends: cdebootstrap (>= 0.3.15), genext2fs, mkisofs, squashfs-tools
+Depends: cdebootstrap, genext2fs, genisoimage, squashfs-tools
 Provides: make-live
 Description: utility to build Debian Live systems
  make-live is a utility to build Debian Live systems. It takes a Debian mirror
@@ -16,4 +16,4 @@ Description: utility to build Debian Live systems
  tarball for netboot). make-live is still in the early stage of development, but
  has basic functionality and can be run successfully.
  .
-  Homepage: <http://live.debian.net/>
+  Homepage: <http://debian-live.alioth.debian.org/>
diff --git a/debian/copyright b/debian/copyright
index 17cbf0890..d09200b06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
 This package was debianized by Daniel Baumann <daniel@debian.org> on
 Mon, 17 Jul 2006 00:00:00 +0200.
 
-It was downloaded from <http://live.debian.net/>.
+It was downloaded from <http://debian-live.alioth.debian.org/>.
 
 Copyright Holders: Daniel Baumann <daniel@debian.org>,
 		   Marco Amadori <marco.amadori@gmail.com>.
 
 License:
 
-	Copyright (C) 2006 Daniel Baumann <daniel@debian.org>
-	Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>
+	Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+	Copyright (C) 2006-2007 Marco Amadori <marco.amadori@gmail.com>
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
diff --git a/debian/rules b/debian/rules
index 1517afeb0..d2e32d59e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 upstream: # Needs svn
-	cd .. && svn co svn://live.debian.net/live-package || exit 0
+	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-package || exit 0
 	find . -type d -name .svn -exec rm -rf {} \; || exit 0
 
 build:
diff --git a/src/lists/gnome b/src/lists/gnome
index fd3fb7633..8474dd5a8 100644
--- a/src/lists/gnome
+++ b/src/lists/gnome
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/gnome - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -12,4 +12,4 @@ gnome-themes-extras
 
 rhythmbox synaptic
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/gnome-core b/src/lists/gnome-core
index 7b65ba9d0..e1a9cacc2 100644
--- a/src/lists/gnome-core
+++ b/src/lists/gnome-core
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/gnome-core - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -9,4 +9,4 @@ console-common locales
 # GNOME Core
 gdm gnome-core
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/gnome-full b/src/lists/gnome-full
index 72f07d08d..f3d17b553 100644
--- a/src/lists/gnome-full
+++ b/src/lists/gnome-full
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/gnome-full - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -9,4 +9,4 @@ console-common locales
 # GNOME Full
 gdm gnome
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/gnustep b/src/lists/gnustep
index fb3c88d6c..1c0c841bb 100644
--- a/src/lists/gnustep
+++ b/src/lists/gnustep
@@ -1,13 +1,13 @@
 # /usr/share/make-live/lists/x11-core - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
 
 # X11
-wdm x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+wdm x-window-system-core
 
 # GNUstep
 gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons
diff --git a/src/lists/kde b/src/lists/kde
index 9701dac47..2f815105e 100644
--- a/src/lists/kde
+++ b/src/lists/kde
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -9,4 +9,4 @@ console-common locales
 # KDE
 kde kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/kde-core b/src/lists/kde-core
index 9afe124b9..020f4f4b3 100644
--- a/src/lists/kde-core
+++ b/src/lists/kde-core
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde-core - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -9,4 +9,4 @@ console-common locales
 # KDE Core
 kde-core kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/lists/kde-core-i18n b/src/lists/kde-core-i18n
index e2178a25b..060232823 100644
--- a/src/lists/kde-core-i18n
+++ b/src/lists/kde-core-i18n
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde-core-i18n - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
 # KDE Core
 kde-core kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
 
 # KDE i18n
 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-extra b/src/lists/kde-extra
index dc512cb84..ca3212c3e 100644
--- a/src/lists/kde-extra
+++ b/src/lists/kde-extra
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde-extra - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -9,7 +9,7 @@ console-common locales
 # KDE
 kde kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
 
 # KDE Full
 koffice
diff --git a/src/lists/kde-extra-i18n b/src/lists/kde-extra-i18n
index cb5fe161e..56b775b78 100644
--- a/src/lists/kde-extra-i18n
+++ b/src/lists/kde-extra-i18n
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde-extra-i18n - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
 # KDE
 kde kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
 
 # KDE i18n
 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-full b/src/lists/kde-full
index f6051d207..624ff80db 100644
--- a/src/lists/kde-full
+++ b/src/lists/kde-full
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde-full - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -9,7 +9,7 @@ console-common locales
 # KDE
 kde kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
 
 # KDE Full
 koffice
diff --git a/src/lists/kde-full-i18n b/src/lists/kde-full-i18n
index 58d7b913a..aacb425e3 100644
--- a/src/lists/kde-full-i18n
+++ b/src/lists/kde-full-i18n
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde-full-i18n - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
 # KDE
 kde kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
 
 # KDE i18n
 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/kde-i18n b/src/lists/kde-i18n
index b6129e8ba..a53271937 100644
--- a/src/lists/kde-i18n
+++ b/src/lists/kde-i18n
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde-i18n - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -15,7 +15,7 @@ manpages-pl-dev manpages-pt manpages-pt-dev manpages-ru manpages-tr manpages-zh
 # KDE
 kde kdm
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
 
 # KDE i18n
 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-bg kde-i18n-bn kde-i18n-br
diff --git a/src/lists/minimal b/src/lists/minimal
index 63d30a86e..dd812796d 100644
--- a/src/lists/minimal
+++ b/src/lists/minimal
@@ -1,4 +1,4 @@
 # /usr/share/make-live/lists/minimal - package list for make-live(1)
 
 # Minimal
-eject vim-tiny sudo
+eject file sudo vim-tiny
diff --git a/src/lists/minimal-net b/src/lists/minimal-net
index fb883c515..0609035ab 100644
--- a/src/lists/minimal-net
+++ b/src/lists/minimal-net
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/minimal-net - package list for make-live(1)
 
 # Minimal
-eject vim-tiny sudo
+eject file sudo vim-tiny
 
 # Network
 bind9-host dhcp-client dnsutils ftp ifupdown iptables iputils-ping mtr-tiny
diff --git a/src/lists/standard b/src/lists/standard
index e394b57e0..22a81acff 100644
--- a/src/lists/standard
+++ b/src/lists/standard
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/standard - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
diff --git a/src/lists/standard-i18n b/src/lists/standard-i18n
index 9d1e3fc33..077a1c085 100644
--- a/src/lists/standard-i18n
+++ b/src/lists/standard-i18n
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/standard-i18n - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
diff --git a/src/lists/x11 b/src/lists/x11
index acd3d321d..759ae18d8 100644
--- a/src/lists/x11
+++ b/src/lists/x11
@@ -1,10 +1,10 @@
 # /usr/share/make-live/lists/x11 - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
 
 # X11
-xdm x-window-system xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+xdm x-window-system
diff --git a/src/lists/x11-core b/src/lists/x11-core
index ee6b31dce..af33eb0f2 100644
--- a/src/lists/x11-core
+++ b/src/lists/x11-core
@@ -1,10 +1,10 @@
 # /usr/share/make-live/lists/x11-core - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
 
 # X11
-xdm x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+xdm x-window-system-core
diff --git a/src/lists/xfce b/src/lists/xfce
index 8b288cfbf..b1f5049c4 100644
--- a/src/lists/xfce
+++ b/src/lists/xfce
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/xfce - package list for make-live(1)
 
 # Minimal
-eject sudo
+eject file sudo vim-tiny
 
 # Standard
 console-common locales
@@ -9,4 +9,4 @@ console-common locales
 # Xfce
 gdm xfce4
 
-x-window-system-core xserver-xorg-input-all xserver-xorg-video-all xdebconfigurator
+x-window-system-core
diff --git a/src/main.sh b/src/main.sh
index 7b3171f83..cfffd8337 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -30,9 +30,9 @@ CONFIG="/etc/make-live.conf"
 PROGRAM="`basename ${0}`"
 VERSION="0.99.14"
 
-CODENAME_OLDSTABLE="sarge"
-CODENAME_STABLE="etch"
-CODENAME_TESTING="lenny"
+CODENAME_OLDSTABLE="woody"
+CODENAME_STABLE="sarge"
+CODENAME_TESTING="etch"
 CODENAME_UNSTABLE="sid"
 
 # Source sub scripts
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index 9cc4c5a21..faca4769d 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -53,7 +53,7 @@ Defaults ()
 	# Set debian distribution
 	if [ -z "${LIVE_DISTRIBUTION}" ]
 	then
-		LIVE_DISTRIBUTION="testing"
+		LIVE_DISTRIBUTION="unstable"
 	fi
 
 	if [ "${LIVE_DISTRIBUTION}" = "experimental" ]
@@ -86,7 +86,13 @@ Defaults ()
 				;;
 
 			amd64)
-				LIVE_KERNEL="amd64"
+				if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \
+				   [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
+				then
+					LIVE_KERNEL="amd64"
+				else
+					LIVE_KERNEL="amd64-generic"
+				fi
 				;;
 
 			arm)
@@ -99,7 +105,8 @@ Defaults ()
 				;;
 
 			i386)
-				if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ]
+				if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \
+				   [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ]
 				then
 					LIVE_KERNEL="386"
 				else
diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh
index cc24eecf6..2e2b489f0 100644
--- a/src/scripts/14chroot.sh
+++ b/src/scripts/14chroot.sh
@@ -156,6 +156,9 @@ Chroot ()
 			Chroot_exec "${LIVE_HOOK}"
 		fi
 
+		# Temporary hacks for broken packages
+		Hack_xorg
+
 		# Add filesystem.manifest
 		Chroot_exec "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest
 
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index 5261867ec..36ca014a8 100644
--- a/src/scripts/21image.sh
+++ b/src/scripts/21image.sh
@@ -215,20 +215,17 @@ Syslinux ()
 
 Linuximage ()
 {
-	# Removing initrd backup files
-	rm -f "${LIVE_CHROOT}"/boot/initrd*bak*
-
 	case "${1}" in
 		iso)
 			# Copy linux-image
 			if [ "${LIVE_FLAVOUR}" = "minimal" ]
 			then
-				mv "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
-				mv "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
+				mv "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
+				mv "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
 				rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img
 			else
-				cp "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
-				cp "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
+				cp "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
+				cp "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
 			fi
 			;;
 
@@ -236,10 +233,10 @@ Linuximage ()
 			# Copy linux-image
 			if [ "${LIVE_FLAVOUR}" = "minimal" ]
 			then
-				mv "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
-				mv "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
+				mv "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
+				mv "${LIVE_ROOT}"/chroot/boot/initrd.img* "${LIVE_ROOT}"/tftpboot/initrd.gz
 			else
-				cp "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
+				cp "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
 				cp "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
 			fi
 			;;