Adding live-package 0.99.7-1.

26 files changed, 75 insertions, 34 deletions

diff --git a/AUTHORS b/AUTHORS
index 7e03b55d5..37156f1dd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,5 +6,6 @@ Main Authors:
 Patches (alphabetical order):
 
 	* Alex Owen <r.a.owen@qmul.ac.uk>
+	* Bas Wijnen <wijnen@debian.org>
 	* Frederic Lehobey <Frederic.Lehobey@free.fr>
 	* Jason D. Clinton <me@jasonclinton.com>
diff --git a/ChangeLog b/ChangeLog
index 47062eb2e..b22c8cf42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-09-25 Daniel Baumann <daniel@debian.org>
+
+	* Removed now unused initramfs-tools hack.
+	* Simplified xorg check based on distribution rather than version.
+	* Added fix from Bas Wijnen <wijnen@debian.org> for space handling in
+	  arguments.
+	* Fixed package list handling similar to the fix suggested by Alex Owen
+	  <r.alex.owen@gmail.com>.
+
+2006-09-08 Marco Amadori <marco.amadori@gmail.com>
+
+	* 13hack.sh: initramfs-tools hack, check added for xorg.
+
+2006-09-15 Daniel Baumann <daniel@debian.org>
+
+	* Added eject to minimal package selection.
+
+2006-09-14 Daniel Baumann <daniel@debian.org>
+
+	* Adjustements for linux 2.6.17 testing propagation.
+
 2006-09-08 Marco Amadori <marco.amadori@gmail.com>
 
 	* 23net.sh: Fixed binary missing directory creation.
