Adding casper 1.79+debian-1.

10 files changed, 84 insertions, 23 deletions

diff --git a/bin/casper-reconfigure b/bin/casper-reconfigure
index c24c620..7b96e28 100755
--- a/bin/casper-reconfigure
+++ b/bin/casper-reconfigure
@@ -43,7 +43,7 @@ package="$2"
 version=$(runcommandinroot "$root" dpkg-query -W --showformat='${Version}' "$package" 2>/dev/null) || version=""
 
 if [ -z "$version" ]; then
-    echo "$0: package '$package' is not installed"
+    echo >&2 "$0: package '$package' is not installed"
     exit 0
 fi
 
diff --git a/debian/changelog b/debian/changelog
index f97e50f..38b383f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
-casper (1.77+debian-7) testing; urgency=medium
+casper (1.79+debian-1) unstable; urgency=low
 
-  * Backported two 1 line fixes (both serious bugs) from casper-1.79+debian-1
-    and casper-1.79+debian-3:
-    - It now depends also on "file" (Closes: #409308).
-    - Fix DEFCONSOLE for autoserial console, thanks to
-        "Alex Owen" <r.alex.owen@gmail.com>.
+  * New Upstream release.
+  * Reverted: "Mount the first squashfs as /rofs."
 
- -- Marco Amadori <marco.amadori@gmail.com>  Thu,  8 Feb 2007 11:19:46 +0100
+ -- Marco Amadori <marco.amadori@gmail.com>  Tue, 16 Jan 2007 12:12:34 +0100
 
 casper (1.77+debian-6) unstable; urgency=medium
 
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 32e573d..cf2fc80 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -1,3 +1,32 @@
+casper (1.79) feisty; urgency=low
+
+  [ Colin Watson ]
+  * ubiquity-hooks/30accessibility: Change /root to /target in
+    kderc_addtoprefixes (thanks, Jani Monoses).
+  * Call udevsettle after udevtrigger (thanks, Matthias Urlichs; LP:
+    #77438).
+  * Send casper-reconfigure error messages to stderr rather than stdout to
+    avoid interfering with debconf.
+
+  [ Jani Monoses ]
+  * ubiquity-hooks/30accessibility, scripts/casper-bottom/30accessibility:
+    Fix v2 option to start orca in magnifier not speech mode.
+    Add v1, v2, v3, m1 and m2 Xubuntu options
+
+  [ Tollef Fog Heen ]
+  * Apply patch from Luka Renko to support kde-guidance-powermanager and
+    ksmserver instead of klaptoprc as the latter is no longer used.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 10 Jan 2007 20:37:30 +0100
+
+casper (1.78) edgy; urgency=low
+
+  * Mount the first squashfs as /rofs. Breaks showmounts and won't work
+    properly with stacked filesystems, but works around a kernel oops with
+    multiply-mounted squashfses for Edgy.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 25 Oct 2006 12:46:05 +0100
+
 casper (1.77) edgy; urgency=low
 
   * Honour console-setup/modelcode preseeding. Needed for Malone #66719,
diff --git a/debian/control b/debian/control
index 4ce301f..0ebb148 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: casper
 Architecture: any
-Depends: initramfs-tools (>= 0.40), user-setup, sudo, lsb-base (>= 3.0-6), file
+Depends: initramfs-tools (>= 0.40), user-setup, sudo, lsb-base (>= 3.0-6)
 Conflicts: usplash (<< 0.3-0)
 Recommends: live-package
 Suggests: squashfs-tools, genext2fs
diff --git a/debian/control.debian b/debian/control.debian
index 4ce301f..0ebb148 100644
--- a/debian/control.debian
+++ b/debian/control.debian
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: casper
 Architecture: any
-Depends: initramfs-tools (>= 0.40), user-setup, sudo, lsb-base (>= 3.0-6), file
+Depends: initramfs-tools (>= 0.40), user-setup, sudo, lsb-base (>= 3.0-6)
 Conflicts: usplash (<< 0.3-0)
 Recommends: live-package
 Suggests: squashfs-tools, genext2fs
diff --git a/scripts/casper b/scripts/casper
index c462247..f070aa2 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -95,7 +95,7 @@ parse_cmdline ()
                 PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
                 ;;
             console=*)
-                export DEFCONSOLE="${x#*=}" ;;
+                export DEFCONSOLE=$(sed -e 's%.*console=%console=%' /proc/cmdline) ;;
         esac
     done
 
@@ -426,6 +426,7 @@ setup_unionfs() {
     rofsstring=${rofsstring%:}
 
     mkdir -p /cow
+
     cowdevice="tmpfs"
     cow_fstype="tmpfs"
 
diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 129ca35..116b1d6 100755
--- a/scripts/casper-bottom/23networking
+++ b/scripts/casper-bottom/23networking
@@ -33,7 +33,12 @@ iface lo inet loopback
 
 EOF
 
-udevtrigger
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    udevtrigger -Bpci -Iclass="0x02*"
+else
+    udevtrigger
+fi
+udevsettle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]; then
     parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
diff --git a/scripts/casper-bottom/30accessibility b/scripts/casper-bottom/30accessibility
index 943f5a0..8b6f875 100755
--- a/scripts/casper-bottom/30accessibility
+++ b/scripts/casper-bottom/30accessibility
@@ -51,6 +51,9 @@ case ${ACCESS} in
         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
 
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+        if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
+            cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
+        fi
         ;;
     # Moderate Visual Impairment
     v2)
