[Debian-live-changes] r2097 - in dists/trunk/live-initramfs: . debian docs manpages scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-15 10:02:42 +0000 (Fri, 15 Jun 2007)
New Revision: 2097

Modified:
   dists/trunk/live-initramfs/Makefile
   dists/trunk/live-initramfs/debian/changelog
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/docs/ChangeLog.casper
   dists/trunk/live-initramfs/manpages/live-initramfs.en.7
   dists/trunk/live-initramfs/manpages/live-snapshot.en.1
   dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates
Log:


Modified: dists/trunk/live-initramfs/Makefile
===================================================================
--- dists/trunk/live-initramfs/Makefile	2007-06-14 21:05:13 UTC (rev 2096)
+++ dists/trunk/live-initramfs/Makefile	2007-06-15 10:02:42 UTC (rev 2097)
@@ -118,7 +118,7 @@
 	set -e; for MANPAGE in manpages/*.en.*; \
 	do \
 		sed -i	-e 's/2007\\-06\\-11/2007\\-06\\-18/' \
-			-e 's/1.90.1/1.90.2/' \
+			-e 's/1.91.1/1.91.2/' \
 		$$MANPAGE; \
 	done
 

Modified: dists/trunk/live-initramfs/debian/changelog
===================================================================
--- dists/trunk/live-initramfs/debian/changelog	2007-06-14 21:05:13 UTC (rev 2096)
+++ dists/trunk/live-initramfs/debian/changelog	2007-06-15 10:02:42 UTC (rev 2097)
@@ -1,4 +1,4 @@
-live-initramfs (1.90.2-1) UNRELEASED; urgency=medium
+live-initramfs (1.91.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-06-14 21:05:13 UTC (rev 2096)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-06-15 10:02:42 UTC (rev 2097)
@@ -1,3 +1,7 @@
+2007-06-15  Daniel Baumann  <daniel at debian.org>
+
+	* Merging changes from casper 1.91.
+
 2007-06-14  Daniel Baumann  <daniel at debian.org>
 
 	* scripts/live-bottom/18hostname:

Modified: dists/trunk/live-initramfs/docs/ChangeLog.casper
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-06-14 21:05:13 UTC (rev 2096)
+++ dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-06-15 10:02:42 UTC (rev 2097)
@@ -1,3 +1,11 @@
+casper (1.91) gutsy; urgency=low
+
+  * Fix Maintainer field (ubuntu-devel-discuss, not ubuntu-devel).
+  * Remember to strip directories from paths when dealing with driver update
+    .debs (LP: #120217).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Thu, 14 Jun 2007 09:51:33 +0100
+
 casper (1.90) gutsy; urgency=low
 
   * Added to 22screensaver, to stop the screen automatically locking.

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-06-14 21:05:13 UTC (rev 2096)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-06-15 10:02:42 UTC (rev 2097)
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-06\-18" "1.90.2" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-06\-18" "1.91.1" "live\-initramfs"
 
 .SH NAME
 live\-initramfs \- Debian Live initramfs hook

Modified: dists/trunk/live-initramfs/manpages/live-snapshot.en.1
===================================================================
--- dists/trunk/live-initramfs/manpages/live-snapshot.en.1	2007-06-14 21:05:13 UTC (rev 2096)
+++ dists/trunk/live-initramfs/manpages/live-snapshot.en.1	2007-06-15 10:02:42 UTC (rev 2097)
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-06\-18" "1.90.2" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-06\-18" "1.91.1" "live\-initramfs"
 
 .SH NAME
 live\-snapshot \- a simple script to ease persistence usage

Modified: dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates	2007-06-14 21:05:13 UTC (rev 2096)
+++ dists/trunk/live-initramfs/scripts/live-bottom/40install_driver_updates	2007-06-15 10:02:42 UTC (rev 2097)
@@ -38,8 +38,10 @@
 # We cannot leave packages in a bad state. So if the install fails, remove
 # it. This will get caught in live.log.
 for deb in "/root$install_dir"/*; do
-	if ! chroot /root dpkg -i "$install_dir/$deb"; then
-		chroot /root dpkg -P "${deb%%_*}"
+	[ -f "$deb" ] || continue
+	debbase="${deb##*/}"
+	if ! chroot /root dpkg -i "$install_dir/$debbase"; then
+	    chroot /root dpkg -P "${debbase%%_*}"
 	fi
 done