[SCM] kcm-gtk packaging branch, master, updated. 9f246cb072a3ae373381017efe81aaffbc7cd30d

[Didier Raboud]

The following commit has been merged in the master branch:
commit 19357803694da517c2415697b125936b5d778fcc
Author: Didier Raboud <odyx at debian.org>
Date:   Mon Mar 7 14:32:25 2011 +0100

    Import patches from gtk-qt-engine:
    
     - 04_no_kde_in_configfile.diff
     - 05_dont_set_userfont.patch
---
 debian/patches/04_no_kde4_in_configfile.diff |   26 ++++++++++++++++++++++++++
 debian/patches/05_dont_set_userfont.patch    |   16 ++++++++++++++++
 debian/patches/series                        |    2 ++
 3 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/debian/patches/04_no_kde4_in_configfile.diff b/debian/patches/04_no_kde4_in_configfile.diff
new file mode 100644
index 0000000..0398252
--- /dev/null
+++ b/debian/patches/04_no_kde4_in_configfile.diff
@@ -0,0 +1,26 @@
+Description: Get rid of the "4" in kde to make it work coherently
+Origin: vendor
+Author: Didier Raboud <didier at raboud.com>
+Bug: http://bugs.debian.org/527340
+Last-Update: 2011-02-07
+
+--- a/kcmgtk.cpp
++++ b/kcmgtk.cpp
+@@ -36,7 +36,7 @@
+ #include <sys/stat.h>
+ 
+ 
+-const QString KcmGtk::k_gtkRcFileName(QDir::homePath() + "/.gtkrc-2.0-kde4");
++const QString KcmGtk::k_gtkRcFileName(QDir::homePath() + "/.gtkrc-2.0-kde");
+ const QString KcmGtk::k_qtThemeName("Qt4");
+ const QString KcmGtk::k_qtcurveThemeName("QtCurve");
+ 
+@@ -109,7 +109,7 @@
+ 
+ void KcmGtk::save()
+ {
+-	// Write ~/.gtkrc-2.0-kde4
++	// Write ~/.gtkrc-2.0-kde
+ 	m_gtkRc->save();
+ }
+ 
diff --git a/debian/patches/05_dont_set_userfont.patch b/debian/patches/05_dont_set_userfont.patch
new file mode 100644
index 0000000..72f578a
--- /dev/null
+++ b/debian/patches/05_dont_set_userfont.patch
@@ -0,0 +1,16 @@
+Description: Don't set the "user-font"
+Origin: vendor
+Author: Didier Raboud <didier at raboud.com>
+Bug: http://bugs.debian.org/527340
+Last-Update: 2009-05-18
+
+--- a/gtkrcfile.cpp
++++ b/gtkrcfile.cpp
+@@ -130,7 +130,6 @@ void GtkRcFile::save()
+ 	stream << "{\n";
+ 	stream << "\tfont_name=\"" << m_font.family() << "\"\n";
+ 	stream << "}\n";
+-	stream << "widget_class \"*\" style \"user-font\"\n";
+ 	stream << "\n";
+ 	stream << "gtk-theme-name=\"" << m_themeName << "\"\n";
+ 	stream << "gtk-font-name=\"" << fontName << "\"\n";
diff --git a/debian/patches/series b/debian/patches/series
index b008a45..e34751b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 01_kcm_category.patch
+04_no_kde4_in_configfile.diff
+05_dont_set_userfont.patch

-- 
kcm-gtk packaging