@@ -58,7 +61,9 @@ case ${ACCESS} in
         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
         #gct -s -t bool /apps/gnopernicus/srcore/mag_active true
         #gct -s -t bool /apps/gnopernicus/srcore/sp_active false
-
+        if [ -e /root/usr/share/python-support/gnome-orca/orca/settings.py ]; then
+            sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/python-support/gnome-orca/orca/settings.py
+        fi
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
         ;;
     # Blindness
@@ -81,6 +86,10 @@ case ${ACCESS} in
         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
 
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+            sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
+        fi
+
         ;;
     # Motor Difficulties - pointing devices
     m2)
@@ -92,6 +101,9 @@ case ${ACCESS} in
         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
 
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+            sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
+        fi
         ;;
 esac
 
diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation
index e27e2c4..ae4badd 100755
--- a/scripts/casper-bottom/32disable_hibernation
+++ b/scripts/casper-bottom/32disable_hibernation
@@ -28,9 +28,9 @@ if [ -n "$gpm_version" ]; then
     chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_suspend false
 fi
 
-if [ -f /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kcmlaptoprc ]; then
-    sed -i s/EnableHibernate=true/EnableHibernate=false/ \
-        /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kcmlaptoprc
+if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
+    echo "disableSuspend=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
+    echo "disableHibernate=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
 fi
 
 log_end_msg
diff --git a/ubiquity-hooks/30accessibility b/ubiquity-hooks/30accessibility
index 80daccd..51f85e0 100755
--- a/ubiquity-hooks/30accessibility
+++ b/ubiquity-hooks/30accessibility
@@ -12,8 +12,8 @@ gct() {
 }
 
 kderc_addtoprefixes() {
-    if [ -e "/root/etc/kderc" ]; then
-        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc
+    if [ -e "/target/etc/kderc" ]; then
+        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /target/etc/kderc
     fi
 }
 
@@ -34,23 +34,34 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+                        if [ -d /target/usr/share/xubuntu-default-settings/accessibility ]; then
+                            cp -a /target/usr/share/xubuntu-default-settings/accessibility/* /target/etc/xdg/
+                        fi
                         ;;
                         # 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 /apps/gnopernicus/srcore/mag_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active false
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
 
+                        if [ -d /usr/share/xubuntu-default-settings ]; then
+                          apt-install gnome-orca gnome-mag
+                        fi
+
+                        if [ -e /target/usr/share/python-support/gnome-orca/orca/settings.py ]; then
+                            sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /target/usr/share/python-support/gnome-orca/orca/settings.py
+                        fi
+
+                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
                         ;;
                         # Blindness
                         access=v3)
                         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 /apps/gnopernicus/srcore/sp_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active false
+
+                        if [ -d /usr/share/xubuntu-default-settings ]; then
+                          apt-install gnome-orca
+                        fi
                         ;;
                         # Minor Motor Difficulties
                         access=m1)
@@ -63,6 +74,9 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+                        if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i 's/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi
                         ;;
                         # Motor Difficulties - pointing devices
                         access=m2)
@@ -73,6 +87,9 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+                        if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i '/Sticky/ s/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi
                         ;;
 		esac
 done