Adding live-initramfs 1.90.1-1.

diff --git a/Makefile b/Makefile
index 6f0c333..18ae2e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ update:
        set -e; for MANPAGE in manpages/*.en.*; \
        do \
                sed -i  -e 's/2007\\-06\\-04/2007\\-06\\-11/' \
-                       -e 's/1.87.6/1.87.7/' \
+                       -e 's/1.88.1/1.90.1/' \
                $$MANPAGE; \
        done
 

diff --git a/debian/changelog b/debian/changelog
index 52a4957..18c85ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.90.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 11 Jun 2007 00:00:00 +0200
+
 live-initramfs (1.87.6-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/docs/ChangeLog b/docs/ChangeLog
index 0009d9f..c281ef9 100644 (file)
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-08  Daniel Baumann  <daniel@debian.org>
+
+       * Merging changes from casper 1.88.
+       * Merging changes from casper 1.90.
+       * hooks/live:
+         - Added force loading of ide-generic module. It is required on some
+           systems to boot (reported as needed also for some qemu versions).
+       * Uploaded 1.90.1-1.
+
 2007-06-04  Daniel Baumann  <daniel@debian.org>
 
        * Uploaded 1.87.6-1.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index e308906..c4174e6 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,31 @@
+casper (1.90) gutsy; urgency=low
+
+  * Added to 22screensaver, to stop the screen automatically locking.
+    Fixes LP: #13497 for kubuntu as well.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Thu, 07 Jun 2007 00:50:42 +1000
+
+casper (1.89) UNRELEASED; urgency=low
+
+  * Update Maintainer field to reflect reality; this package is no longer
+    maintained by me.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 06 Jun 2007 14:56:46 +0200
+
+casper (1.88) gutsy; urgency=low
+
+  * Add default values for root_persistence, home_persistence,
+    root_snapshot_label, and home_snapshot_label, and parse the persistent
+    command-line option, which went missing in the last merge from Debian.
+    This goes some way towards LP #84591 but doesn't quite fix it for me
+    since the USB stick inexplicably doesn't appear until a little too late.
+  * Use 'losetup -f' instead of walking /sys/block/loop*. Requires
+    busybox-initramfs 1:1.1.3-4ubuntu3.
+  * Install temporary workaround for /dev/loop* breakage in post-2.6.21
+    kernels (LP: #118561).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 04 Jun 2007 16:26:59 +0100
+
 casper (1.87) feisty; urgency=low
 
   [ Colin Watson ]

diff --git a/hooks/live b/hooks/live
index d47e6e9..e94590d 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -83,6 +83,7 @@ manual_add_modules nls_utf8
 manual_add_modules vfat
 
 # Hardware: cdrom
+force_load ide-generic
 manual_add_modules ide-cd
 manual_add_modules ohci1394
 manual_add_modules sbp2

diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7
index c65bf09..fb4a7d6 100644 (file)
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-06\-04" "1.87.6" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-06\-11" "1.90.1" "live\-initramfs"
 
 .SH NAME
 live\-initramfs \- Debian Live initramfs hook

diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1
index 7b82da9..737edee 100644 (file)
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-06\-04" "1.87.6" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-06\-11" "1.90.1" "live\-initramfs"
 
 .SH NAME
 live\-snapshot \- a simple script to ease persistence usage

diff --git a/scripts/live-bottom/22screensaver b/scripts/live-bottom/22screensaver
index 51dfbce..c800bfb 100755 (executable)
--- a/scripts/live-bottom/22screensaver
+++ b/scripts/live-bottom/22screensaver
@@ -33,4 +33,8 @@ if [ -n "$gnome_screensaver_version" ]; then
     chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
 fi
 
+if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
+    printf "[ScreenSaver]\nLock=false\n" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kdesktoprc
+fi
+
 log_end_msg