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

[Lisandro Damián Nicanor Pérez]

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

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

    Refreshed patch 23_permit_plugins_built_with_future_qt.diff
---
 debian/changelog                                   |    1 +
 .../23_permit_plugins_built_with_future_qt.diff    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c90a5f6..594d33f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ qt4-x11 (4:4.8.4+dfsg-1) UNRELEASED; urgency=low
     - 07_trust_dpkg-arch_over_uname-m.diff
     - 08_configure_quilt_compat.diff
     - 12_add_nostrip_for_debug_packages.diff
+    - 23_permit_plugins_built_with_future_qt.diff
   * Update symbols
 
  -- Timo Jyrinki <timo at debian.org>  Mon, 21 Jan 2013 08:37:04 +0000
diff --git a/debian/patches/23_permit_plugins_built_with_future_qt.diff b/debian/patches/23_permit_plugins_built_with_future_qt.diff
index 98cff93..f076e2e 100644
--- a/debian/patches/23_permit_plugins_built_with_future_qt.diff
+++ b/debian/patches/23_permit_plugins_built_with_future_qt.diff
@@ -27,7 +27,7 @@ installability and expand of forward binary compatibility beyond the same Qt
 
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -831,7 +831,7 @@ bool QLibraryPrivate::isPlugin(QSettings
+@@ -834,7 +834,7 @@ bool QLibraryPrivate::isPlugin(QSettings
  
      pluginState = IsNotAPlugin; // be pessimistic
  

-- 
Qt 4 packaging