[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-3-29-g76de6e3

[George Kiagiadakis]

The following commit has been merged in the kde4.5 branch:
commit 6ed6f6d06d9eb99dcdd40019fb8b0dee3aff8fe8
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Fri Aug 20 11:43:21 2010 +0300

    Extend patch 21_kdm_doesnt_use_kstandarddirs.diff to also patch the new kdm kcm kauth helper.
---
 debian/changelog                                   |    2 +
 .../patches/21_kdm_doesnt_use_kstandarddirs.diff   |   23 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe6a980..a28693a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,8 @@ kdebase-workspace (4:4.5.0-0r1) UNRELEASED; urgency=low
     a "kdm" user, which is now used by default as the user to run the greeter.
     As a consequence, add dependency on adduser on the kdm package.
   * Re-work patch 11_kdm_X_path.diff.
+  * Extend patch 21_kdm_doesnt_use_kstandarddirs.diff to also patch
+    the new kdm kcm kauth helper.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 
diff --git a/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff b/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
index 8f4ecca..d5b04f4 100644
--- a/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
+++ b/debian/patches/21_kdm_doesnt_use_kstandarddirs.diff
@@ -84,3 +84,26 @@ Let's hardcode it and introduce KDM_CONFDIR.
  "    {/usr,/usr/local,{/opt,/usr/local}/{kde4,kde,kde3}}/share/config.\n"
  "  --no-old\n"
  "    Do not look at older xdm/kdm configurations, just create default config.\n"
+--- a/kcontrol/kdm/helper.cpp
++++ b/kcontrol/kdm/helper.cpp
+@@ -131,9 +131,9 @@
+     QString tempConfigName = args.value("tempkdmrcfile").toString();
+     QString tempBackgroundConfigName = args.value("tempbackgroundrcfile").toString();
+ 
+-    QString systemConfigName = QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc");
++    QString systemConfigName = QString::fromLatin1(KDM_CONFDIR "/kdm/kdmrc");
+     QString systemBackgroundConfigName = KConfig(systemConfigName, KConfig::SimpleConfig)
+-            .group("X-*-Greeter").readEntry("BackgroundCfg", KDE_CONFDIR "/kdm/backgroundrc");
++            .group("X-*-Greeter").readEntry("BackgroundCfg", KDM_CONFDIR "/kdm/backgroundrc");
+ 
+     int code = 0;
+ 
+@@ -167,7 +167,7 @@
+ {
+     int subaction = args.value("subaction").toInt();
+     QString facesDir =
+-        KConfig(QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig)
++        KConfig(QString::fromLatin1(KDM_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig)
+             .group("X-*-Greeter").readEntry("FaceDir",
+                 KStandardDirs::installPath("data") + "kdm/faces") + '/';
+ 

-- 
KDE Base Workspace module packaging