[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.2+dfsg-10-28-g082f142

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Tue Mar 12 23:34:44 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=4a071a3

The following commit has been merged in the experimental branch:
commit 4a071a30f2da0efc3f181fbbbdd748b5a4f7d634
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Mar 12 20:33:19 2013 -0300

    qt-multiarch-plugin-path-compat.diff
---
 debian/changelog                                   |    1 +
 .../patches/qt-multiarch-plugin-path-compat.diff   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca889de..ed3ea05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ qt4-x11 (4:4.8.4+dfsg-1) UNRELEASED; urgency=low
     - 94_armv6_uname_entry.diff
     - powerpcspe.diff
     - sh.diff
+    - qt-multiarch-plugin-path-compat.diff
   * Update symbols
 
  -- Timo Jyrinki <timo at debian.org>  Mon, 21 Jan 2013 08:37:04 +0000
diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index be37bb8..1847d7c 100644
--- a/debian/patches/qt-multiarch-plugin-path-compat.diff
+++ b/debian/patches/qt-multiarch-plugin-path-compat.diff
@@ -17,7 +17,7 @@ Last-Update: 2012-04-25
 
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2437,6 +2437,23 @@ QStringList QCoreApplication::libraryPat
+@@ -2507,6 +2507,23 @@ QStringList QCoreApplication::libraryPat
              if (!app_libpaths->contains(installPathPlugins))
                  app_libpaths->append(installPathPlugins);
          }

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list