[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Permission to upload live-package 0.99.14-4



Hi,

live-package in etch needs some adjusting to reflect the etch release.
Please allow upload to testing, debdiff is attached.

-- 
Address:        Daniel Baumann, Burgunderstrasse 3, CH-4562 Biberist
Email:          daniel.baumann@panthera-systems.net
Internet:       http://people.panthera-systems.net/~daniel-baumann/
diff -u live-package-0.99.14/debian/changelog live-package-0.99.14/debian/changelog
--- live-package-0.99.14/debian/changelog
+++ live-package-0.99.14/debian/changelog
@@ -1,3 +1,12 @@
+live-package (0.99.14-4) testing; urgency=medium
+
+  * 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.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu,  8 Mar 2007 10:55:00 +0100
+
 live-package (0.99.14-3) unstable; urgency=high
 
   * Adding workaround for new xorg packages by including xserver-xorg-input-all
only in patch2:
unchanged:
--- live-package-0.99.14.orig/src/main.sh
+++ live-package-0.99.14/src/main.sh
@@ -30,9 +30,9 @@
 PROGRAM="`basename ${0}`"
 VERSION="0.99.14"
 
-CODENAME_OLDSTABLE="woody"
-CODENAME_STABLE="sarge"
-CODENAME_TESTING="etch"
+CODENAME_OLDSTABLE="sarge"
+CODENAME_STABLE="etch"
+CODENAME_TESTING="lenny"
 CODENAME_UNSTABLE="sid"
 
 # Source sub scripts
only in patch2:
unchanged:
--- live-package-0.99.14.orig/src/scripts/14chroot.sh
+++ live-package-0.99.14/src/scripts/14chroot.sh
@@ -156,9 +156,6 @@
 			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
 
only in patch2:
unchanged:
--- live-package-0.99.14.orig/src/scripts/02defaults.sh
+++ live-package-0.99.14/src/scripts/02defaults.sh
@@ -86,13 +86,7 @@
 				;;
 
 			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
+				LIVE_KERNEL="amd64"
 				;;
 
 			arm)
@@ -105,8 +99,7 @@
 				;;
 
 			i386)
-				if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ] || \
-				   [ "${LIVE_DISTRIBUTION}" = "stable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_STABLE}" ]
+				if [ "${LIVE_DISTRIBUTION}" = "oldstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_OLDSTABLE}" ]
 				then
 					LIVE_KERNEL="386"
 				else

Reply to: