Changeset 4823


Ignore:
Timestamp:
Jul 14, 2011, 10:40:46 AM (9 years ago)
Author:
fasma
Message:

Fix casper for other CM versions

Location:
packages/cm16/casper
Files:
3 added
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • packages/cm16/casper/cmiffy/cmiffy

    r4146 r4823  
    3939
    4040FILES_ADD = {}
    41 FILES_DEL = []
     41FILES_DEL = ['ubiquity-hooks/49kubuntu_gnome_icon_cache', 'scripts/casper-bottom/48kubuntu_disable_restart_notifications', 'scripts/casper-bottom/49kubuntu_mobile_session' ]
    4242RENAME_DIRS = {}
    4343
    4444#Use this var we if want to hardcode the version
    4545#If you hardcode the version please add the xcm tag
    46 VERSION=""
     46VERSION="1.265xcm1.1"
    4747
    4848# debdiff old.dsc new.dsc > cmiffy/debdiff.patch
     
    5050
    5151#Changelog stuff
    52 AUTHOR='Pedro Fragoso <pedro.fragoso@caixamagica.pt>'
     52AUTHOR='Flávio Moringa <flavio.moringa@caixamagica.pt>'
    5353DISTRO=""
    5454URGE="low"
  • packages/cm16/casper/cmiffy/debdiff.patch

    r4174 r4823  
    1 diff -Nru casper-1.259/casper.conf casper-1.259xcm1/casper.conf
    2 --- casper-1.259/casper.conf    2010-09-28 20:34:30.000000000 +0100
    3 +++ casper-1.259xcm1/casper.conf        2011-03-04 11:18:34.000000000 +0000
     1diff -Naur casper-1.265.orig//casper.conf casper-1.265//casper.conf
     2--- casper-1.265.orig//casper.conf      2011-03-28 07:30:38.000000000 +0100
     3+++ casper-1.265//casper.conf   2011-07-14 09:28:37.740776750 +0100
    44@@ -2,7 +2,7 @@
    55 # Supported variables are:
     
    1313+export USERFULLNAME="Caixa Mágica Live session user"
    1414+export HOST="caixamagica"
    15 +export BUILD_SYSTEM="CaixaMágica"
    16 diff -Nru casper-1.259/debian/changelog casper-1.259xcm1/debian/changelog
    17 --- casper-1.259/debian/changelog       2011-03-03 10:52:38.000000000 +0000
    18 +++ casper-1.259xcm1/debian/changelog   2011-03-04 11:23:21.000000000 +0000
    19 @@ -1,3 +1,9 @@
    20 +casper (1.259xcm1) natty; urgency=low
    21 +
    22 +  * Use our username and build
    23 +
    24 + -- Pedro Fragoso <pmf@ob>  Fri, 04 Mar 2011 11:22:57 +0000
    25 +
    26  casper (1.259) natty; urgency=low
    27  
    28    * scripts/casper-bottom/05mountpoints: Create a /media/cdrom -> /cdrom
    29 diff -Nru casper-1.259/scripts/casper-bottom/10adduser casper-1.259xcm1/scripts/casper-bottom/10adduser
    30 --- casper-1.259/scripts/casper-bottom/10adduser        2010-09-28 20:34:30.000000000 +0100
    31 +++ casper-1.259xcm1/scripts/casper-bottom/10adduser    2011-03-04 11:22:50.000000000 +0000
     15+export BUILD_SYSTEM="CaixaMagica"
     16diff -Naur casper-1.265.orig//debian/manpage/casper.7 casper-1.265//debian/manpage/casper.7
     17--- casper-1.265.orig//debian/manpage/casper.7  2011-03-28 07:30:38.000000000 +0100
     18+++ casper-1.265//debian/manpage/casper.7       2011-07-14 09:29:39.480776723 +0100
     19@@ -8,7 +8,7 @@
     20 As kernel parameter boot prompt.
     21 
     22 .SH DESCRIPTION
     23-Casper is a hook for initramfs-tools used to generate an initramfs capable to boot live systems as those created by make-live. This includes the Debian-Live isos, netboot tarballs, and usb stick images and Ubuntu live cds. At boot time it will look for a (read-only) media containing a "/casper" directory where a root filesystems (often a compressed squashfs) is stored. If found, it will create a writable environment, using unionfs, for debian like systems to boot from.
     24+Casper is a hook for initramfs-tools used to generate an initramfs capable to boot live systems as those created by make-live. This includes the Debian-Live isos, netboot tarballs, and usb stick images and Caixa Magica live cds. At boot time it will look for a (read-only) media containing a "/casper" directory where a root filesystems (often a compressed squashfs) is stored. If found, it will create a writable environment, using unionfs, for debian like systems to boot from.
     25 
     26 .SH RECOGNIZED BOOT OPTIONS
     27 .TP
     28diff -Naur casper-1.265.orig//scripts/casper-bottom/10adduser casper-1.265//scripts/casper-bottom/10adduser
     29--- casper-1.265.orig//scripts/casper-bottom/10adduser  2011-03-28 07:30:38.000000000 +0100
     30+++ casper-1.265//scripts/casper-bottom/10adduser       2011-07-14 10:00:51.750775895 +0100
    3231@@ -38,7 +38,7 @@
    3332 db_set passwd/user-uid
     
    3534 if [ -f /root/etc/sudoers ]; then
    3635-    if [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
    37 +    if [ "${BUILD_SYSTEM}" = "CaixaMágica" ] || [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
     36+    if [ "${BUILD_SYSTEM}" = "CaixaMagica" ] || [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
    3837        if grep -q '^%admin' /root/etc/sudoers; then
    3938            sed -i -e '/^%admin/s/(ALL) ALL$/(ALL) NOPASSWD: ALL/' /root/etc/sudoers
    4039        else
    41 diff -Nru casper-1.259/scripts/casper-helpers casper-1.259xcm1/scripts/casper-helpers
    42 --- casper-1.259/scripts/casper-helpers 2011-03-03 10:47:21.000000000 +0000
    43 +++ casper-1.259xcm1/scripts/casper-helpers     2011-03-04 11:22:06.000000000 +0000
     40@@ -76,22 +76,22 @@
     41     mv /root/home/$USERNAME/examples.desktop /root/home/$USERNAME/Desktop/
     42 fi
     43 
     44-#Kubuntu
     45+#Caixa Magica KDE
     46 if [ -f "/root/usr/bin/plasma" ]; then
     47-    if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop" ]; then
     48+    if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/caixamagicakde/about-caixamagicakde.desktop" ]; then
     49       chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
     50-      chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/kde4/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop /home/$USERNAME/Desktop/about-kubuntu.desktop
     51+      chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/kde4/apps/khelpcenter/plugins/caixamagicakde/about-caixamagicakde.desktop /home/$USERNAME/Desktop/about-caixamagicakde.desktop
     52     fi
     53 fi
     54 
     55-#Ubuntu MID wants to be installed with --automatic
     56-if [ -f "/root/usr/share/ubuntu-mid-default-settings/mid-gui-start" ]; then
     57+#Caixa Magica MID wants to be installed with --automatic
     58+if [ -f "/root/usr/share/caixamagica-mid-default-settings/mid-gui-start" ]; then
     59   if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then
     60     sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity-gtkui.desktop"
     61   fi
     62 fi
     63 
     64-#Ubuntu MID uses kourou, and the ubiquity icon should be easy to find
     65+#Caixa Magica MID uses kourou, and the ubiquity icon should be easy to find
     66 if [ -f "/root/usr/lib/hildon-desktop/kourou.py" ]; then
     67   if [ -f "/root/etc/xdg/menus/home.menu" ]; then
     68     sed -i '/<\/Include>/i\            <Filename>ubiquity-gtkui.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
     69diff -Naur casper-1.265.orig//scripts/casper-bottom/15autologin casper-1.265//scripts/casper-bottom/15autologin
     70--- casper-1.265.orig//scripts/casper-bottom/15autologin        2011-04-07 00:35:52.000000000 +0100
     71+++ casper-1.265//scripts/casper-bottom/15autologin     2011-07-14 09:39:54.340776451 +0100
     72@@ -54,17 +54,17 @@
     73    sed -i -r \
     74         -e "s/^# autologin=dgod/autologin=$USERNAME/" \
     75         -e "s/^# session/session/" \
     76-        -e "s/startlxde/startlubuntu/" \
     77+        -e "s/startlxde/startcaixamagicalxde/" \
     78         /root/etc/lxdm/lxdm.conf
     79 fi
     80 
     81-if [ -f /root/etc/xdg/lubuntu/lxdm/lxdm.conf ]; then
     82-    # Configure LXDM autologin with Lubuntu session
     83+if [ -f /root/etc/xdg/caixamagicalxde/lxdm/lxdm.conf ]; then
     84+    # Configure LXDM autologin with Caixa Magica LXDE session
     85    sed -i -r \
     86         -e "s/^# autologin=dgod/autologin=$USERNAME/" \
     87         -e "s/^# session/session/" \
     88-        -e "s/startlxde/startlubuntu/" \
     89-        /root/etc/xdg/lubuntu/lxdm/lxdm.conf
     90+        -e "s/startlxde/startcaixamagicalxde/" \
     91+        /root/etc/xdg/caixamagicalxde/lxdm/lxdm.conf
     92 fi
     93 
     94 log_end_msg
     95diff -Naur casper-1.265.orig//scripts/casper-bottom/22screensaver casper-1.265//scripts/casper-bottom/22screensaver
     96--- casper-1.265.orig//scripts/casper-bottom/22screensaver      2011-03-28 07:30:38.000000000 +0100
     97+++ casper-1.265//scripts/casper-bottom/22screensaver   2011-07-14 09:36:25.590776543 +0100
     98@@ -27,8 +27,8 @@
     99     chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock_enabled false
     100 fi
     101 
     102-if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
     103-    printf "[ScreenSaver]\nLock=false\n" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kdesktoprc
     104+if [ -d /root/usr/share/caixamagicakde-default-settings/kde-profile/default/share/config ]; then
     105+    printf "[ScreenSaver]\nLock=false\n" >> /root/usr/share/caixamagicakde-default-settings/kde-profile/default/share/config/kdesktoprc
     106 fi
     107 
     108 log_end_msg
     109diff -Naur casper-1.265.orig//scripts/casper-bottom/30accessibility casper-1.265//scripts/casper-bottom/30accessibility
     110--- casper-1.265.orig//scripts/casper-bottom/30accessibility    2011-04-11 07:42:56.000000000 +0100
     111+++ casper-1.265//scripts/casper-bottom/30accessibility 2011-07-14 10:34:56.210774990 +0100
     112@@ -38,7 +38,7 @@
     113 
     114 kderc_addtoprefixes() {
     115     if [ -e "/root/etc/kde4rc" ]; then
     116-        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kde4rc
     117+        sed -i "s|\\(prefixes=/usr/share/caixamagicakde-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kde4rc
     118     fi
     119 }
     120 
     121@@ -255,9 +255,9 @@
     122                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
     123                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
     124 
     125-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
     126-                        if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
     127-                            cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
     128+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/lesser-visual-impairment/
     129+                        if [ -d /root/usr/share/caixamagicaxfce-default-settings/accessibility ]; then
     130+                            cp -a /root/usr/share/caixamagicaxfce-default-settings/accessibility/* /root/etc/xdg/
     131                         fi
     132                         ;;
     133                         # Moderate Visual Impairment
     134@@ -277,7 +277,7 @@
     135                         gset set org.gnome.yelp show-cursor true
     136                         add_sudoers_file
     137                         use_classic_gnome
     138-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
     139+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/caixamagicakde-default-settings/kde-profile/moderate-visual-impairment/
     140                         ;;
     141                         # Blindness
     142                         access=v3)
     143@@ -331,7 +331,7 @@
     144                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
     145                         gct -s -t bool /apps/gksu/disable-grab true
     146                         gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
     147-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
     148+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/minor-motor-difficulties/
     149                         if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
     150                             sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
     151                         fi
     152@@ -350,7 +350,7 @@
     153                         if [ -x /root/usr/lib/gdm/gdm-set-default-session ] ; then
     154                             chroot /root /usr/lib/gdm/gdm-set-default-session gnome-classic || true
     155                         fi
     156-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
     157+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/caixamagicakde-default-settings/kde-profile/motor-difficulties-pointing-devices/
     158                         if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
     159                             sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
     160                         fi
     161diff -Naur casper-1.265.orig//scripts/casper-bottom/32disable_hibernation casper-1.265//scripts/casper-bottom/32disable_hibernation
     162--- casper-1.265.orig//scripts/casper-bottom/32disable_hibernation      2011-03-28 07:30:38.000000000 +0100
     163+++ casper-1.265//scripts/casper-bottom/32disable_hibernation   2011-07-14 09:40:47.610776427 +0100
     164@@ -27,8 +27,8 @@
     165     chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/general/can_hibernate false
     166 fi
     167 
     168-if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
     169-    echo "disableHibernate=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/guidance-power-managerrc
     170+if [ -d /root/usr/share/caixamagicakde-default-settings/kde-profile/default/share/config ]; then
     171+    echo "disableHibernate=1" >> /root/usr/share/caixamagicakde-default-settings/kde-profile/default/share/config/guidance-power-managerrc
     172 fi
     173 
     174 log_end_msg
     175diff -Naur casper-1.265.orig//scripts/casper-bottom/48caixamagicakde_disable_restart_notifications casper-1.265//scripts/casper-bottom/48caixamagicakde_disable_restart_notifications
     176--- casper-1.265.orig//scripts/casper-bottom/48caixamagicakde_disable_restart_notifications     1970-01-01 01:00:00.000000000 +0100
     177+++ casper-1.265//scripts/casper-bottom/48caixamagicakde_disable_restart_notifications  2011-07-14 09:36:59.500776528 +0100
     178@@ -0,0 +1,5 @@
     179+#! /bin/sh
     180+
     181+if [ -d /root/usr/share/caixamagicakde-default-settings/ ]; then
     182+    echo "[Event]\nhideRestartNotifier=true" >> /root/usr/share/caixamagicakde-default-settings/kde-profile/default/share/config/notificationhelper
     183+fi
     184diff -Naur casper-1.265.orig//scripts/casper-bottom/49caixamagicakde_mobile_session casper-1.265//scripts/casper-bottom/49caixamagicakde_mobile_session
     185--- casper-1.265.orig//scripts/casper-bottom/49caixamagicakde_mobile_session    1970-01-01 01:00:00.000000000 +0100
     186+++ casper-1.265//scripts/casper-bottom/49caixamagicakde_mobile_session 2011-07-14 10:01:22.230775881 +0100
     187@@ -0,0 +1,5 @@
     188+#! /bin/sh
     189+
     190+if [ -d /root/usr/share/caixamagicakde-mobile-default-settings/ ]; then
     191+    cp /root/usr/share/caixamagicakde-mobile-default-settings/share/nodm /root/etc/default/nodm
     192+fi
     193diff -Naur casper-1.265.orig//scripts/casper-helpers casper-1.265//scripts/casper-helpers
     194--- casper-1.265.orig//scripts/casper-helpers   2011-04-07 00:35:52.000000000 +0100
     195+++ casper-1.265//scripts/casper-helpers        2011-07-14 09:28:37.740776750 +0100
    44196@@ -1,6 +1,6 @@
    45197 ## Casper helper functions, used by casper on boot and by casper-snapshot
    46198 
    47199-if [ "${BUILD_SYSTEM}" = "Debian" ] || [ "${BUILD_SYSTEM}" = "Ubuntu" ]; then
    48 +if [ "${BUILD_SYSTEM}" = "Debian" ] || [ "${BUILD_SYSTEM}" = "Ubuntu" ] || [ "${BUILD_SYSTEM}" = "CaixaMágica" ]; then
     200+if [ "${BUILD_SYSTEM}" = "Debian" ] || [ "${BUILD_SYSTEM}" = "Ubuntu" ] || [ "${BUILD_SYSTEM}" = "CaixaMagica" ]; then
    49201     MP_QUIET="-q"
    50202 else
    51203     MP_QUIET=""
     204diff -Naur casper-1.265.orig//scripts/casper-premount/10driver_updates casper-1.265//scripts/casper-premount/10driver_updates
     205--- casper-1.265.orig//scripts/casper-premount/10driver_updates 2011-03-28 07:30:38.000000000 +0100
     206+++ casper-1.265//scripts/casper-premount/10driver_updates      2011-07-14 09:30:21.580776704 +0100
     207@@ -21,7 +21,7 @@
     208 mountpoint=/cdrom
     209 
     210 is_updates_path() {
     211-       # Driver packages are stored in ubuntu-drivers/<kver>/
     212+       # Driver packages are stored in caixamagica-drivers/<kver>/
     213        # subdirectory. Each package contains a module for a specific
     214        # kernel flavour.
     215        path=$1
     216@@ -29,7 +29,7 @@
     217        kver="$(echo "$abi" | cut -d- -f1,2)"
     218        kbase="$(echo "$abi" | cut -d- -f1)"
     219        for leaf in "$abi" "$kver" "$kbase"; do
     220-               update_dir="$path/ubuntu-drivers/$leaf"
     221+               update_dir="$path/caixamagica-drivers/$leaf"
     222                [ -d "$update_dir" ] || continue
     223                if [ "$(echo $update_dir/*_$DPKG_ARCH.deb)" != \
     224                        "$update_dir/*_$DPKG_ARCH.deb" ]; then
     225diff -Naur casper-1.265.orig//ubiquity-hooks/30accessibility casper-1.265//ubiquity-hooks/30accessibility
     226--- casper-1.265.orig//ubiquity-hooks/30accessibility   2011-04-11 07:46:28.000000000 +0100
     227+++ casper-1.265//ubiquity-hooks/30accessibility        2011-07-14 09:35:11.080776576 +0100
     228@@ -27,7 +27,7 @@
     229 
     230 kderc_addtoprefixes() {
     231     if [ -e "/target/etc/kde4rc" ]; then
     232-        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /target/etc/kde4rc
     233+        sed -i "s|\\(prefixes=/usr/share/caixamagicakde-default-settings/kde-profile/default/\\)|\\1,$1|" /target/etc/kde4rc
     234     fi
     235 }
     236 
     237@@ -243,9 +243,9 @@
     238                         gct -s -t string /desktop/gnome/background/color_shading_type solid
     239                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
     240                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
     241-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
     242-                        if [ -d /target/usr/share/xubuntu-default-settings/accessibility ]; then
     243-                            cp -a /target/usr/share/xubuntu-default-settings/accessibility/* /target/etc/xdg/
     244+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/lesser-visual-impairment/
     245+                        if [ -d /target/usr/share/caixamagicaxfce-default-settings/accessibility ]; then
     246+                            cp -a /target/usr/share/caixamagicaxfce-default-settings/accessibility/* /target/etc/xdg/
     247                         fi
     248                         ;;
     249                         # Moderate Visual Impairment
     250@@ -255,7 +255,7 @@
     251                         gct -s -t bool /desktop/gnome/applications/at/visual/startup true
     252                         gct -s -t string /desktop/gnome/applications/at/visual/exec orca
     253 
     254-                        if [ -d /usr/share/xubuntu-default-settings ]; then
     255+                        if [ -d /usr/share/caixamagicaxfce-default-settings ]; then
     256                           apt-install gnome-orca gnome-mag
     257                         fi
     258 
     259@@ -273,7 +273,7 @@
     260                         gset set org.gnome.yelp show-cursor true
     261                         add_sudoers_file
     262                         use_classic_gnome
     263-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
     264+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/caixamagicakde-default-settings/kde-profile/moderate-visual-impairment/
     265                         ;;
     266                         # Blindness
     267                         access=v3)
     268@@ -305,7 +305,7 @@
     269                                        chroot /target chown -R $TARGET_USERNAME.$TARGET_USERNAME /home/$TARGET_USERNAME/.local/share/orca
     270                                fi
     271                        fi
     272-                        if [ -d /usr/share/xubuntu-default-settings ]; then
     273+                        if [ -d /usr/share/caixamagicaxfce-default-settings ]; then
     274                           apt-install gnome-orca
     275                         fi
     276                         use_classic_gnome
     277@@ -356,7 +356,7 @@
     278                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
     279                         gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
     280                         gct -s -t bool /apps/gksu/disable-grab true
     281-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
     282+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/minor-motor-difficulties/
     283                         if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
     284                             sed -i 's/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
     285                         fi
     286@@ -374,7 +374,7 @@
     287                         if [ -x /root/usr/lib/gdm/gdm-set-default-session ] ; then
     288                             chroot /root /usr/lib/gdm/gdm-set-default-session gnome-classic || true
     289                         fi
     290-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
     291+                        kderc_addtoprefixes /usr/share/caixamagicakde-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/caixamagicakde-default-settings/kde-profile/motor-difficulties-pointing-devices/
     292                         if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
     293                             sed -i '/Sticky/ s/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
     294                         fi
     295diff -Naur casper-1.265.orig//ubiquity-hooks/49caixamagicakde_gnome_icon_cache casper-1.265//ubiquity-hooks/49caixamagicakde_gnome_icon_cache
     296--- casper-1.265.orig//ubiquity-hooks/49caixamagicakde_gnome_icon_cache 1970-01-01 01:00:00.000000000 +0100
     297+++ casper-1.265//ubiquity-hooks/49caixamagicakde_gnome_icon_cache      2011-07-14 09:35:57.360776555 +0100
     298@@ -0,0 +1,11 @@
     299+#! /bin/sh
     300+set -e
     301+
     302+# livecd-rootfs deletes the Gnome icon cache for CaixaMagicaKDE CDs to save space, recreate it here
     303+
     304+if [ -e "/target/usr/share/caixamagicakde-default-settings/" ] && [ -e "/target/usr/bin/gtk-update-icon-cache" ]; then
     305+    chroot /target gtk-update-icon-cache /usr/share/icons/hicolor
     306+    chroot /target gtk-update-icon-cache /usr/share/icons/oxygen
     307+fi
     308+
     309+exit 0
Note: See TracChangeset for help on using the changeset viewer.