diff --git a/debian/changelog b/debian/changelog
index cd9bf693d..cce7f00b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+live-package (0.99.7-1) unstable; urgency=medium
+
+  * New upstream release:
+    - removes the now outdated handling of testing specific kernels
+      (Closes: #387562).
+    - added fix from Bas Wijnen <wijnen@debian.org> for space handling in
+      arguments (Closes: #388204).
+    - fixes package list handling similar to the fix suggested by Alex Owen
+      <r.alex.owen@gmail.com> (Closes: #388060).
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 18 Sep 2006 00:00:00 +0200
+
 live-package (0.99.6-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/src/lists/gnome b/src/lists/gnome
index 3946fe4ad..1f8eb58a8 100644
--- a/src/lists/gnome
+++ b/src/lists/gnome
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/gnome - package list for make-live(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/gnome-core b/src/lists/gnome-core
index 86aedb6b4..13af34ed6 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/gnome-full b/src/lists/gnome-full
index a2b8157e4..8f685df93 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde b/src/lists/kde
index 88f95aa0b..884d06d1c 100644
--- a/src/lists/kde
+++ b/src/lists/kde
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/kde - package list for make-live(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde-core b/src/lists/kde-core
index 51365bac9..514f4f243 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde-core-i18n b/src/lists/kde-core-i18n
index f41be9b7a..bd697bea8 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde-extra b/src/lists/kde-extra
index 12d37f98d..ad08e3cab 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde-extra-i18n b/src/lists/kde-extra-i18n
index cfe990bf6..22eded3b6 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde-full b/src/lists/kde-full
index 5ca492610..b1749157b 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde-full-i18n b/src/lists/kde-full-i18n
index 92aa5b167..08d4ceacd 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/kde-i18n b/src/lists/kde-i18n
index fffd35fc8..039b6f786 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/minimal b/src/lists/minimal
index cb9ec885f..12891075b 100644
--- a/src/lists/minimal
+++ b/src/lists/minimal
@@ -1,4 +1,4 @@
 # /usr/share/make-live/lists/minimal - package list for make-live(8)
 
 # Minimal
-sudo
+eject sudo
diff --git a/src/lists/standard b/src/lists/standard
index 209291f60..75df57fb0 100644
--- a/src/lists/standard
+++ b/src/lists/standard
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/standard - package list for make-live(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/standard-i18n b/src/lists/standard-i18n
index 11b5e15e2..c0ef5caf5 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(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/x11 b/src/lists/x11
index 124b3e4cb..12143f1c7 100644
--- a/src/lists/x11
+++ b/src/lists/x11
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/x11 - package list for make-live(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/x11-core b/src/lists/x11-core
index 23de7d804..cadd3bb80 100644
--- a/src/lists/x11-core
+++ b/src/lists/x11-core
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/x11-core - package list for make-live(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/lists/xfce b/src/lists/xfce
index ff9fcd479..cbd925913 100644
--- a/src/lists/xfce
+++ b/src/lists/xfce
@@ -1,7 +1,7 @@
 # /usr/share/make-live/lists/xfce - package list for make-live(8)
 
 # Minimal
-sudo
+eject sudo
 
 # Standard
 locales
diff --git a/src/main.sh b/src/main.sh
index 524ec3ad3..06ec1ac8b 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -28,7 +28,7 @@ set -e
 BASE="/usr/share/make-live"
 CONFIG="/etc/make-live.conf"
 PROGRAM="`basename ${0}`"
-VERSION="0.99.6"
+VERSION="0.99.7"
 
 CODENAME_OLDSTABLE="woody"
 CODENAME_STABLE="sarge"
@@ -158,7 +158,7 @@ Configuration ()
 
 Main ()
 {
-	ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- ${@}`"
+	ARGUMENTS="`getopt --longoptions root:,type:,architecture:,bootappend:,config:,chroot:,distribution:,filesystem:,flavour:,hook:,include-chroot:,include-image:,kernel:,manifest:,mirror:,mirror-security:,output:,packages:,package-list:,proxy-ftp:,proxy-http:,section:,server-address:,server-path:,templates:,with-generic-indices,without-generic-indices,with-source,without-source,help,usage,version --name=${PROGRAM} --options r:t:a:b:c:d:f:k:m:o:p:s:huv --shell sh -- "${@}"`"
 
 	if [ "${?}" != "0" ]
 	then
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index 6e54c137b..fd58883ee 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -107,7 +107,7 @@ Defaults ()
 				;;
 
 			amd64)
-				if [ "${LIVE_DISTRIBUTION}" = "unstable" ]
+				if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "testing" ]
 				then
 					LIVE_KERNEL="amd64"
 				else
@@ -176,19 +176,22 @@ Defaults ()
 	# Check for package lists
 	if [ -z "${LIVE_PACKAGE_LIST}" ]
 	then
-		LIVE_PACKAGE_LIST="${BASE}/lists/standard"
-	else
 		if [ "${LIVE_FLAVOUR}" = "minimal" ]
 		then
 			LIVE_PACKAGE_LIST="${BASE}/lists/minimal"
-		fi
-
-		if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ]
-		then
-			LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}"
 		else
 			LIVE_PACKAGE_LIST="${BASE}/lists/standard"
 		fi
+	else
+		if [ ! -r "${LIVE_PACKAGE_LIST}" ]
+		then
+			if [ -r "${BASE}/lists/${LIVE_PACKAGE_LIST}" ]
+			then
+				LIVE_PACKAGE_LIST="${BASE}/lists/${LIVE_PACKAGE_LIST}"
+			else
+				LIVE_PACKAGE_LIST="${BASE}/lists/standard"
+			fi
+		fi
 	fi
 
 	# Set debian sections
diff --git a/src/scripts/13hack.sh b/src/scripts/13hack.sh
index 3468c57d9..bd3a33537 100644
--- a/src/scripts/13hack.sh
+++ b/src/scripts/13hack.sh
@@ -11,7 +11,8 @@
 
 Hack_xorg ()
 {
-	if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ] #&& [ "${LIVE_DISTRIBUTION_EXPERIMENTAL}" != "yes" ]
+	# xserver-xorg << 7.1
+	if [ -f "${LIVE_CHROOT}/etc/X11/xorg.conf" ] && [ "${LIVE_DISTRIBUTION}" = "testing" ]
 	then
 		# Comment "BusID" line and set driver to "vesa"
 		sed -i -e 's/\(^.*BusID.*\)/#\1/g' -e '/Section "Device"/,/EndSection/ s/\(.*Driver.*"\).*\(".*\)/\1vesa\2/g' "${LIVE_CHROOT}"/etc/X11/xorg.conf
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index 6357f0908..930315cc0 100644
--- a/src/scripts/21image.sh
+++ b/src/scripts/21image.sh
@@ -32,8 +32,6 @@ Indices ()
 				testing)
 					echo "deb ${LIVE_MIRROR} testing ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
 					echo "deb-src ${LIVE_MIRROR} testing ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
-					echo "deb ${LIVE_MIRROR} testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
-					echo "deb-src ${LIVE_MIRROR} testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
 					echo "deb ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
 					echo "deb-src ${LIVE_MIRROR_SECURITY} testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
 					;;
@@ -77,8 +75,6 @@ EOF
 				testing)
 					echo "deb http://ftp.debian.org/debian/ testing ${LIVE_SECTION}" > "${LIVE_CHROOT}"/etc/apt/sources.list
 					echo "deb-src http://ftp.debian.org/debian/ testing ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
-					echo "deb http://ftp.debian.org/debian/ testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
-					echo "deb-src http://ftp.debian.org/debian/ testing-proposed-updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
 					echo "deb http://security.debian.org/ testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
 					echo "deb-src http://security.debian.org/ testing/updates ${LIVE_SECTION}" >> "${LIVE_CHROOT}"/etc/apt/sources.list
 					;;
diff --git a/src/scripts/22iso.sh b/src/scripts/22iso.sh
index 96ab7778b..d990e2417 100644
--- a/src/scripts/22iso.sh
+++ b/src/scripts/22iso.sh
@@ -14,7 +14,10 @@ Iso ()
 	if [ ! -f "${LIVE_ROOT}"/.stage/image_binary ]
 	then
 		mkdir -p "${LIVE_ROOT}"/binary/casper
-		mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper/
+		for manifest in "${LIVE_ROOT}"/filesystem.manifest*
+		do
+			mv "${manifest}" "${LIVE_ROOT}"/binary/casper/
+		done
 
 		# Switching package indices to default
 		if [ "${LIVE_GENERIC_INDICES}" = "yes" ]
diff --git a/src/scripts/23net.sh b/src/scripts/23net.sh
index 0b571efd5..c4169ecdd 100644
--- a/src/scripts/23net.sh
+++ b/src/scripts/23net.sh
@@ -15,7 +15,11 @@ Net ()
 	then
 		mkdir -p "${LIVE_ROOT}"/binary/casper
 		cp -r "${LIVE_TEMPLATES}"/common/* "${LIVE_ROOT}"/binary
-		mv "${LIVE_ROOT}"/filesystem.manifest* "${LIVE_ROOT}"/binary/casper
+		
+		for manifest in "${LIVE_ROOT}"/filesystem.manifest*
+		do
+			mv "${manifest}" "${LIVE_ROOT}"/binary/casper/
+		done
 
 		# Installing smbfs
 		Chroot_exec "apt-get install --yes smbfs"