From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 18:40:20 +0000 (+0200)
Subject: Adding upstream version 1.96.1.
X-Git-Tag: upstream/1.96.1^0
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=7f7d5b8704823aa1bbbfec8390ee7fca5bc8afb5;p=live-boot-grml.git

Adding upstream version 1.96.1.
---

diff --git a/Makefile b/Makefile
index 7c0d1c3..f85a5f4 100644
--- a/Makefile
+++ b/Makefile
@@ -108,9 +108,9 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt manpages/*.en.*; \
 	do \
-		sed -i	-e 's/2007\\-08\\-13/2007\\-08\\-20/' \
-			-e 's/13.08.2007/20.08.2007/' \
-			-e 's/1.95.3/1.95.4/' \
+		sed -i	-e 's/2007\\-08\\-20/2007\\-08\\-27/' \
+			-e 's/20.08.2007/27.08.2007/' \
+			-e 's/1.96.1/1.96.2/' \
 		$$FILE; \
 	done
 
diff --git a/docs/ChangeLog b/docs/ChangeLog
index ac88a8d..6d28a06 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,5 +1,10 @@
 2007-08-21  Daniel Baumann  <daniel@debian.org>
 
+	* Merging changes from casper 1.96.
+	* Uploaded 1.96.1-1.
+
+2007-08-21  Daniel Baumann  <daniel@debian.org>
+
 	* scripts/live:
 	  - Applied patch from Jesse W. Hathaway <jesse@mbuki-mvuki.org> to
 	    not use nfsro with kernels larger than 2.6.22 (where unionfs 2.x
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 2dcc059..be2d6ca 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,8 +1,20 @@
+casper (1.96) gutsy; urgency=low
+
+  [ Colin Watson ]
+  * Fix name and executability of timezone script.
+
+  [ Jonathan Riddell ]
+  * In 10adduser add About Kubuntu document to desktop and remove
+    restricted-manager autostart files
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 07 Aug 2007 12:51:02 +0100
+
 casper (1.95) gutsy; urgency=low
 
   * Fix regex syntax error while looking for non-CD devices for driver
     updates.
   * Fix ip= boot parameter, documented but not properly merged from Debian.
+    (LP: #128689).
 
  -- Colin Watson <cjwatson@ubuntu.com>  Fri, 27 Jul 2007 15:03:41 +0100
 
diff --git a/docs/parameters.txt b/docs/parameters.txt
index 8c2e13b..032891e 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.95.3-1 on 2007-07-30.
+Updated for live-initramfs 1.96.1-1 on 2007-07-30.
 
 These options (can be combined) work from the bootloader prompt:
 
diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7
index e0a61e1..923b054 100644
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-08\-13" "1.95.3" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-08\-20" "1.96.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 8c62c13..7f7fe3f 100644
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-08\-13" "1.95.3" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-08\-20" "1.96.1" "live\-initramfs"
 
 .SH NAME
 live\-snapshot \- a simple script to ease persistence usage
diff --git a/scripts/live-bottom/10adduser b/scripts/live-bottom/10adduser
index 2fabbb3..2065e7a 100755
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -108,4 +108,8 @@ if [ -L /root/home/$USERNAME/Examples ]; then
     mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
 fi
 
+if [ -f "/root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved" ]; then
+    chroot /root install -D -o $USERNAME -g $USERNAME /root/usr/share/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop.tobemoved /home/$USERNAME/Desktop/about-kubuntu.desktop
+fi
+
 log_end_msg
diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
new file mode 100755
index 0000000..d7c75c0
--- /dev/null
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="Disabling restricted-manager..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+log_begin_msg "$DESCRIPTION"
+
+rm -f /root/usr/share/autostart/restricted-manager.desktop
+
+rm -f /root/usr/share/autostart/restricted-manager-kde.desktop
+
+log_end_msg