[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit d590f56b0c5df23d50b1b878a15bf0b05da246e5
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Dec 4 22:36:13 2010 +0200

    Add changelog entry for 4:4.6.3-1 to 4:4.6.3-4 merge and further adjustments.
    
    - refresh 23_permit_plugins_built_with_future_qt.diff patch;
    - kill a dupe entry in qt4-dev-tools.install.
---
 debian/changelog                                   |    4 ++++
 .../23_permit_plugins_built_with_future_qt.diff    |    2 +-
 debian/qt4-dev-tools.install                       |    1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed3455a..fe7c97e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,10 @@ qt4-x11 (4:4.7.1-1) UNRELEASED; urgency=low
   [ Didier Raboud ]
   * Cherry-pick "Fix qdbus manpage install. It is misplaced." from unstable.
 
+  [ Modestas Vainius ]
+  * Merge revisions from 4:4.6.3-1 to 4:4.6.3-4:
+    - refresh 23_permit_plugins_built_with_future_qt.diff patch.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 06 Oct 2010 14:55:15 +0200
 
 qt4-x11 (4:4.7.0~rc1-1) experimental; urgency=low
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 df168f5..4debfd6 100644
--- a/debian/patches/23_permit_plugins_built_with_future_qt.diff
+++ b/debian/patches/23_permit_plugins_built_with_future_qt.diff
@@ -23,7 +23,7 @@ installability and expand of forward binary compatibility beyond the same Qt
 
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -745,7 +745,7 @@ bool QLibraryPrivate::isPlugin(QSettings
+@@ -737,7 +737,7 @@ bool QLibraryPrivate::isPlugin(QSettings
  
      pluginState = IsNotAPlugin; // be pessimistic
  
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 5c4e44e..60da462 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -13,7 +13,6 @@ usr/bin/xmlpatterns
 usr/bin/xmlpatternsvalidator
 usr/share/qt4/phrasebooks/*
 usr/share/qt4/translations/assistant_cs.qm
-usr/share/qt4/translations/assistant_cs.qm
 usr/share/qt4/translations/assistant_da.qm
 usr/share/qt4/translations/assistant_de.qm
 usr/share/qt4/translations/assistant_fr.qm

-- 
Qt 4 packaging