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

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-08 07:58:56 +0000 (Fri, 08 Jun 2007)
New Revision: 1984

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/22screensaver
Log:


Modified: dists/trunk/live-initramfs/Makefile
===================================================================
--- dists/trunk/live-initramfs/Makefile	2007-06-08 07:54:44 UTC (rev 1983)
+++ dists/trunk/live-initramfs/Makefile	2007-06-08 07:58:56 UTC (rev 1984)
@@ -118,7 +118,7 @@
 	set -e; for MANPAGE in manpages/*.en.*; \
 	do \
 		sed -i	-e 's/2007\\-06\\-04/2007\\-06\\-11/' \
-			-e 's/1.87.6/1.88.1/' \
+			-e 's/1.88.1/1.90.1/' \
 		$$MANPAGE; \
 	done
 

Modified: dists/trunk/live-initramfs/debian/changelog
===================================================================
--- dists/trunk/live-initramfs/debian/changelog	2007-06-08 07:54:44 UTC (rev 1983)
+++ dists/trunk/live-initramfs/debian/changelog	2007-06-08 07:58:56 UTC (rev 1984)
@@ -1,4 +1,4 @@
-live-initramfs (1.88.1-1) UNRELEASED; urgency=medium
+live-initramfs (1.90.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 

Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-06-08 07:54:44 UTC (rev 1983)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-06-08 07:58:56 UTC (rev 1984)
@@ -1,6 +1,7 @@
 2007-06-08  Daniel Baumann  <daniel at debian.org>
 
 	* Merging changes from casper 1.88.
+	* Merging changes from casper 1.90.
 
 2007-06-04  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/docs/ChangeLog.casper
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-06-08 07:54:44 UTC (rev 1983)
+++ dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-06-08 07:58:56 UTC (rev 1984)
@@ -1,3 +1,17 @@
+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 at 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 at ubuntu.com>  Wed, 06 Jun 2007 14:56:46 +0200
+
 casper (1.88) gutsy; urgency=low
 
   * Add default values for root_persistence, home_persistence,

Modified: dists/trunk/live-initramfs/manpages/live-initramfs.en.7
===================================================================
--- dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-06-08 07:54:44 UTC (rev 1983)
+++ dists/trunk/live-initramfs/manpages/live-initramfs.en.7	2007-06-08 07:58:56 UTC (rev 1984)
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-06\-11" "1.88.1" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-06\-11" "1.90.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-08 07:54:44 UTC (rev 1983)
+++ dists/trunk/live-initramfs/manpages/live-snapshot.en.1	2007-06-08 07:58:56 UTC (rev 1984)
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-06\-11" "1.88.1" "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

Modified: dists/trunk/live-initramfs/scripts/live-bottom/22screensaver
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/22screensaver	2007-06-08 07:54:44 UTC (rev 1983)
+++ dists/trunk/live-initramfs/scripts/live-bottom/22screensaver	2007-06-08 07:58:56 UTC (rev 1984)
@@ -33,4 +33,8 @@
     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