Adding live-initramfs 1.99.1-1.

diff --git a/Makefile b/Makefile
index a3918eb..70f8b3a 100644 (file)
--- 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\\-27/2007\\-09\\-03/' \
-                       -e 's/27.08.2007/03.09.2007/' \
-                       -e 's/1.96.2/1.96.3/' \
+               sed -i  -e 's/2007\\-09\\-03/2007\\-09\\-10/' \
+                       -e 's/03.09.2007/10.09.2007/' \
+                       -e 's/1.99.1/1.99.2/' \
                $$FILE; \
        done
 

diff --git a/debian/changelog b/debian/changelog
index b384977..ce74be6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.99.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon,  3 Sep 2007 00:00:00 +0200
+
 live-initramfs (1.96.2-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/docs/ChangeLog b/docs/ChangeLog
index 5969aec..ce612a1 100644 (file)
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-01  Daniel Baumann  <daniel@debian.org>
+
+       * Merging changes from casper 1.97, 1.98 and 1.99.
+       * Uploaded 1.99.1-1.
+
 2007-08-29  Daniel Baumann  <daniel@debian.org>
 
        * scripts/live-bottom/12fstab:

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index be2d6ca..5d0d286 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,25 @@
+casper (1.99) gutsy; urgency=low
+
+  [ Luke Yelavich ]
+  * scripts/casper-bottom/30accessibility &
+    ubiquity-hooks/30accessibility:
+    - Change gconf setting used to automatically start Orca (LP: #131808).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 31 Aug 2007 13:09:46 +0100
+
+casper (1.98) gutsy; urgency=low
+
+  * Load /preseed.cfg if it exists in the initramfs.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 29 Aug 2007 16:18:27 +0100
+
+casper (1.97) gutsy; urgency=low
+
+  * Fix paths in scripts/casper-bottom/10adduser and
+    scripts/casper-bottom/38disable_restricted_manager
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 29 Aug 2007 15:26:33 +0100
+
 casper (1.96) gutsy; urgency=low
 
   [ Colin Watson ]

diff --git a/docs/parameters.txt b/docs/parameters.txt
index 5179360..dc66669 100644 (file)
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.96.2-1 on 2007-07-30.
+Updated for live-initramfs 1.96.3-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 d4577e9..4bb6ab3 100644 (file)
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-08\-27" "1.96.2" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-09\-03" "1.96.3" "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 4b873ed..c9eec1c 100644 (file)
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-08\-27" "1.96.2" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-09\-03" "1.96.3" "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 2065e7a..0f28def 100755 (executable)
--- a/scripts/live-bottom/10adduser
+++ b/scripts/live-bottom/10adduser
@@ -109,7 +109,7 @@ if [ -L /root/home/$USERNAME/Examples ]; then
 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
+    chroot /root install -D -o $USERNAME -g $USERNAME /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/24preseed b/scripts/live-bottom/24preseed
index 1e80a17..55fbfc3 100755 (executable)
--- a/scripts/live-bottom/24preseed
+++ b/scripts/live-bottom/24preseed
@@ -26,6 +26,10 @@ log_begin_msg "Loading preseed file..."
 
 # live-initramfs script
 
+if [ -e /preseed.cfg ]; then
+       chroot /root debconf-set-selections < /preseed.cfg
+fi
+
 if [ -f "/root/${LOCATION}" ]; then
     chroot /root debconf-set-selections < "/root/${LOCATION}"
 fi

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 8701e87..ac8d12e 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -64,7 +64,7 @@ case ${ACCESS} in
                         # Moderate Visual Impairment
                         access=v2)
                         gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
+                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
                         if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]; then
                             sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
                         fi
@@ -76,13 +76,13 @@ case ${ACCESS} in
                         # Disabled for now, until we know eSpeak works.
                         #gct -s -t bool /desktop/gnome/sound/enable_esd false
                         gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
+                       gct -s -t bool /desktop/gnome/applications/at/visual/startup true
                         gct -s -t bool /apps/gksu/disable-grab true
                         ;;
                         # Braille
                         braille=ask)
                         gct -s -t bool /desktop/gnome/interface/accessibility true
-                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
+                        gct -s -t bool /desktop/gnome/applications/at/visual/startup true
                         if [ -e /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py ]; then
                             sed -i '/^enableSpeech\W/ s/True/False/;/^enableBraille/ s/False/True/' /root/usr/share/pycentral/gnome-orca/site-packages/orca/settings.py
                         fi

diff --git a/scripts/live-bottom/38disable_restricted_manager b/scripts/live-bottom/38disable_restricted_manager
index d7c75c0..2f2db35 100755 (executable)
--- a/scripts/live-bottom/38disable_restricted_manager
+++ b/scripts/live-bottom/38disable_restricted_manager
@@ -20,8 +20,8 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-rm -f /root/usr/share/autostart/restricted-manager.desktop
+rm -f /root/etc/xdg/autostart/restricted-manager.desktop
 
-rm -f /root/usr/share/autostart/restricted-manager-kde.desktop
+rm -f /root/etc/xdg/autostart/restricted-manager-kde.desktop
 
 log_end_msg