[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 2d261aa1f218c6298982e9e636dc5bb7a42b5bf1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Dec 4 23:52:50 2010 +0200

    More changelog updates for the recent 4.6 merge.
    
    Including the actual removal of the now-obsolete
    22_fix_disappearing_cursor.diff patch.
---
 debian/changelog                               |    7 ++++-
 debian/patches/22_fix_disappearing_cursor.diff |   31 ------------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fdb134..5b3e480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,12 @@ qt4-x11 (4:4.7.1-0r1) UNRELEASED; urgency=low
   * Merge revisions from 4:4.6.3-1 to 4:4.6.3-4:
     - refresh 23_permit_plugins_built_with_future_qt.diff patch;
     - bump libqt4-dbus Replaces/Breaks against libqt4-dev to << 4:4.7.1 because
-      4:4.7.0~rc1-1 still has dbus.1 manpage misplaced.
+      4:4.7.0~rc1-1 still has dbus.1 manpage misplaced;
+    - remove merged patches which were backported from upstream:
+      - 0005_fix_detection_of_headers_files.diff
+      - 0006_webkit_propriotary_flash_init_gtk_first.diff
+      - 0007_qsslsocket_improve_error_handling_CVE-2010-2621.patch
+      - 22_fix_disappearing_cursor.diff
   * Bump debian/compat to 7. This source package uses dh v7.
   * Confirm symbol files for 4.7.0~rc1 on alpha armel hurd-i386 i386 ia64
     kfreebsd-amd64 kfreebsd-i386 mipsel powerpc sparc (based on experimental
diff --git a/debian/patches/22_fix_disappearing_cursor.diff b/debian/patches/22_fix_disappearing_cursor.diff
deleted file mode 100644
index bc446f7..0000000
--- a/debian/patches/22_fix_disappearing_cursor.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Denis Dzyubenko <denis.dzyubenko at nokia.com>
-Date: Wed, 29 Sep 2010 14:02:10 +0200
-Subject: [PATCH] Fixes cursor shape when widget becomes native on X11.
-Origin: backport commit:f9312fec1c44097a2093b3075aa68901327eb9c5
-Applied-Upstream: 4.7.1
-
-When a native window handle is created for a widget that has override
-cursor set, we should reset the cursor on the parent and set the cursor
-on the new window handle.
-
-Task-number: QTBUG-6185
-Reviewed-by: Olivier Goffart
-(cherry picked from commit 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba)
----
- src/gui/kernel/qwidget_x11.cpp |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
---- a/src/gui/kernel/qwidget_x11.cpp
-+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -902,8 +902,10 @@ void QWidgetPrivate::create_sys(WId wind
-                 q->setWindowOpacity(maybeTopData()->opacity/255.);
- 
-         }
--    } else if (q->testAttribute(Qt::WA_SetCursor) && q->internalWinId()) {
-+    } else if (q->internalWinId()) {
-         qt_x11_enforce_cursor(q);
-+        if (QWidget *p = q->parentWidget()) // reset the cursor on the native parent
-+            qt_x11_enforce_cursor(p);
-     }
- 
-     if (extra && !extra->mask.isEmpty() && q->internalWinId())

-- 
Qt 4 packaging