← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kdebase-workspace/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_52_gtk2_engines_qtcurve_config.diff

  • Committer: Bazaar Package Importer
  • Author(s): Anthony Mercatante
  • Date: 2009-03-18 02:36:46 UTC
  • Revision ID: james.westby@ubuntu.com-20090318023646-qmg126mvubjwwbs3
Tags: 4:4.2.1a-0ubuntu8
* Fixed kubuntu_52_gtk2_engines_qtcurve_config.diff:
  - Not forcing the configuration and exporting gtk settings
    if either kubuntu-default-settings or the
    gtk-engines-qtcurve packages are missing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_52_gtk2_engines_qtcurve_config.diff
1
1
diff -Nur kdebase-workspace-4.2.1a/startkde.cmake kdebase-workspace-4.2.1a.new/startkde.cmake
2
2
--- kdebase-workspace-4.2.1a/startkde.cmake     2009-02-27 13:42:15.000000000 +0100
3
 
+++ kdebase-workspace-4.2.1a.new/startkde.cmake 2009-03-14 18:38:16.000000000 +0100
4
 
@@ -190,6 +190,31 @@
 
3
+++ kdebase-workspace-4.2.1a.new/startkde.cmake 2009-03-18 02:34:28.000000000 +0100
 
4
@@ -190,6 +190,39 @@
5
5
   unset KLOCALE_LANGUAGES
6
6
 fi
7
7
 
8
8
+# configuration of the gtk2-engines-qtcurve if not already set
9
9
+
10
10
+# First we need to remove previous gtk-qt-engines config if any
11
 
+if [ -e $kdehome/env/gtk-qt-engine.rc.sh ]
12
 
+then
13
 
+ rm -f $kdehome/env/gtk-qt-engine.rc.sh
14
 
+ # We also have to remove .gtkrc-2.0-kde4 since it'll have gtk-qt-engines config in it
15
 
+ if [ -e $HOME/.gtkrc-2.0-kde4 ]
16
 
+ then
17
 
+  rm -f $HOME/.gtkrc-2.0-kde4
18
 
+ fi
19
 
+fi
20
 
+
21
 
+if [ ! -e $kdehome/env/gtk2-engines-qtcurve.rc.sh ] && [ -e /usr/share/kubuntu-default-settings/gtk2-engines-qtcurve.rc.sh ]
22
 
+then
23
 
+ mkdir -p $kdehome/env
24
 
+ cp -f /usr/share/kubuntu-default-settings/gtk2-engines-qtcurve.rc.sh $kdehome/env
25
 
+ chmod 755 $kdehome/env/gtk2-engines-qtcurve.rc.sh
26
 
+fi
27
 
+
28
 
+if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e /usr/share/kubuntu-default-settings/dot-gtkrc-2.0-kde4 ]
29
 
+then
30
 
+ cp -f /usr/share/kubuntu-default-settings/dot-gtkrc-2.0-kde4 $HOME/.gtkrc-2.0-kde4
 
11
+if [ -e $kdehome/env/gtk-qt-engine.rc.sh ] ; then
 
12
+  rm -f $kdehome/env/gtk-qt-engine.rc.sh
 
13
+  # We also have to remove .gtkrc-2.0-kde4 since it'll have gtk-qt-engines config in it
 
14
+  if [ -e $HOME/.gtkrc-2.0-kde4 ] ; then
 
15
+    rm -f $HOME/.gtkrc-2.0-kde4
 
16
+  fi
 
17
+fi
 
18
+
 
19
+if [ -e /var/lib/dpkg/info/gtk2-engines-qtcurve.list && -e /var/lib/dpkg/info/kubuntu-default-settings.list ] ; then
 
20
+  # The theme and k-d-s are installed, configuring...
 
21
+  if [ ! -e $kdehome/env/gtk2-engines-qtcurve.rc.sh ] && [ -e /usr/share/kubuntu-default-settings/gtk2-engines-qtcurve.rc.sh ] ; then
 
22
+    mkdir -p $kdehome/env
 
23
+    cp -f /usr/share/kubuntu-default-settings/gtk2-engines-qtcurve.rc.sh $kdehome/env
 
24
+    chmod 755 $kdehome/env/gtk2-engines-qtcurve.rc.sh
 
25
+  fi
 
26
+
 
27
+  if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e /usr/share/kubuntu-default-settings/dot-gtkrc-2.0-kde4 ] ; then
 
28
+    cp -f /usr/share/kubuntu-default-settings/dot-gtkrc-2.0-kde4 $HOME/.gtkrc-2.0-kde4
 
29
+  fi
 
30
+else
 
31
+  # Either the theme or k-d-s are missing, not forcing the configuration then... 
 
32
+  if [ -e $kdehome/env/gtk2-engines-qtcurve.rc.sh ] ; then
 
33
+    rm -f $kdehome/env/gtk2-engines-qtcurve.rc.sh
 
34
+  fi
 
35
+
 
36
+  if [ -e $HOME/.gtkrc-2.0-kde4 ] ; then
 
37
+    rm -f $HOME/.gtkrc-2.0-kde4
 
38
+  fi
31
39
+fi
32
40
+
33
41
 # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh