[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2-55-g2c715d5

[Didier Raboud]

The following commit has been merged in the master branch:
commit 5f68d21b709ac8df951d62f4ac97071fd7c55f13
Author: Didier Raboud <didier at raboud.com>
Date:   Wed Dec 8 14:53:43 2010 +0100

    Update 28_find_old_kde4_html_documentation.diff and 22_hack_in_etc_kde4_in_kstandarddirs.diff for QT_NO_CAST_FROM_ASCII
---
 debian/changelog                                   |    2 ++
 .../22_hack_in_etc_kde4_in_kstandarddirs.diff      |    2 +-
 .../28_find_old_kde4_html_documentation.diff       |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51c2e6b..99f2846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ kde4libs (4:4.5.85-0r1) UNRELEASED; urgency=low
 
   [ Didier Raboud ]
   * Refresh patches for 4.5.85.
+    - Update 28_find_old_kde4_html_documentation.diff and
+      22_hack_in_etc_kde4_in_kstandarddirs.diff for QT_NO_CAST_FROM_ASCII.
   * Adjust build-dependencies:
     - Bump required:
       - Qt to 4:4.7.0~rc1.
diff --git a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
index 0bec82b..a361980 100644
--- a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
@@ -18,7 +18,7 @@ overridden by adding new files to /etc/kde4 by the sysadm.
                      }
 +                    // UGLY HACK - forward porting Chris CHeney's HACK - Rex Dieter
 +                    if ( local && (!strcmp("config", type)))  // local is used as a "homedir marker"
-+                        candidates.append("/etc/kde4/");
++                        candidates.append(QLatin1String("/etc/kde4/"));
 +                    //
                      local = false;
                  }
diff --git a/debian/patches/28_find_old_kde4_html_documentation.diff b/debian/patches/28_find_old_kde4_html_documentation.diff
index 60331ea..a408dad 100644
--- a/debian/patches/28_find_old_kde4_html_documentation.diff
+++ b/debian/patches/28_find_old_kde4_html_documentation.diff
@@ -19,7 +19,7 @@ Last-Update: 2010-05-28
 +    // Debian patch: add old KDE4 HTML documentation dir, so that
 +    // khelpcenter4 can open documentation of KDE applications built against
 +    // Debian KDE SC << 4.4.4.
-+    addResourceDir("html", "/usr/share/doc/kde4/HTML", false);
++    addResourceDir("html", QLatin1String("/usr/share/doc/kde4/HTML"), false);
  }
  
  static QStringList lookupProfiles(const QString &mapFile)

-- 
KDE Development Platform Libraries module packaging