Merge branch 'experimental'

80 files changed, 435 insertions, 747 deletions

diff --git a/debian/changelog b/debian/changelog
index e876789..a2731e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,89 @@
+qt4-x11 (4:4.8.4+dfsg-4) unstable; urgency=low
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Also ship 4.conf. This makes calls to qtchooser prettier: qtchooser -qt4.
+  * Make every package that ships a binary managed by qtchooser depend on it.
+  * Upload to unstable.
+
+  [ Pino Toscano ]
+  * Switch libtiff4-dev build dependency to libtiff-dev.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Fri, 24 May 2013 10:11:35 -0300
+
+qt4-x11 (4:4.8.4+dfsg-3) experimental; urgency=low
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add armhf to the list of archs that should not use pch to avoid FTBFSs.
+  * Update symbols files.
+  * Ship multi-arch aware configs files and a last resort fallback qt4.conf to
+    avoid FTBFSs in Qt4 packages already in the archive. This is explained in
+    qtchooser's README.Debian.
+  * Remove Break+Replaces for packages older than what Squeeze shipped.
+  * Changed qt4-default to arch: all. Should have been like this from start, as
+    it contains arch-qualified paths in it.
+  * Fix typos in lintian overrides.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 13 May 2013 23:31:54 -0300
+
+qt4-x11 (4:4.8.4+dfsg-2) experimental; urgency=low
+
+  * Switched qt4-default to Section libdevel. Thanks Ansgar Burchardt for
+    noticing!
+  * Be more aggressive when deleting RFCs.
+  * libqt4-dev needs qtchooser, so we make it a dependency.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Sun, 14 Apr 2013 16:30:21 -0300
+
+qt4-x11 (4:4.8.4+dfsg-1) experimental; urgency=low
+
+  [ Timo Jyrinki ]
+  * New upstream release
+  * Migrate to use qtchooser for Qt5 co-installation support
+    - Libraries co-installed, executables managed by qtchooser
+    - Packages will need build-dep on qt4-default to build against Qt4
+    - Symlinks left for binaries that had -qt4 via alternatives
+  * Drop patches that have been merged upstream:
+    - QElfParser-fix-type-of-sh_size.patch
+    - Fix-cursor-truncate-to-include-line-position.patch
+    - qt_atomic_sparc64.patch
+    - fix_use_after_free_qlocale_unix.patch
+    - QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
+    - disable-SSL-compression-by-default.patch
+    - fix_jit_crash_on_x86_64.patch
+    - add_missing_map_noreserve.patch
+    - make_rules_for_redirect_stricter.patch
+  * Refresh patches:
+    - 16_hide_std_symbols_on_qtwebkit.diff
+    - no_libicu_message.diff
+  * Update symbols
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Improve watch file to mangle Debian version.
+  * Refresh patches:
+    - Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
+    - QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under\
+      _gnome-shell.patch
+    - 0195-compositing-properties.diff
+    - qtdebug_syslog.patch
+    - 02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+    - 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
+    - 71_hppa_unaligned_access_fix_458133.diff
+    - 94_armv6_uname_entry.diff
+    - powerpcspe.diff
+    - sh.diff
+    - QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+    - qt-multiarch-plugin-path-compat.diff
+  * Fix dependency in qt4-bin-dbg. It should be libqt4-dev-bin instead of
+    libqt4-dbg.
+  * Add a lintian override for libqt4-webkit-dbg, it's a dummy package that
+    depends on libqtwebkit4-dbg.
+  * Remove an unused override for libqt4-dbus.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 01 Apr 2013 15:17:39 -0300
+
 qt4-x11 (4:4.8.2+dfsg-11) unstable; urgency=medium
 
   * Take upstream patch change_all_shmget_calls_to_use_user-only_memory.patch.
diff --git a/debian/control b/debian/control
index 55033e6..4b2340b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Fathi Boudra <fabo@debian.org>,
            Modestas Vainius <modax@debian.org>,
            Sune Vuorela <debian@pusling.com>,
            Pino Toscano <pino@debian.org>,
-           Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
+           Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
+           Timo Jyrinki <timo@debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                firebird-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
@@ -38,7 +39,7 @@ Build-Depends: debhelper (>= 9),
                libsqlite0-dev,
                libsqlite3-dev,
                libssl-dev,
-               libtiff4-dev,
+               libtiff-dev,
                libx11-dev,
                libxcursor-dev,
                libxext-dev,
@@ -68,8 +69,6 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libthai0, libicu48
-Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.4.0~beta1-1)
-Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 core module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -101,14 +100,6 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
 Recommends: libcups2
 Suggests: qt4-qtconfig
-Breaks: libqt4-core (<< 4.0.1-3),
-        libqt4-designer (<< 4.4.0~beta1-1),
-        libqt4-gui (<< 4.4.0),
-        qt4-designer (<< 4.1.4)
-Replaces: libqt4-core (<< 4.0.1-3),
-          libqt4-designer (<< 4.4.0~beta1-1),
-          libqt4-gui (<< 4.4.0),
-          qt4-designer (<< 4.1.4)
 Description: Qt 4 GUI module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -138,8 +129,6 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ca-certificates
-Breaks: libqt4-core (<< 4.4.0~beta1-1)
-Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 network module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -152,8 +141,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-gui (<< 4.4.0~beta1-1)
-Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 OpenGL module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -169,8 +156,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-core (<< 4.4.0~beta1-1)
-Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 script module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -298,8 +283,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-gui (<< 4.4.0~beta1-1)
-Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 SVG module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -326,8 +309,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-core (<< 4.4.0~beta1-1)
-Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 XML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -352,8 +333,8 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: qdbus (= ${binary:Version}), libqtdbus4 (= ${binary:Version}),
  ${misc:Depends}
-Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
-Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-dev (<< 4:4.7.1)
+Replaces: libqt4-dev (<< 4:4.7.1)
+Breaks: libqt4-dev (<< 4:4.7.1)
 Description: Qt 4 D-Bus module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -391,8 +372,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-gui (<< 4.2.1-1), qt4-designer (<< 4.4.0~beta1-1)
-Replaces: libqt4-gui (<< 4.2.1-1), qt4-designer (<< 4.4.0~beta1-1)
 Description: Qt 3 compatibility library for Qt 4
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -408,8 +387,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-gui (<< 4.4.0~beta1-1)
-Replaces: libqt4-gui (<< 4.4.0~beta1-1)
 Description: Qt 4 designer module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -447,8 +424,6 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-core (<< 4.4.0~beta1-1)
-Replaces: libqt4-core (<< 4.4.0~beta1-1)
 Description: Qt 4 test module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -462,8 +437,6 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libphonon4
-Breaks: kdelibs5 (<= 4:4.0.80)
-Replaces: kdelibs5 (<= 4:4.0.80), libphonon4
 Description: Qt 4 Phonon module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -557,13 +530,9 @@ Depends: libqt4-dbus (= ${binary:Version}),
          libqtgui4 (= ${binary:Version}),
          qt4-linguist-tools (= ${binary:Version}),
          qt4-qmake (= ${binary:Version}),
+         qtchooser,
          ${misc:Depends}
 Recommends: libqt4-opengl-dev (= ${binary:Version}), libqtwebkit-dev (>= 2.0~)
-Breaks: g++-4.6 (<< 4.6.0-7~) [armel],
-        libqt4-opengl-dev (<< 4.4.0-2),
-        libqtwebkit-dev (<< 2.0~),
-        libphonon4-dev (<< 4:4.6.0.0-1+exp1~)
-Replaces: libqt4-opengl-dev (<< 4.4.0-2), libqtwebkit-dev (<< 2.0~)
 Suggests: firebird-dev,
           libmysqlclient-dev,
           libpq-dev,
@@ -583,7 +552,7 @@ Package: libqt4-dev-bin
 Architecture: any
 Multi-Arch: foreign
 Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4:4.8.0-2)
 Replaces: libqt4-dev (<< 4:4.8.0-2)
 Description: Qt 4 development programs
@@ -616,8 +585,6 @@ Depends: libgl1-mesa-dev,
          libqt4-opengl (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libqt4-dev (<< 4.4.0-2)
-Replaces: libqt4-dev (<< 4.4.0-2)
 Description: Qt 4 OpenGL library development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -630,9 +597,7 @@ Priority: extra
 Architecture: any
 Section: debug
 Depends: libqtcore4 (= ${binary:Version}), ${misc:Depends}
-Breaks: libqt4-debug (<< 4.4.0~beta1-1)
 Conflicts: qt-x11-free-dbg
-Replaces: libqt4-debug (<< 4.4.0~beta1-1)
 Description: Qt 4 library debugging symbols
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -711,7 +676,7 @@ Package: qt4-bin-dbg
 Priority: extra
 Architecture: any
 Section: debug
-Depends: libqt4-dbg (= ${binary:Version}), ${misc:Depends}
+Depends: libqt4-dev-bin (= ${binary:Version}), ${misc:Depends}
 Recommends: libqt4-dbg
 Breaks: libqt4-dbg (<< 4:4.7.3-3)
 Replaces: libqt4-dbg (<< 4:4.7.3-3)
@@ -737,13 +702,7 @@ Description: Qt 4 examples and demos debugging symbols
 Package: qt4-designer
 Architecture: any
 Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-core (<< 4.4.0~beta1-1),
-        libqt4-designer (<< 4.4.0~beta1-1),
-        qt4-dev-tools (<= 4.0.1-2)
-Replaces: libqt4-core (<< 4.4.0~beta1-1),
-          libqt4-designer (<< 4.4.0~beta1-1),
-          qt4-dev-tools (<= 4.0.1-2)
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Recommends: libqt4-dev
 Description: graphical designer for Qt 4 applications
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -755,9 +714,7 @@ Description: graphical designer for Qt 4 applications
 Package: qt4-dev-tools
 Architecture: any
 Section: devel
-Depends: libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-core (<< 4.4.0~beta1-1)
-Replaces: libqt4-core (<< 4.4.0~beta1-1)
+Depends: qtchooser, libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
 Recommends: libqt4-dev, qt4-designer, qt4-doc
 Suggests: qt4-doc-html
 Conflicts: qt3-dev-tools-embedded
@@ -781,9 +738,7 @@ Package: qt4-qmake
 Architecture: any
 Multi-Arch: foreign
 Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
-Replaces: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 qmake Makefile generator tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -802,9 +757,7 @@ Description: Qt 4 qmake Makefile generator tool
 Package: qt4-qtconfig
 Architecture: any
 Section: x11
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.1.0)
-Replaces: libqt4-core (<< 4.4.0~beta1-1), libqt4-gui (<< 4.1.0)
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 configuration tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -830,7 +783,7 @@ Description: Qt 4 examples and demos
 Package: qt4-qmlviewer
 Architecture: any
 Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Recommends: imagemagick | gifsicle
 Description: Qt 4 QML viewer
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -843,7 +796,7 @@ Package: qt4-linguist-tools
 Architecture: any
 Multi-Arch: foreign
 Section: devel
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4:4.7.3-2)
 Replaces: libqt4-dev (<< 4:4.7.3-2)
 Description: Qt 4 Linguist tools
@@ -859,7 +812,7 @@ Package: qdbus
 Architecture: any
 Multi-Arch: foreign
 Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dbus (<< 4:4.7.4-1)
 Replaces: libqt4-dbus (<< 4:4.7.4-1)
 Description: Qt 4 D-Bus tool
@@ -896,3 +849,17 @@ Description: Qt 4 API documentation (HTML format)
  This package contains the complete Qt 4 API documentation (HTML format).
  .
  The documentation is provided in HTML format.
+
+Package: qt4-default
+Architecture: any
+Depends: qtchooser, libqt4-dev, ${misc:Depends}
+Section: libdevel
+Conflicts: qt5-default
+Description: Qt 4 development defaults package
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package sets Qt 4 to be the default Qt version to be used when
+ using development binaries like qmake. It provides a default
+ configuration for qtchooser, but does not prevent alternative Qt
+ installations from being used.
diff --git a/debian/copyright b/debian/copyright
index 5f43d9a..84fe804 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -86,6 +86,7 @@ modified version of the Library.
 
 The Debian packaging is:
 
+    Copyright (C) 2012-2013 Timo Jyrinki <timo.jyrinki@canonical.com>
     Copyright (C) 2007-2010 Fathi Boudra <fabo@debian.org>
     Copyright (C) 2007-2010 Sune Vuorela <debian@pusling.com>
     Copyright (C) 2008-2010 Modestas Vainius <modax@debian.org>
diff --git a/debian/libqt4-declarative.symbols b/debian/libqt4-declarative.symbols
index 8473947..345ea5e 100644
--- a/debian/libqt4-declarative.symbols
+++ b/debian/libqt4-declarative.symbols
@@ -1,11 +1,11 @@
-# SymbolsHelper-Confirmed: 4:4.8.1 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha powerpcspe ppc64
 libQtDeclarative.so.4 libqt4-declarative #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z10qmlContextPK7QObject@Base 4:4.7.0~beta1
  _Z18qmlExecuteDeferredP7QObject@Base 4:4.7.0~beta1
  _Z27qmlAttachedPropertiesObjectPiPK7QObjectPK11QMetaObjectb@Base 4:4.7.0~beta1
  _Z31qmlAttachedPropertiesObjectByIdiPK7QObjectb@Base 4:4.7.0~beta1
- (optional=internal|arch=armel armhf mips mipsel powerpc s390 s390x sparc)_Z6qDebugv@Base 4:4.8.1
+ (optional=internal|arch=alpha armel armhf mips mipsel powerpc powerpcspe s390 s390x sparc)_Z6qDebugv@Base 4:4.8.1
  _Z7qmlInfoPK7QObject@Base 4:4.7.0~beta2
  _Z7qmlInfoPK7QObjectRK17QDeclarativeError@Base 4:4.7.0~beta2
  _Z7qmlInfoPK7QObjectRK5QListI17QDeclarativeErrorE@Base 4:4.7.0~beta2
@@ -243,6 +243,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZN17QDeclarativeTimerD0Ev@Base 4:4.7.4
  _ZN17QDeclarativeTimerD1Ev@Base 4:4.7.4
  _ZN17QDeclarativeTimerD2Ev@Base 4:4.7.4
+ _ZN17QPerformanceTimer5startEv@Base 4:4.8.4
  _ZN18QDeclarativeAction17deleteFromBindingEv@Base 4:4.7.0~beta1
  _ZN18QDeclarativeActionC1EP7QObjectRK7QStringP19QDeclarativeContextRK8QVariant@Base 4:4.7.0~beta1
  _ZN18QDeclarativeActionC1EP7QObjectRK7QStringRK8QVariant@Base 4:4.7.0~beta1
@@ -416,6 +417,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZN19QDeclarativeAnchorsD0Ev@Base 4:4.7.0~beta1
  _ZN19QDeclarativeAnchorsD1Ev@Base 4:4.7.0~beta1
  _ZN19QDeclarativeAnchorsD2Ev@Base 4:4.7.0~beta1
+ _ZN19QDeclarativeBinding10disconnectEN27QDeclarativeAbstractBinding14DisconnectModeE@Base 4:4.8.3
  _ZN19QDeclarativeBinding10setEnabledEb6QFlagsIN27QDeclarativePropertyPrivate9WriteFlagEE@Base 4:4.7.0~beta1
  _ZN19QDeclarativeBinding11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.7.0~beta1
  _ZN19QDeclarativeBinding11qt_metacastEPKc@Base 4:4.7.0~beta1
@@ -685,6 +687,28 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZN22QDeclarativeDebugQueryD0Ev@Base 4:4.7.4
  _ZN22QDeclarativeDebugQueryD1Ev@Base 4:4.7.4
  _ZN22QDeclarativeDebugQueryD2Ev@Base 4:4.7.4
+ _ZN22QDeclarativeDebugTrace10startRangeENS_9RangeTypeE@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace12addEventImplENS_9EventTypeE@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace12endRangeImplENS_9RangeTypeE@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace12sendMessagesEv@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace13rangeDataImplENS_9RangeTypeERK4QUrl@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace13rangeDataImplENS_9RangeTypeERK7QString@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace13rangeLocationENS_9RangeTypeERK4QUrli@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace13rangeLocationENS_9RangeTypeERK7QStringi@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace14processMessageERK21QDeclarativeDebugData@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace14startRangeImplENS_9RangeTypeE@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace15messageReceivedERK10QByteArray@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace17rangeLocationImplENS_9RangeTypeERK4QUrli@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace17rangeLocationImplENS_9RangeTypeERK7QStringi@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace8addEventENS_9EventTypeE@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace8endRangeENS_9RangeTypeE@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace9rangeDataENS_9RangeTypeERK4QUrl@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTrace9rangeDataENS_9RangeTypeERK7QString@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTraceC1Ev@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTraceC2Ev@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTraceD0Ev@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTraceD1Ev@Base 4:4.8.4
+ _ZN22QDeclarativeDebugTraceD2Ev@Base 4:4.8.4
  _ZN22QDeclarativeDebugWatch11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.7.0~beta1
  _ZN22QDeclarativeDebugWatch11qt_metacastEPKc@Base 4:4.7.0~beta1
  _ZN22QDeclarativeDebugWatch12stateChangedENS_5StateE@Base 4:4.7.0~beta1
@@ -1070,7 +1094,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZN27QDeclarativeAbstractBinding11weakPointerEv@Base 4:4.7.1
  _ZN27QDeclarativeAbstractBinding16removeFromObjectEv@Base 4:4.7.0~beta1
  _ZN27QDeclarativeAbstractBinding5clearEv@Base 4:4.7.0~beta1
- _ZN27QDeclarativeAbstractBinding7destroyEv@Base 4:4.7.0~beta1
+ _ZN27QDeclarativeAbstractBinding7destroyENS_11DestroyModeE@Base 4:4.8.3
  _ZN27QDeclarativeAbstractBindingC1Ev@Base 4:4.7.0~beta1
  _ZN27QDeclarativeAbstractBindingC2Ev@Base 4:4.7.0~beta1
  _ZN27QDeclarativeAbstractBindingD0Ev@Base 4:4.7.0~beta1
@@ -1158,7 +1182,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZN27QDeclarativePropertyPrivate5writeERK20QDeclarativePropertyRK8QVariant6QFlagsINS_9WriteFlagEE@Base 4:4.7.0~beta1
  _ZN27QDeclarativePropertyPrivate7bindingEP7QObjectii@Base 4:4.7.2
  _ZN27QDeclarativePropertyPrivate7bindingERK20QDeclarativeProperty@Base 4:4.7.0~beta1
- _ZN27QDeclarativePropertyPrivate7connectEPK7QObjectiS2_iiPi@Base 4:4.7.2
+ _ZN27QDeclarativePropertyPrivate7connectEP7QObjectiPKS0_iiPi@Base 4:4.8.3
  _ZN27QDeclarativePropertyPrivate7restoreERK10QByteArrayP7QObjectP23QDeclarativeContextData@Base 4:4.7.0~beta1
  _ZN27QDeclarativePropertyPrivate7restoreERKN25QDeclarativePropertyCache4DataERKNS0_13ValueTypeDataEP7QObjectP23QDeclarativeContextData@Base 4:4.7.4
  _ZN27QDeclarativePropertyPrivateD0Ev@Base 4:4.7.4
@@ -1210,6 +1234,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZN28QDeclarativeStringConverters18vector3DFromStringERK7QStringPb@Base 4:4.7.0~beta1
  _ZN28QDeclarativeValueTypeFactory11isValueTypeEi@Base 4:4.7.0~beta1
  _ZN28QDeclarativeValueTypeFactory18registerValueTypesEv@Base 4:4.7.0~beta1
+ _ZN28QDeclarativeValueTypeFactory24registerValueTypesCompatEv@Base 4:4.8.4
  _ZN28QDeclarativeValueTypeFactory9valueTypeEi@Base 4:4.7.0~beta1
  _ZN28QDeclarativeValueTypeFactoryC1Ev@Base 4:4.7.0~beta1
  _ZN28QDeclarativeValueTypeFactoryC2Ev@Base 4:4.7.0~beta1
@@ -1511,6 +1536,8 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZNK17QDeclarativeTimer16triggeredOnStartEv@Base 4:4.7.1
  _ZNK17QDeclarativeTimer8intervalEv@Base 4:4.7.1
  _ZNK17QDeclarativeTimer9isRunningEv@Base 4:4.7.1
+ _ZNK17QPerformanceTimer21elapsedToAbsoluteTimeEx@Base 4:4.8.4
+ _ZNK17QPerformanceTimer7elapsedEv@Base 4:4.8.4
  _ZNK18QDeclarativeEngine10metaObjectEv@Base 4:4.7.0~beta1
  _ZNK18QDeclarativeEngine11rootContextEv@Base 4:4.7.0~rc1
  _ZNK18QDeclarativeEngine13imageProviderERK7QString@Base 4:4.7.0~beta1
@@ -1907,12 +1934,14 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZNK32QDeclarativeDebugExpressionQuery10metaObjectEv@Base 4:4.7.0~beta1
  _ZNK32QDeclarativeDebugExpressionQuery6resultEv@Base 4:4.7.0~beta1
  _ZNK32QDeclarativeDebugObjectReference10propertiesEv@Base 4:4.7.0~beta1
+ _ZNK32QDeclarativeDebugObjectReference13needsMoreDataEv@Base 4:4.8.4
  _ZNK32QDeclarativeDebugObjectReference14contextDebugIdEv@Base 4:4.7.0~beta1
  _ZNK32QDeclarativeDebugObjectReference4nameEv@Base 4:4.7.0~beta1
  _ZNK32QDeclarativeDebugObjectReference6sourceEv@Base 4:4.7.0~beta1
  _ZNK32QDeclarativeDebugObjectReference7debugIdEv@Base 4:4.7.0~beta1
  _ZNK32QDeclarativeDebugObjectReference8childrenEv@Base 4:4.7.0~beta1
  _ZNK32QDeclarativeDebugObjectReference8idStringEv@Base 4:4.7.0~beta1
+ _ZNK32QDeclarativeDebugObjectReference8parentIdEv@Base 4:4.8.4
  _ZNK32QDeclarativeDebugObjectReference9classNameEv@Base 4:4.7.0~beta1
  _ZNK33QDeclarativeDebugContextReference4nameEv@Base 4:4.7.0~beta1
  _ZNK33QDeclarativeDebugContextReference7debugIdEv@Base 4:4.7.0~beta1
@@ -1933,7 +1962,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZNK7QPacket4dataEv@Base 4:4.7.2
  _ZNK7QPacket7isEmptyEv@Base 4:4.7.0~beta1
  (optional=external|arch=amd64 kfreebsd-amd64)_ZNK7QPointF7toPointEv@Base 4:4.8.1
- (optional=templinst|arch=armel armhf sparc)_ZNK8QVariant5valueI6QColorEET_v@Base 4:4.7.2
+ (optional=templinst|arch=armel armhf ppc64 sparc)_ZNK8QVariant5valueI6QColorEET_v@Base 4:4.7.2
  _ZTI11QMetaObject@Base 4:4.7.0~beta1
  _ZTI11QSharedData@Base 4:4.7.0~beta1
  (arch=!armel !armhf)_ZTI12QDashStroker@Base 4:4.7.2
@@ -1960,6 +1989,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZTI21QDeclarativeScaleGrid@Base 4:4.7.0~beta1
  _ZTI21QDeclarativeValueType@Base 4:4.7.0~beta1
  _ZTI22QDeclarativeDebugQuery@Base 4:4.7.0~beta1
+ _ZTI22QDeclarativeDebugTrace@Base 4:4.8.4
  _ZTI22QDeclarativeDebugWatch@Base 4:4.7.0~beta1
  _ZTI22QDeclarativeExpression@Base 4:4.7.0~beta1
  _ZTI22QDeclarativeStateGroup@Base 4:4.7.0~beta1
@@ -2028,6 +2058,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZTS21QDeclarativeScaleGrid@Base 4:4.7.0~beta1
  _ZTS21QDeclarativeValueType@Base 4:4.7.0~beta1
  _ZTS22QDeclarativeDebugQuery@Base 4:4.7.0~beta1
+ _ZTS22QDeclarativeDebugTrace@Base 4:4.8.4
  _ZTS22QDeclarativeDebugWatch@Base 4:4.7.0~beta1
  _ZTS22QDeclarativeExpression@Base 4:4.7.0~beta1
  _ZTS22QDeclarativeStateGroup@Base 4:4.7.0~beta1
@@ -2094,6 +2125,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  _ZTV21QDeclarativeScaleGrid@Base 4:4.7.0~beta1
  _ZTV21QDeclarativeValueType@Base 4:4.7.0~beta1
  _ZTV22QDeclarativeDebugQuery@Base 4:4.7.0~beta1
+ _ZTV22QDeclarativeDebugTrace@Base 4:4.8.4
  _ZTV22QDeclarativeDebugWatch@Base 4:4.7.0~beta1
  _ZTV22QDeclarativeExpression@Base 4:4.7.0~beta1
  _ZTV22QDeclarativeStateGroup@Base 4:4.7.0~beta1
@@ -2165,6 +2197,7 @@ libQtDeclarative.so.4 libqt4-declarative #MINVER#
  (c++)"non-virtual thunk to QDeclarativeBehavior::setTarget(QDeclarativeProperty const&)@Base" 4:4.7.0~beta1
  (c++)"non-virtual thunk to QDeclarativeBehavior::write(QVariant const&)@Base" 4:4.7.0~beta1
  (c++)"non-virtual thunk to QDeclarativeBehavior::~QDeclarativeBehavior()@Base" 4:4.7.0~beta1
+ (c++)"non-virtual thunk to QDeclarativeBinding::disconnect(QDeclarativeAbstractBinding::DisconnectMode)@Base" 4:4.8.3
  (c++)"non-virtual thunk to QDeclarativeBinding::expression() const@Base" 4:4.7.0~beta1
  (c++)"non-virtual thunk to QDeclarativeBinding::setEnabled(bool, QFlags<QDeclarativePropertyPrivate::WriteFlag>)@Base" 4:4.7.0~beta1
  (c++)"non-virtual thunk to QDeclarativeBinding::update(QFlags<QDeclarativePropertyPrivate::WriteFlag>)@Base" 4:4.7.0~beta1
diff --git a/debian/libqt4-designer.symbols b/debian/libqt4-designer.symbols
index 154215e..c613f4d 100644
--- a/debian/libqt4-designer.symbols
+++ b/debian/libqt4-designer.symbols
@@ -1,11 +1,11 @@
-# SymbolsHelper-Confirmed: 4:4.8.2 ia64
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha powerpcspe
 libQtDesigner.so.4 libqt4-designer #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z20domPropertyToVariantP20QAbstractFormBuilderPK11QMetaObjectPK11DomProperty@Base 4:4.5.3
  _Z20domPropertyToVariantPK11DomProperty@Base 4:4.5.3
  _Z20variantToDomPropertyP20QAbstractFormBuilderPK11QMetaObjectRK7QStringRK8QVariant@Base 4:4.5.3
  (optional=external|arch=armel)_Z6qDebugv@Base 4:4.8.0
- (optional=external|arch=armel armhf mips mipsel s390 s390x)_Z8qWarningv@Base 4:4.8.1
+ (optional=external|arch=alpha armel armhf mips mipsel s390 s390x)_Z8qWarningv@Base 4:4.8.1
  _ZN10DomInclude4readER16QXmlStreamReader@Base 4:4.5.3
  _ZN10DomInclude5clearEb@Base 4:4.5.3
  _ZN10DomIncludeC1Ev@Base 4:4.5.3
@@ -1282,9 +1282,9 @@ libQtDesigner.so.4 libqt4-designer #MINVER#
  (optional=internal)_ZN18qdesigner_internal16AddActionCommandD1Ev@Base 4:4.7.4
  (optional=internal)_ZN18qdesigner_internal16AddActionCommandD2Ev@Base 4:4.7.4
  (optional=internal)_ZN18qdesigner_internal16DesignerMetaEnumC1ERK7QStringS3_S3_@Base 4:4.5.3
- (optional=internal|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal16DesignerMetaEnumC1ERKS0_@Base 4:4.8.1
+ (optional=internal|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal16DesignerMetaEnumC1ERKS0_@Base 4:4.8.1
  (optional=internal)_ZN18qdesigner_internal16DesignerMetaEnumC2ERK7QStringS3_S3_@Base 4:4.5.3
- (optional=internal|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal16DesignerMetaEnumC2ERKS0_@Base 4:4.8.0
+ (optional=internal|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal16DesignerMetaEnumC2ERKS0_@Base 4:4.8.0
  (optional=internal|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN18qdesigner_internal16DesignerMetaEnumD1Ev@Base 4:4.8.1
  (optional=internal|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN18qdesigner_internal16DesignerMetaEnumD2Ev@Base 4:4.8.1
  (optional=internal)_ZN18qdesigner_internal16LayoutProperties17fromPropertySheetEPK28QDesignerFormEditorInterfaceP7QLayouti@Base 4:4.5.3
@@ -1372,9 +1372,9 @@ libQtDesigner.so.4 libqt4-designer #MINVER#
  (optional=internal)_ZN18qdesigner_internal17DesignerIconCacheD1Ev@Base 4:4.7.4
  (optional=internal)_ZN18qdesigner_internal17DesignerIconCacheD2Ev@Base 4:4.7.4
  (optional=internal)_ZN18qdesigner_internal17DesignerMetaFlagsC1ERK7QStringS3_S3_@Base 4:4.5.3
- (optional=internal|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal17DesignerMetaFlagsC1ERKS0_@Base 4:4.8.0
+ (optional=internal|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal17DesignerMetaFlagsC1ERKS0_@Base 4:4.8.0
  (optional=internal)_ZN18qdesigner_internal17DesignerMetaFlagsC2ERK7QStringS3_S3_@Base 4:4.5.3
- (optional=internal|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal17DesignerMetaFlagsC2ERKS0_@Base 4:4.8.0
+ (optional=internal|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal17DesignerMetaFlagsC2ERKS0_@Base 4:4.8.0
  (optional=internal|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN18qdesigner_internal17DesignerMetaFlagsD1Ev@Base 4:4.8.1
  (optional=internal|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN18qdesigner_internal17DesignerMetaFlagsD2Ev@Base 4:4.8.1
  (optional=internal)_ZN18qdesigner_internal17DockWidgetCommand4initEP11QDockWidget@Base 4:4.5.3
@@ -1981,10 +1981,10 @@ libQtDesigner.so.4 libqt4-designer #MINVER#
  (optional=internal)_ZN18qdesigner_internal22PropertySheetEnumValueC2Ev@Base 4:4.5.3
  (optional=internal)_ZN18qdesigner_internal22PropertySheetEnumValueD1Ev@Base 4:4.7.4
  (optional=internal)_ZN18qdesigner_internal22PropertySheetEnumValueD2Ev@Base 4:4.7.4
- (optional=internal|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal22PropertySheetFlagValueC1ERKS0_@Base 4:4.8.0
+ (optional=internal|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal22PropertySheetFlagValueC1ERKS0_@Base 4:4.8.0
  (optional=internal)_ZN18qdesigner_internal22PropertySheetFlagValueC1EiRKNS_17DesignerMetaFlagsE@Base 4:4.5.3
  (optional=internal)_ZN18qdesigner_internal22PropertySheetFlagValueC1Ev@Base 4:4.5.3
- (optional=internal|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal22PropertySheetFlagValueC2ERKS0_@Base 4:4.8.0
+ (optional=internal|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x)_ZN18qdesigner_internal22PropertySheetFlagValueC2ERKS0_@Base 4:4.8.0
  (optional=internal)_ZN18qdesigner_internal22PropertySheetFlagValueC2EiRKNS_17DesignerMetaFlagsE@Base 4:4.5.3
  (optional=internal)_ZN18qdesigner_internal22PropertySheetFlagValueC2Ev@Base 4:4.5.3
  (optional=internal)_ZN18qdesigner_internal22PropertySheetFlagValueD1Ev@Base 4:4.7.4
@@ -2566,8 +2566,8 @@ libQtDesigner.so.4 libqt4-designer #MINVER#
  _ZN20QDesignerMemberSheetD0Ev@Base 4:4.5.3
  _ZN20QDesignerMemberSheetD1Ev@Base 4:4.5.3
  _ZN20QDesignerMemberSheetD2Ev@Base 4:4.5.3
- (arch=!mips !mipsel)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
- (arch=!mips !mipsel)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
+ (arch=!alpha !mips !mipsel)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
+ (arch=!alpha !mips !mipsel)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
  _ZN20QtResourceViewDialog11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN20QtResourceViewDialog11qt_metacastEPKc@Base 4:4.5.3
  _ZN20QtResourceViewDialog14selectResourceERK7QString@Base 4:4.5.3
@@ -3232,8 +3232,8 @@ libQtDesigner.so.4 libqt4-designer #MINVER#
  _ZN8DomSlotsD2Ev@Base 4:4.5.3
  (arch=sparc)_ZN8QToolBox7addItemEP7QWidgetRK7QString@Base 4:4.8.0
  (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN8QVariant8setValueIN18qdesigner_internal22PropertySheetEnumValueEEEvRKT_@Base 4:4.8.0
- (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x !sparc)_ZN8QVariant8setValueIN18qdesigner_internal22PropertySheetFlagValueEEEvRKT_@Base 4:4.8.0
- (optional=templinst|arch=!amd64 !armel !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390)_ZN8QVariant9fromValueIN18qdesigner_internal29PropertySheetKeySequenceValueEEES_RKT_@Base 4:4.8.0
+ (optional=templinst|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x !sparc)_ZN8QVariant8setValueIN18qdesigner_internal22PropertySheetFlagValueEEEvRKT_@Base 4:4.8.0
+ (optional=templinst|arch=!amd64 !armel !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !s390)_ZN8QVariant9fromValueIN18qdesigner_internal29PropertySheetKeySequenceValueEEES_RKT_@Base 4:4.8.0
  _ZN9DomAction18setElementPropertyERK5QListIP11DomPropertyE@Base 4:4.5.3
  _ZN9DomAction19setElementAttributeERK5QListIP11DomPropertyE@Base 4:4.5.3
  _ZN9DomAction4readER16QXmlStreamReader@Base 4:4.5.3
@@ -4698,16 +4698,16 @@ libQtDesignerComponents.so.4 libqt4-designer #MINVER#
  _ZN19QDesignerComponents20createResourceEditorEP28QDesignerFormEditorInterfaceP7QWidget@Base 4:4.5.3
  _ZN19QDesignerComponents21createObjectInspectorEP28QDesignerFormEditorInterfaceP7QWidget@Base 4:4.5.3
  _ZN19QDesignerComponents22createSignalSlotEditorEP28QDesignerFormEditorInterfaceP7QWidget@Base 4:4.5.3
- (optional=external|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
- (optional=external|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
+ (optional=external|arch=!alpha !amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
+ (optional=external|arch=!alpha !amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
  _ZN22QStyleOptionViewItemV3D1Ev@Base 4:4.7.4
  _ZN22QStyleOptionViewItemV3D2Ev@Base 4:4.7.4
  (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN8QVariant8setValueI4QMapIi5QIconEEEvRKT_@Base 4:4.8.0
  (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN8QVariant8setValueI5QListI5QPairI7QStringjEEEEvRKT_@Base 4:4.8.0
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390)_ZN8QVariant9fromValueIN18qdesigner_internal22PropertySheetIconValueEEES_RKT_@Base 4:4.8.0
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390)_ZN8QVariant9fromValueIN18qdesigner_internal24PropertySheetPixmapValueEEES_RKT_@Base 4:4.8.0
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390)_ZN8QVariant9fromValueIN18qdesigner_internal24PropertySheetStringValueEEES_RKT_@Base 4:4.8.0
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390)_ZN8QVariant9fromValueIN18qdesigner_internal29PropertySheetKeySequenceValueEEES_RKT_@Base 4:4.8.0
+ (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !s390)_ZN8QVariant9fromValueIN18qdesigner_internal22PropertySheetIconValueEEES_RKT_@Base 4:4.8.0
+ (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !s390)_ZN8QVariant9fromValueIN18qdesigner_internal24PropertySheetPixmapValueEEES_RKT_@Base 4:4.8.0
+ (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !s390)_ZN8QVariant9fromValueIN18qdesigner_internal24PropertySheetStringValueEEES_RKT_@Base 4:4.8.0
+ (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !s390)_ZN8QVariant9fromValueIN18qdesigner_internal29PropertySheetKeySequenceValueEEES_RKT_@Base 4:4.8.0
  (optional=external|arch=amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386)_ZN9QHashData8willGrowEv@Base 4:4.8.1
  (optional=external|arch=amd64 kfreebsd-amd64 mips mipsel)_ZN9QHashData9hasShrunkEv@Base 4:4.7.2
  (optional=templinst|arch=armel)_ZNK7QObject12findChildrenIP20QtIntPropertyManagerEE5QListIT_ERK7QString@Base 4:4.8.0
diff --git a/debian/libqt4-dev-bin.install b/debian/libqt4-dev-bin.install
index 5502220..a9e1859 100644
--- a/debian/libqt4-dev-bin.install
+++ b/debian/libqt4-dev-bin.install
@@ -1,7 +1,7 @@
-usr/bin/moc-qt4
-usr/bin/qdbuscpp2xml
-usr/bin/qdbusxml2cpp
-usr/bin/qt3to4
-usr/bin/rcc
-usr/bin/uic-qt4
-usr/bin/uic3
+usr/lib/*/qt4/bin/moc
+usr/lib/*/qt4/bin/qdbuscpp2xml
+usr/lib/*/qt4/bin/qdbusxml2cpp
+usr/lib/*/qt4/bin/qt3to4
+usr/lib/*/qt4/bin/rcc
+usr/lib/*/qt4/bin/uic
+usr/lib/*/qt4/bin/uic3
diff --git a/debian/libqt4-dev-bin.links b/debian/libqt4-dev-bin.links
deleted file mode 100644
index 3087c6c..0000000
--- a/debian/libqt4-dev-bin.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/moc-qt4         usr/share/qt4/bin/moc
-usr/bin/uic-qt4         usr/share/qt4/bin/uic
-usr/bin/rcc             usr/share/qt4/bin/rcc
diff --git a/debian/libqt4-dev-bin.links.in b/debian/libqt4-dev-bin.links.in
new file mode 100644
index 0000000..bbf72ce
--- /dev/null
+++ b/debian/libqt4-dev-bin.links.in
@@ -0,0 +1,5 @@
+usr/lib/MULTIARCH/qt4/bin/moc         usr/share/qt4/bin/moc
+usr/lib/MULTIARCH/qt4/bin/uic         usr/share/qt4/bin/uic
+usr/lib/MULTIARCH/qt4/bin/rcc             usr/share/qt4/bin/rcc
+usr/lib/MULTIARCH/qt4/bin/moc         usr/bin/moc-qt4
+usr/lib/MULTIARCH/qt4/bin/uic         usr/bin/uic-qt4
diff --git a/debian/libqt4-dev-bin.postinst b/debian/libqt4-dev-bin.postinst
deleted file mode 100644
index 9e3c347..0000000
--- a/debian/libqt4-dev-bin.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
-    /usr/bin/moc moc "/usr/bin/moc-qt4" "40" \
-    --slave /usr/share/man/man1/moc.1.gz moc.1.gz \
-    "/usr/share/man/man1/moc-qt4.1.gz"
-
-update-alternatives --install \
-    /usr/bin/uic uic "/usr/bin/uic-qt4" "40" \
-    --slave /usr/share/man/man1/uic.1.gz uic.1.gz \
-    "/usr/share/man/man1/uic-qt4.1.gz"
-
-#DEBHELPER#
diff --git a/debian/libqt4-dev-bin.preinst b/debian/libqt4-dev-bin.preinst
new file mode 100644
index 0000000..cc1b87b
--- /dev/null
+++ b/debian/libqt4-dev-bin.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove moc "/usr/bin/moc-qt4"
+            update-alternatives --remove uic "/usr/bin/uic-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/libqt4-dev-bin.prerm b/debian/libqt4-dev-bin.prerm
deleted file mode 100644
index d822876..0000000
--- a/debian/libqt4-dev-bin.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    upgrade) ;;
-    remove|failed-upgrade|deconfigure)
-        update-alternatives --remove moc "/usr/bin/moc-qt4"
-        update-alternatives --remove uic "/usr/bin/uic-qt4"
-        ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/libqt4-help.symbols b/debian/libqt4-help.symbols
index 3e25489..d5493c2 100644
--- a/debian/libqt4-help.symbols
+++ b/debian/libqt4-help.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.1 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha amd64 powerpcspe
 libQtHelp.so.4 libqt4-help #MINVER#
 * Build-Depends-Package: libqt4-dev
  _ZN11QHelpEngine11indexWidgetEv@Base 4:4.5.3
@@ -108,8 +108,8 @@ libQtHelp.so.4 libqt4-help #MINVER#
  _ZN16QHelpProjectDataD0Ev@Base 4:4.5.3
  _ZN16QHelpProjectDataD1Ev@Base 4:4.5.3
  _ZN16QHelpProjectDataD2Ev@Base 4:4.5.3
- (arch=mips mipsel powerpc s390 s390x sparc)_ZN16QHelpSearchQueryD1Ev@Base 4:4.8.1
- (arch=mips mipsel powerpc s390 s390x sparc)_ZN16QHelpSearchQueryD2Ev@Base 4:4.8.1
+ (arch=!amd64)_ZN16QHelpSearchQueryD1Ev@Base 4:4.8.4
+ (arch=!amd64)_ZN16QHelpSearchQueryD2Ev@Base 4:4.8.4
  _ZN16QStringListModelD0Ev@Base 4:4.7.4
  _ZN16QStringListModelD1Ev@Base 4:4.7.4
  _ZN16QStringListModelD2Ev@Base 4:4.7.4
@@ -163,8 +163,8 @@ libQtHelp.so.4 libqt4-help #MINVER#
  _ZN20QHelpDataContentItemC2EPS_RK7QStringS3_@Base 4:4.5.3
  _ZN20QHelpDataContentItemD1Ev@Base 4:4.5.3
  _ZN20QHelpDataContentItemD2Ev@Base 4:4.5.3
- (optional=external|arch=!amd64 !armel !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
- (optional=external|arch=!amd64 !armel !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
+ (optional=external|arch=!alpha !amd64 !armel !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
+ (optional=external|arch=!alpha !amd64 !armel !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !sparc)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
  _ZN21QHelpDataCustomFilterD1Ev@Base 4:4.7.4
  _ZN21QHelpDataCustomFilterD2Ev@Base 4:4.7.4
  _ZN22QHelpDataFilterSection10addContentEP20QHelpDataContentItem@Base 4:4.5.3
diff --git a/debian/libqt4-network.symbols b/debian/libqt4-network.symbols
index 8372ba0..64999d0 100644
--- a/debian/libqt4-network.symbols
+++ b/debian/libqt4-network.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.2 s390x
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha amd64 powerpcspe ppc64 s390x
 libQtNetwork.so.4 libqt4-network #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi@Base 4:4.6.3
@@ -818,7 +818,7 @@ libQtNetwork.so.4 libqt4-network #MINVER#
  _ZN9QSslErrorD1Ev@Base 4:4.5.3
  _ZN9QSslErrorD2Ev@Base 4:4.5.3
  _ZN9QSslErroraSERKS_@Base 4:4.5.3
- (optional=external|arch=!mips !mipsel !powerpc !s390 !s390x !sparc)_ZNK10QByteArray8containsEPKc@Base 4:4.8.1
+ (optional=external|arch=!alpha !mips !mipsel !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc)_ZNK10QByteArray8containsEPKc@Base 4:4.8.4
  _ZNK10QSslCipher13supportedBitsEv@Base 4:4.5.3
  _ZNK10QSslCipher14protocolStringEv@Base 4:4.5.3
  _ZNK10QSslCipher16encryptionMethodEv@Base 4:4.5.3
diff --git a/debian/libqt4-opengl.symbols b/debian/libqt4-opengl.symbols
index f1d4dae..0b34462 100644
--- a/debian/libqt4-opengl.symbols
+++ b/debian/libqt4-opengl.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.1 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha powerpcspe ppc64
 libQtOpenGL.so.4 libqt4-opengl #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z18qt_gl_library_namev@Base 4:4.5.3
@@ -61,7 +61,7 @@ libQtOpenGL.so.4 libqt4-opengl #MINVER#
  (arch=!armel !armhf)_ZN12QDashStroker5beginEPv@Base 4:4.5.3
  (arch=!armel !armhf)_ZN12QDashStrokerD0Ev@Base 4:4.5.3
  (arch=!armel !armhf)_ZN12QDashStrokerD1Ev@Base 4:4.5.3
- (arch=amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZN12QDashStrokerD2Ev@Base 4:4.8.1
+ _ZN12QDashStrokerD2Ev@Base 4:4.8.4
  _ZN12QGLFunctions21initializeGLFunctionsEPK10QGLContext@Base 4:4.8.0
  _ZN12QGLFunctionsC1EPK10QGLContext@Base 4:4.8.0
  _ZN12QGLFunctionsC1Ev@Base 4:4.8.0
diff --git a/debian/libqt4-qt3support.symbols b/debian/libqt4-qt3support.symbols
index ea55fa0..d70e60d 100644
--- a/debian/libqt4-qt3support.symbols
+++ b/debian/libqt4-qt3support.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.1 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha amd64 powerpcspe ppc64
 libQt3Support.so.4 libqt4-qt3support #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z16qt_tryAccelEventP7QWidgetP9QKeyEvent@Base 4:4.5.3
@@ -1630,8 +1630,8 @@ libQt3Support.so.4 libqt4-qt3support #MINVER#
  _ZN12Q3TextStreamrsERs@Base 4:4.5.3
  _ZN12Q3TextStreamrsERt@Base 4:4.5.3
  _ZN12Q3TextString16appendParagraphsEP15Q3TextParagraphS1_@Base 4:4.5.3
- (arch=armel armhf mips mipsel powerpc s390 s390x sparc)_ZN12Q3TextString18nextCursorPositionEi@Base 4:4.8.1
- (arch=armel armhf mips mipsel powerpc s390 s390x sparc)_ZN12Q3TextString22previousCursorPositionEi@Base 4:4.8.1
+ (arch=!amd64)_ZN12Q3TextString18nextCursorPositionEi@Base 4:4.8.4
+ (arch=!amd64)_ZN12Q3TextString22previousCursorPositionEi@Base 4:4.8.4
  _ZN12Q3TextString5clearEv@Base 4:4.5.3
  _ZN12Q3TextString6insertEiP16Q3TextStringCharb@Base 4:4.5.3
  _ZN12Q3TextString6insertEiPK5QChariP12Q3TextFormat@Base 4:4.5.3
@@ -2786,8 +2786,8 @@ libQt3Support.so.4 libqt4-qt3support #MINVER#
  _ZN18Q3TextStyleCommand9unexecuteEP12Q3TextCursor@Base 4:4.5.3
  _ZN18Q3TextStyleCommandC1EP14Q3TextDocumentiiRK10QByteArray@Base 4:4.5.3
  _ZN18Q3TextStyleCommandC2EP14Q3TextDocumentiiRK10QByteArray@Base 4:4.5.3
- (optional=external|arch=amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 s390x sparc)_ZN18QStyleOptionButtonD1Ev@Base 4:4.8.1
- (optional=external|arch=amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 s390x sparc)_ZN18QStyleOptionButtonD2Ev@Base 4:4.8.1
+ (optional=external|arch=alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 s390x sparc)_ZN18QStyleOptionButtonD1Ev@Base 4:4.8.1
+ (optional=external|arch=alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 s390x sparc)_ZN18QStyleOptionButtonD2Ev@Base 4:4.8.1
  _ZN18QStyleOptionHeaderD1Ev@Base 4:4.7.4
  _ZN18QStyleOptionHeaderD2Ev@Base 4:4.7.4
  _ZN19Q3CanvasPixmapArray11readPixmapsERK7QStringi@Base 4:4.5.3
diff --git a/debian/libqt4-script.symbols b/debian/libqt4-script.symbols
index 070060f..a6cb24e 100644
--- a/debian/libqt4-script.symbols
+++ b/debian/libqt4-script.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.2 s390
+# SymbolsHelper-Confirmed: 4:4.8.4 ppc64 s390
 libQtScript.so.4 libqt4-script #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z14qScriptConnectP7QObjectPKcRK12QScriptValueS5_@Base 4:4.5.3
@@ -281,16 +281,16 @@ libQtScript.so.4 libqt4-script #MINVER#
  _ZN24QScriptSyntaxCheckResultD2Ev@Base 4:4.5.3
  _ZN24QScriptSyntaxCheckResultaSERKS_@Base 4:4.5.3
  (optional=private|subst)_ZN25QScriptEngineAgentPrivate11atStatementERKN5QTJSC17DebuggerCallFrameE{ssize_t}i@Base 4:4.7.0~beta1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !s390x)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEii@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 s390x)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEli@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !s390x)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEi@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 s390x)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEl@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !s390x)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEi@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 s390x)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEl@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !s390x)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEi@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 s390x)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEl@Base 4:4.6.1
- (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !s390x)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameEib@Base 4:4.6.1
- (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 s390x)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameElb@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEii@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x)_ZN25QScriptEngineAgentPrivate11returnEventERKN5QTJSC17DebuggerCallFrameEli@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEi@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x)_ZN25QScriptEngineAgentPrivate12evaluateStopERKN5QTJSC7JSValueEl@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEi@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x)_ZN25QScriptEngineAgentPrivate12functionExitERKN5QTJSC7JSValueEl@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEi@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x)_ZN25QScriptEngineAgentPrivate14exceptionCatchERKN5QTJSC17DebuggerCallFrameEl@Base 4:4.6.1
+ (optional=private|arch=!alpha !amd64 !ia64 !kfreebsd-amd64 !ppc64 !s390x)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameEib@Base 4:4.6.1
+ (optional=private|arch=alpha amd64 ia64 kfreebsd-amd64 ppc64 s390x)_ZN25QScriptEngineAgentPrivate14exceptionThrowERKN5QTJSC17DebuggerCallFrameElb@Base 4:4.6.1
  (optional=private|subst)_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameE{ssize_t}i@Base 4:4.7.0~beta1
  (optional=private)_ZN25QScriptEngineAgentPrivate6attachEv@Base 4:4.6.1
  (optional=private)_ZN25QScriptEngineAgentPrivate6detachEv@Base 4:4.6.1
diff --git a/debian/libqt4-scripttools.symbols b/debian/libqt4-scripttools.symbols
index 49cbe63..f1a2022 100644
--- a/debian/libqt4-scripttools.symbols
+++ b/debian/libqt4-scripttools.symbols
@@ -1,11 +1,9 @@
-# SymbolsHelper-Confirmed: 4:4.8.1 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha
 libQtScriptTools.so.4 libqt4-scripttools #MINVER#
 * Build-Depends-Package: libqt4-dev
  (optional=external|arch=hppa sparc)_ZN15QBasicAtomicInt3refEv@Base 4:4.5.3
  (optional=external|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN15QLinearGradientD1Ev@Base 4:4.8.1
  (optional=external|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZN15QLinearGradientD2Ev@Base 4:4.8.1
- (optional=external|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
- (optional=external|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
  _ZN21QScriptEngineDebugger11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN21QScriptEngineDebugger11qt_metacastEPKc@Base 4:4.5.3
  _ZN21QScriptEngineDebugger16staticMetaObjectE@Base 4:4.5.3
diff --git a/debian/libqt4-webkit-dbg.lintian-overrides b/debian/libqt4-webkit-dbg.lintian-overrides
new file mode 100644
index 0000000..2a3bdc7
--- /dev/null
+++ b/debian/libqt4-webkit-dbg.lintian-overrides
@@ -0,0 +1,2 @@
+# This is a dummy package.
+qt4-x11 source: dbg-package-missing-depends libqt4-webkit-dbg
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index c100d8f..c234bd7 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -1,6 +1,9 @@
 usr/lib/*/libQtCLucene.so.*
 usr/lib/*/libQtCore.so.*
+usr/lib/*/qt-default/qtchooser/default.conf
 usr/lib/*/qt4/plugins/codecs/*.so
+usr/lib/*/qtchooser/4.conf
+usr/lib/*/qtchooser/qt4.conf
 usr/share/qt4/translations/qt_ar.qm
 usr/share/qt4/translations/qt_cs.qm
 usr/share/qt4/translations/qt_da.qm
@@ -23,3 +26,4 @@ usr/share/qt4/translations/qt_sv.qm
 usr/share/qt4/translations/qt_uk.qm
 usr/share/qt4/translations/qt_zh_CN.qm
 usr/share/qt4/translations/qt_zh_TW.qm
+usr/share/qtchooser/qt4-*.conf
diff --git a/debian/libqtcore4.symbols b/debian/libqtcore4.symbols
index 3a5fe73..1a26762 100644
--- a/debian/libqtcore4.symbols
+++ b/debian/libqtcore4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.2 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha amd64 armel ia64 mips powerpc powerpcspe ppc64 s390 s390x sparc
 libQtCLucene.so.4 libqtcore4 #MINVER#
 * Build-Depends-Package: libqt4-dev
  _ZN12QCLuceneHits2idEi@Base 4:4.5.3
@@ -527,14 +527,14 @@ libQtCLucene.so.4 libqtcore4 #MINVER#
  (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt6vectorIPN6lucene6search6WeightESaIS3_EED1Ev@Base 4:4.8.2
  (optional=templinst|arch=!amd64 !armel !armhf !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt6vectorIPN6lucene6search6WeightESaIS3_EED2Ev@Base 4:4.8.2
  (optional=templinst)_ZNSt6vectorIPhSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 4:4.5.3
- (optional=templinst|arch=amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZNSt6vectorIPhSaIS0_EED1Ev@Base 4:4.8.1
- (optional=templinst|arch=amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZNSt6vectorIPhSaIS0_EED2Ev@Base 4:4.8.1
+ (optional=templinst|arch=alpha amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc)_ZNSt6vectorIPhSaIS0_EED1Ev@Base 4:4.8.1
+ (optional=templinst|arch=alpha amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc)_ZNSt6vectorIPhSaIS0_EED2Ev@Base 4:4.8.1
  (optional=templinst)_ZNSt6vectorIPwSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 4:4.5.3
- (optional=templinst|arch=amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZNSt6vectorIPwSaIS0_EED1Ev@Base 4:4.8.1
- (optional=templinst|arch=amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZNSt6vectorIPwSaIS0_EED2Ev@Base 4:4.8.1
+ (optional=templinst|arch=alpha amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc)_ZNSt6vectorIPwSaIS0_EED1Ev@Base 4:4.8.1
+ (optional=templinst|arch=alpha amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc)_ZNSt6vectorIPwSaIS0_EED2Ev@Base 4:4.8.1
  (optional=templinst)_ZNSt6vectorIiSaIiEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPiS1_EERKi@Base 4:4.5.3
- (optional=templinst|arch=amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZNSt6vectorIiSaIiEED1Ev@Base 4:4.8.1
- (optional=templinst|arch=amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZNSt6vectorIiSaIiEED2Ev@Base 4:4.8.1
+ (optional=templinst|arch=alpha amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc)_ZNSt6vectorIiSaIiEED1Ev@Base 4:4.8.1
+ (optional=templinst|arch=alpha amd64 hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc)_ZNSt6vectorIiSaIiEED2Ev@Base 4:4.8.1
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeI7QStringS0_St9_IdentityIS0_EN6lucene4util7Compare7QstringESaIS0_EE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKS0_@Base 4:4.5.3
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeI7QStringS0_St9_IdentityIS0_EN6lucene4util7Compare7QstringESaIS0_EE16_M_insert_uniqueERKS0_@Base 4:4.5.3
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeI7QStringS0_St9_IdentityIS0_EN6lucene4util7Compare7QstringESaIS0_EE8_M_eraseEPSt13_Rb_tree_nodeIS0_E@Base 4:4.5.3
@@ -558,7 +558,7 @@ libQtCLucene.so.4 libqtcore4 #MINVER#
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeIPFvbES1_St9_IdentityIS1_EN6lucene4util7Compare4VoidIS0_EESaIS1_EE16_M_insert_uniqueERKS1_@Base 4:4.7.2
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeIPFvbES1_St9_IdentityIS1_EN6lucene4util7Compare4VoidIS0_EESaIS1_EE8_M_eraseEPSt13_Rb_tree_nodeIS1_E@Base 4:4.5.3
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeIPKcSt4pairIKS1_iESt10_Select1stIS4_EN6lucene4util7Compare4CharESaIS4_EE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS4_@Base 4:4.7.2
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390 !s390x !sparc)_ZNSt8_Rb_treeIPKcSt4pairIKS1_iESt10_Select1stIS4_EN6lucene4util7Compare4CharESaIS4_EE14_M_lower_boundEPSt13_Rb_tree_nodeIS4_ESF_RS3_@Base 4:4.7.2
+ (optional=templinst|arch=!alpha !amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc)_ZNSt8_Rb_treeIPKcSt4pairIKS1_iESt10_Select1stIS4_EN6lucene4util7Compare4CharESaIS4_EE14_M_lower_boundEPSt13_Rb_tree_nodeIS4_ESF_RS3_@Base 4:4.7.2
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeIPKcSt4pairIKS1_iESt10_Select1stIS4_EN6lucene4util7Compare4CharESaIS4_EE16_M_insert_uniqueERKS4_@Base 4:4.7.2
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeIPKcSt4pairIKS1_iESt10_Select1stIS4_EN6lucene4util7Compare4CharESaIS4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS4_ERKS4_@Base 4:4.7.2
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_ZNSt8_Rb_treeIPKcSt4pairIKS1_iESt10_Select1stIS4_EN6lucene4util7Compare4CharESaIS4_EE8_M_eraseEPSt13_Rb_tree_nodeIS4_E@Base 4:4.5.3
@@ -833,7 +833,8 @@ libQtCore.so.4 libqtcore4 #MINVER#
  (arch=hurd-i386 i386 kfreebsd-i386)_Z10qvsnprintfPcjPKcS_@Base 4:4.5.3
  (arch=armel armhf)_Z10qvsnprintfPcjPKcSt9__va_list@Base 4:4.8.0
  (arch=alpha)_Z10qvsnprintfPcmPKc13__va_list_tag@Base 4:4.5.3
- (arch=amd64 kfreebsd-amd64 powerpc s390 s390x|subst)_Z10qvsnprintfPc{size_t}PKcP13__va_list_tag@Base 4:4.8.1
+ (arch=ppc64)_Z10qvsnprintfPcmPKcS_@Base 4:4.8.4
+ (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390 s390x|subst)_Z10qvsnprintfPc{size_t}PKcP13__va_list_tag@Base 4:4.8.4
  (arch=armel armhf hppa ia64 mips mipsel sparc|subst)_Z10qvsnprintfPc{size_t}PKcPv@Base 4:4.8.0
  _Z10scientificR11QTextStream@Base 4:4.5.3
  _Z11noforcesignR11QTextStream@Base 4:4.5.3
@@ -996,6 +997,7 @@ libQtCore.so.4 libqtcore4 #MINVER#
  _ZN10QByteArray7replaceEiiPKc@Base 4:4.5.3
  _ZN10QByteArray7replaceEiiPKci@Base 4:4.7.0~beta1
  _ZN10QByteArray7replaceEiiRKS_@Base 4:4.5.3
+ (arch=amd64)_ZN10QByteArray7reserveEi@Base 4:4.8.4
  _ZN10QByteArray8truncateEi@Base 4:4.5.3
  _ZN10QByteArrayC1EPKc@Base 4:4.5.3
  _ZN10QByteArrayC1EPKci@Base 4:4.5.3
@@ -2339,8 +2341,8 @@ libQtCore.so.4 libqtcore4 #MINVER#
  _ZN20QStateMachinePrivateD2Ev@Base 4:4.6.1
  _ZN20QXmlStreamAttributes6appendERK7QStringS2_@Base 4:4.5.3
  _ZN20QXmlStreamAttributes6appendERK7QStringS2_S2_@Base 4:4.5.3
- (arch=!mips !mipsel)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
- (arch=!mips !mipsel)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
+ (arch=!alpha !mips !mipsel)_ZN20QXmlStreamAttributesD1Ev@Base 4:4.7.4
+ (arch=!alpha !mips !mipsel)_ZN20QXmlStreamAttributesD2Ev@Base 4:4.7.4
  _ZN21QAbstractConcatenable14convertToAsciiEPK5QChariRPc@Base 4:4.8.0
  _ZN21QAbstractConcatenable16convertFromAsciiEPKciRP5QChar@Base 4:4.6.1
  _ZN21QObjectCleanupHandler11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
@@ -2526,6 +2528,8 @@ libQtCore.so.4 libqtcore4 #MINVER#
  _ZN27QEventDispatcherGlibPrivateD0Ev@Base 4:4.7.4
  _ZN27QEventDispatcherGlibPrivateD1Ev@Base 4:4.7.4
  _ZN27QEventDispatcherGlibPrivateD2Ev@Base 4:4.7.4
+ _ZN27QEventDispatcherUNIXPrivate16initThreadWakeUpEv@Base 4:4.8.4
+ _ZN27QEventDispatcherUNIXPrivate19processThreadWakeUpEi@Base 4:4.8.4
  _ZN27QEventDispatcherUNIXPrivate8doSelectE6QFlagsIN10QEventLoop17ProcessEventsFlagEEP7timeval@Base 4:4.5.3
  _ZN27QEventDispatcherUNIXPrivateC1Ev@Base 4:4.5.3
  _ZN27QEventDispatcherUNIXPrivateC2Ev@Base 4:4.5.3
@@ -2640,6 +2644,7 @@ libQtCore.so.4 libqtcore4 #MINVER#
  _ZN4QUrl26removeAllEncodedQueryItemsERK10QByteArray@Base 4:4.5.3
  _ZN4QUrl5clearEv@Base 4:4.5.3
  _ZN4QUrl5toAceERK7QString@Base 4:4.5.3
+ _ZN4QUrl6detachER12QMutexLocker@Base 4:4.8.3
  _ZN4QUrl6detachEv@Base 4:4.5.3
  _ZN4QUrl6setUrlERK7QString@Base 4:4.5.3
  _ZN4QUrl6setUrlERK7QStringNS_11ParsingModeE@Base 4:4.5.3
@@ -2961,7 +2966,7 @@ libQtCore.so.4 libqtcore4 #MINVER#
  _ZN7QString4freeEPNS_4DataE@Base 4:4.5.3
  _ZN7QString4growEi@Base 4:4.5.3
  _ZN7QString4nullE@Base 4:4.5.3
- (optional=external|arch=amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390x sparc)_ZN7QString5clearEv@Base 4:4.8.1
+ (optional=external|arch=alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390x sparc)_ZN7QString5clearEv@Base 4:4.8.1
  _ZN7QString6appendE5QChar@Base 4:4.5.3
  _ZN7QString6appendERK10QStringRef@Base 4:4.5.3
  _ZN7QString6appendERK13QLatin1String@Base 4:4.5.3
@@ -3003,8 +3008,8 @@ libQtCore.so.4 libqtcore4 #MINVER#
  _ZN7QString8fromUtf8EPKci@Base 4:4.5.3
  _ZN7QString8truncateEi@Base 4:4.5.3
  (arch=alpha)_ZN7QString8vsprintfEPKc13__va_list_tag@Base 4:4.5.3
- (arch=amd64 kfreebsd-amd64 powerpc s390 s390x)_ZN7QString8vsprintfEPKcP13__va_list_tag@Base 4:4.8.1
- (arch=hurd-i386 i386 kfreebsd-i386)_ZN7QString8vsprintfEPKcPc@Base 4:4.5.3
+ (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390 s390x)_ZN7QString8vsprintfEPKcP13__va_list_tag@Base 4:4.8.4
+ (arch=hurd-i386 i386 kfreebsd-i386 ppc64)_ZN7QString8vsprintfEPKcPc@Base 4:4.8.4
  (arch=armel armhf hppa ia64 mips mipsel sparc)_ZN7QString8vsprintfEPKcPv@Base 4:4.5.3
  (arch=armel armhf)_ZN7QString8vsprintfEPKcSt9__va_list@Base 4:4.6.2
  _ZN7QString9fromAsciiEPKci@Base 4:4.5.3
diff --git a/debian/libqtdbus4.lintian-overrides b/debian/libqtdbus4.lintian-overrides
index 763afe3..1fc3849 100644
--- a/debian/libqtdbus4.lintian-overrides
+++ b/debian/libqtdbus4.lintian-overrides
@@ -1,3 +1,2 @@
-libqtdbus4: package-name-doesnt-match-sonames libQtDBus4
 # We need packages to build-depend on libqt4-dbus and not libqtdbus4.
 libqtdbus4: symbols-declares-dependency-on-other-package libqt4-dbus #MINVER#
diff --git a/debian/libqtdbus4.symbols b/debian/libqtdbus4.symbols
index 204b0b7..f1e3341 100644
--- a/debian/libqtdbus4.symbols
+++ b/debian/libqtdbus4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.1 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha amd64 powerpcspe ppc64
 libQtDBus.so.4 libqt4-dbus #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z14qDBusReplyFillRK12QDBusMessageR10QDBusErrorR8QVariant@Base 4:4.5.3
@@ -140,18 +140,18 @@ libQtDBus.so.4 libqt4-dbus #MINVER#
  _ZN16QDBusPendingCallD1Ev@Base 4:4.5.3
  _ZN16QDBusPendingCallD2Ev@Base 4:4.5.3
  _ZN16QDBusPendingCallaSERKS_@Base 4:4.5.3
- (arch=!armel !armhf !mips !mipsel !powerpc !s390 !s390x)_ZN18QDBusIntrospection10ObjectTreeD1Ev@Base 4:4.7.4
- (arch=!armel !armhf !mips !mipsel !powerpc !s390 !s390x)_ZN18QDBusIntrospection10ObjectTreeD2Ev@Base 4:4.7.4
+ (arch=!alpha !armel !armhf !mips !mipsel !powerpc !powerpcspe !s390 !s390x)_ZN18QDBusIntrospection10ObjectTreeD1Ev@Base 4:4.7.4
+ (arch=!alpha !armel !armhf !mips !mipsel !powerpc !powerpcspe !s390 !s390x)_ZN18QDBusIntrospection10ObjectTreeD2Ev@Base 4:4.7.4
  _ZN18QDBusIntrospection11parseObjectERK7QStringS2_S2_@Base 4:4.5.3
  _ZN18QDBusIntrospection14parseInterfaceERK7QString@Base 4:4.5.3
  _ZN18QDBusIntrospection15parseInterfacesERK7QString@Base 4:4.5.3
  _ZN18QDBusIntrospection15parseObjectTreeERK7QStringS2_S2_@Base 4:4.5.3
- (arch=armel armhf mips mipsel powerpc s390 s390x sparc)_ZN18QDBusIntrospection6MethodD1Ev@Base 4:4.8.1
- (arch=armel armhf mips mipsel powerpc s390 s390x sparc)_ZN18QDBusIntrospection6MethodD2Ev@Base 4:4.8.1
+ (arch=!amd64)_ZN18QDBusIntrospection6MethodD1Ev@Base 4:4.8.4
+ (arch=!amd64)_ZN18QDBusIntrospection6MethodD2Ev@Base 4:4.8.4
  _ZN18QDBusIntrospection6ObjectD1Ev@Base 4:4.7.4
  _ZN18QDBusIntrospection6ObjectD2Ev@Base 4:4.7.4
- (arch=armel armhf mips mipsel powerpc s390 s390x sparc)_ZN18QDBusIntrospection6SignalD1Ev@Base 4:4.8.1
- (arch=armel armhf mips mipsel powerpc s390 s390x sparc)_ZN18QDBusIntrospection6SignalD2Ev@Base 4:4.8.1
+ (arch=alpha armel armhf mips mipsel powerpc powerpcspe s390 s390x sparc)_ZN18QDBusIntrospection6SignalD1Ev@Base 4:4.8.4
+ (arch=alpha armel armhf mips mipsel powerpc powerpcspe s390 s390x sparc)_ZN18QDBusIntrospection6SignalD2Ev@Base 4:4.8.4
  _ZN18QDBusIntrospection8ArgumentD1Ev@Base 4:4.7.4
  _ZN18QDBusIntrospection8ArgumentD2Ev@Base 4:4.7.4
  (optional=not-gcc47|arch=!amd64 !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386)_ZN18QDBusIntrospection8PropertyD1Ev@Base 4:4.8.1
diff --git a/debian/libqtgui4.symbols b/debian/libqtgui4.symbols
index ff881c8..58debbc 100644
--- a/debian/libqtgui4.symbols
+++ b/debian/libqtgui4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.8.2 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+# SymbolsHelper-Confirmed: 4:4.8.4 alpha powerpcspe ppc64
 libQtGui.so.4 libqtgui4 #MINVER#
 * Build-Depends-Package: libqt4-dev
  _Z10qDrawArrowP8QPainterN2Qt9ArrowTypeENS1_8GUIStyleEbiiiiRK8QPaletteb@Base 4:4.5.3
@@ -82,7 +82,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
  _Z6bitBltP12QPaintDeviceiiPKS_iiiib@Base 4:4.5.3
  _Z6bitBltP6QImageiiPKS_iiii6QFlagsIN2Qt19ImageConversionFlagEE@Base 4:4.5.3
  _Z7copyBltP7QPixmapiiPKS_iiii@Base 4:4.5.3
- (optional=external|arch=!amd64 !armel !armhf !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !sparc)_Z8qWarningv@Base 4:4.7.2
+ (optional=external|arch=!alpha !amd64 !armel !armhf !hurd-i386 !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !sparc)_Z8qWarningv@Base 4:4.7.2
  _Z9qDrawItemP8QPainterN2Qt8GUIStyleEiiiiiRK8QPalettebPK7QPixmapRK7QStringiPK6QColor@Base 4:4.5.3
  _Z9qGeomCalcR7QVectorI13QLayoutStructEiiiii@Base 4:4.5.3
  _Z9qItemRectP8QPainterN2Qt8GUIStyleEiiiiibPK7QPixmapRK7QStringi@Base 4:4.5.3
@@ -6840,8 +6840,8 @@ libQtGui.so.4 libqtgui4 #MINVER#
  _ZN6QMovieD0Ev@Base 4:4.5.3
  _ZN6QMovieD1Ev@Base 4:4.5.3
  _ZN6QMovieD2Ev@Base 4:4.5.3
- (optional|arch=mips mipsel powerpc s390)_ZN6QRectFC1ERK5QRect@Base 4:4.8.0
- (optional|arch=mips mipsel powerpc s390)_ZN6QRectFC2ERK5QRect@Base 4:4.8.1
+ (optional|arch=mips mipsel powerpc powerpcspe s390)_ZN6QRectFC1ERK5QRect@Base 4:4.8.0
+ (optional|arch=mips mipsel powerpc powerpcspe s390)_ZN6QRectFC2ERK5QRect@Base 4:4.8.1
  _ZN6QSound11isAvailableEv@Base 4:4.5.3
  _ZN6QSound11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN6QSound11qt_metacastEPKc@Base 4:4.5.3
@@ -7890,8 +7890,8 @@ libQtGui.so.4 libqtgui4 #MINVER#
  _ZN8QX11InfoaSERKS_@Base 4:4.5.3
  (optional=gcc47|arch=amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386)_ZN9QBitArray6setBitEi@Base 4:4.8.1
  (optional=gcc47|arch=amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386)_ZN9QBitArray8clearBitEi@Base 4:4.8.1
- (optional=external|arch=amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZN9QBitArrayD1Ev@Base 4:4.8.1
- (optional=external|arch=amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc)_ZN9QBitArrayD2Ev@Base 4:4.8.1
+ (optional=external|arch=alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 s390x sparc)_ZN9QBitArrayD1Ev@Base 4:4.8.1
+ (optional=external|arch=alpha amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe s390 s390x sparc)_ZN9QBitArrayD2Ev@Base 4:4.8.1
  _ZN9QCDEStyle11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:4.5.3
  _ZN9QCDEStyle11qt_metacastEPKc@Base 4:4.5.3
  _ZN9QCDEStyle16staticMetaObjectE@Base 4:4.5.3
@@ -9513,6 +9513,8 @@ libQtGui.so.4 libqtgui4 #MINVER#
  _ZNK12QLineControl11clearStringEjj@Base 4:4.6.1
  _ZNK12QLineControl11stripStringERK7QString@Base 4:4.6.1
  _ZNK12QLineControl12isValidInputE5QCharS0_@Base 4:4.6.1
+ _ZNK12QLineControl15isRedoAvailableEv@Base 4:4.8.3
+ _ZNK12QLineControl15isUndoAvailableEv@Base 4:4.8.3
  _ZNK12QLineControl18hasAcceptableInputERK7QString@Base 4:4.6.1
  _ZNK12QLineControl4copyEN10QClipboard4ModeE@Base 4:4.6.1
  _ZNK12QLineControl6xToPosEiN9QTextLine14CursorPositionE@Base 4:4.6.1
@@ -11519,7 +11521,7 @@ libQtGui.so.4 libqtgui4 #MINVER#
  _ZNK6QMovie9cacheModeEv@Base 4:4.5.3
  _ZNK6QMovie9frameRectEv@Base 4:4.5.3
  _ZNK6QMovie9loopCountEv@Base 4:4.5.3
- (optional=external|arch=!armel !s390x)_ZNK6QRectF6toRectEv@Base 4:4.7.2
+ (optional=external|arch=!alpha !armel !s390x)_ZNK6QRectF6toRectEv@Base 4:4.7.2
  _ZNK6QSound10isFinishedEv@Base 4:4.5.3
  _ZNK6QSound10metaObjectEv@Base 4:4.5.3
  _ZNK6QSound14loopsRemainingEv@Base 4:4.5.3
@@ -12052,9 +12054,9 @@ libQtGui.so.4 libqtgui4 #MINVER#
  _ZNK8QToolBox7indexOfEP7QWidget@Base 4:4.5.3
  _ZNK8QToolBox8itemIconEi@Base 4:4.5.3
  _ZNK8QToolBox8itemTextEi@Base 4:4.5.3
- (optional=templinst|arch=ia64 s390x)_ZNK8QVariant5valueI5QFontEET_v@Base 4:4.7.2
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_ZNK8QVariant5valueI6QImageEET_v@Base 4:4.7.2
- (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !s390)_ZNK8QVariant5valueI7QPixmapEET_v@Base 4:4.7.2
+ (optional=templinst|arch=ia64 ppc64 s390x)_ZNK8QVariant5valueI5QFontEET_v@Base 4:4.7.2
+ (optional=templinst|arch=!alpha !amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !s390 !sparc)_ZNK8QVariant5valueI6QImageEET_v@Base 4:4.7.2
+ (optional=templinst|arch=!alpha !amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !powerpc !powerpcspe !s390)_ZNK8QVariant5valueI7QPixmapEET_v@Base 4:4.7.2
  _ZNK8QX11Info10getX11DataEb@Base 4:4.5.3
  _ZNK8QX11Info13defaultVisualEv@Base 4:4.5.3
  _ZNK8QX11Info15defaultColormapEv@Base 4:4.5.3
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index 70be833..ad1a5f4 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -25,7 +25,7 @@ bugs.kde.org number : none
      } else if (topLevel && !desktop) {        // top-level widget
          if (!X11->wm_client_leader)
              create_wm_client_leader();
-@@ -826,13 +831,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -827,13 +832,21 @@ void QWidgetPrivate::create_sys(WId wind
          // set EWMH window types
          setNetWmWindowTypes();
  
@@ -49,7 +49,7 @@ bugs.kde.org number : none
  
          // declare the widget's window role
          if (QTLWExtra *topData = maybeTopData()) {
-@@ -848,10 +861,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -849,10 +862,6 @@ void QWidgetPrivate::create_sys(WId wind
          XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                          XA_WINDOW, 32, PropModeReplace,
                          (unsigned char *)&X11->wm_client_leader, 1);
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
deleted file mode 100644
index dd002e4..0000000
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ /dev/null
@@ -1,365 +0,0 @@
-Author: Brian Nelson <pyro@debian.org>
-Author: Fathi Boudra <fabo@debian.org>
-Author: Pino Toscano <pino@kde.org>
-Description: Append a -qt4 suffix to some tools.
- To allow co-installation of the development tools of Qt4 with the Qt3 ones,
- we append a -qt4 suffix to the executable names of some development tools:
- assistant, designer, linguist, lrelease, lupdate, moc, qmake, qtconfig, uic.
-Last-Update: 2011-12-25
-Forwarded: not-needed
-
----
- config.tests/unix/compile.test                    |    2 +-
- config.tests/unix/doubleformat.test               |    2 +-
- config.tests/unix/endian.test                     |    2 +-
- config.tests/unix/ptrsize.test                    |    2 +-
- config.tests/x11/notype.test                      |    2 +-
- configure                                         |   12 ++++++------
- demos/qtdemo/menumanager.cpp                      |    2 +-
- mkspecs/common/linux.conf                         |    4 ++--
- mkspecs/features/moc.prf                          |    2 +-
- mkspecs/features/uic.prf                          |    2 +-
- mkspecs/hurd-g++/qmake.conf                       |    4 ++--
- projects.pro                                      |    2 +-
- qmake/Makefile.unix                               |    8 ++++----
- src/tools/moc/moc.pro                             |    2 +-
- src/tools/uic/uic.pro                             |    2 +-
- tools/assistant/tools/assistant/assistant.pro     |    2 +-
- tools/designer/src/designer/assistantclient.cpp   |    2 +-
- tools/designer/src/designer/designer.pro          |    2 +-
- tools/designer/src/lib/shared/qdesigner_utils.cpp |    2 +-
- tools/linguist/linguist/linguist.pro              |    2 +-
- tools/linguist/lrelease/lrelease.pro              |    2 +-
- tools/linguist/lupdate/lupdate.pro                |    2 +-
- tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp         |    2 +-
- tools/qtconfig/qtconfig.pro                       |    2 +-
- translations/translations.pro                     |    6 +++---
- 25 files changed, 37 insertions(+), 37 deletions(-)
-
---- a/config.tests/unix/compile.test
-+++ b/config.tests/unix/compile.test
-@@ -68,7 +68,7 @@ test -r Makefile && $MAKE distclean >/de
- # Make sure output from possible previous tests is gone
- rm -f "$EXE" "${EXE}.exe"
- 
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
- 
- if [ "$VERBOSE" = "yes" ]; then
-     $MAKE
---- a/config.tests/unix/doubleformat.test
-+++ b/config.tests/unix/doubleformat.test
-@@ -10,7 +10,7 @@ OUTDIR=$4
- 
- # build and run a test program
- test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat"
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/unix/doubleformat"
- 
- DOUBLEFORMAT="UNKNOWN"
---- a/config.tests/unix/endian.test
-+++ b/config.tests/unix/endian.test
-@@ -10,7 +10,7 @@ OUTDIR=$4
- 
- # build and run a test program
- test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian"
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/unix/endian"
- 
- 
---- a/config.tests/unix/ptrsize.test
-+++ b/config.tests/unix/ptrsize.test
-@@ -10,7 +10,7 @@ OUTDIR=$4
- 
- # build and run a test program
- test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
--"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
-+"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
- cd "$OUTDIR/config.tests/unix/ptrsize"
- 
- if [ "$VERBOSE" = "yes" ]; then
---- a/config.tests/x11/notype.test
-+++ b/config.tests/x11/notype.test
-@@ -27,7 +27,7 @@ if [ $XPLATFORM = "solaris-g++" -o $XPLA
-     NOTYPE=yes
- 
-     test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype"
--    "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
-+    "$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1
-     cd "$OUTDIR/config.tests/x11/notype"
- 
-     if [ "$VERBOSE" = "yes" ]; then
---- a/configure
-+++ b/configure
-@@ -4847,7 +4847,7 @@ setBootstrapVariable()
- }
- 
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if true; then ###[ '!' -f "$outpath/bin/qmake-qt4" ];
-     echo "Creating qmake. Please wait..."
- 
-     OLD_QCONFIG_H=
-@@ -8544,8 +8544,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
- QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
- 
- #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
--QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc
--QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic
-+QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc-qt4
-+QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic-qt4
- QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
- QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
- QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8948,11 +8948,11 @@ EXEC=""
- 
- echo "Finding project files. Please wait..."
- if [ "$CFG_NOPROCESS" != "yes" ]; then
--    "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
-+    "$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro"
-     if [ -f "${relpath}/projects.pro" ]; then
-         mkfile="${outpath}/Makefile"
-         [ -f "$mkfile" ] && chmod +w "$mkfile"
--        QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
-+        QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
-     fi
- fi
- 
-@@ -9139,7 +9139,7 @@ for file in .projects .projects.3; do
-         QMAKE_SPEC_ARGS="-spec $SPEC"
-         echo $ECHO_N "  for $a$ECHO_C"
- 
--        QMAKE="$outpath/bin/qmake"
-+        QMAKE="$outpath/bin/qmake-qt4"
- 	QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
-         if [ "$file" = ".projects.3" ]; then
-             echo " (fast)"
---- a/projects.pro
-+++ b/projects.pro
-@@ -144,7 +144,7 @@ qmake.path=$$[QT_INSTALL_BINS]
- win32 {
-    qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
- } else {
--   qmake.files=$$QT_BUILD_TREE/bin/qmake
-+   qmake.files=$$QT_BUILD_TREE/bin/qmake-qt4
- }
- INSTALLS += qmake
- 
---- a/qmake/Makefile.unix
-+++ b/qmake/Makefile.unix
-@@ -86,17 +86,17 @@ CPPFLAGS = -g -I. -Igenerators -Igenerat
- 
- CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
- 
--first all: $(BUILD_PATH)/bin/qmake
--qmake: $(BUILD_PATH)/bin/qmake
-+first all: $(BUILD_PATH)/bin/qmake-qt4
-+qmake: $(BUILD_PATH)/bin/qmake-qt4
- 
--$(BUILD_PATH)/bin/qmake: $(OBJS) $(QOBJS)
-+$(BUILD_PATH)/bin/qmake-qt4: $(OBJS) $(QOBJS)
- 	$(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS)
- 
- clean::
- 	rm -f $(OBJS) $(QOBJS)
- 
- distclean:: clean
--	rm -rf $(BUILD_PATH)/bin/qmake .deps
-+	rm -rf $(BUILD_PATH)/bin/qmake-qt4 .deps
- 
- depend:
- 	makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
---- a/tools/linguist/lrelease/lrelease.pro
-+++ b/tools/linguist/lrelease/lrelease.pro
-@@ -1,5 +1,5 @@
- TEMPLATE        = app
--TARGET          = lrelease
-+TARGET          = lrelease-qt4
- DESTDIR         = ../../../bin
- 
- DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
---- a/tools/linguist/lupdate/lupdate.pro
-+++ b/tools/linguist/lupdate/lupdate.pro
-@@ -1,5 +1,5 @@
- TEMPLATE        = app
--TARGET          = lupdate
-+TARGET          = lupdate-qt4
- DESTDIR          = ../../../bin
- 
- QT              -= gui
---- a/src/tools/moc/moc.pro
-+++ b/src/tools/moc/moc.pro
-@@ -1,5 +1,5 @@
- TEMPLATE	= app
--TARGET		= moc
-+TARGET		= moc-qt4
- 
- DEFINES	       += QT_MOC
- DESTDIR         = ../../../bin
---- a/src/tools/uic/uic.pro
-+++ b/src/tools/uic/uic.pro
-@@ -1,5 +1,5 @@
- TEMPLATE = app
--TARGET = uic
-+TARGET = uic-qt4
- 
- DESTDIR = ../../../bin
- DEFINES += QT_UIC
---- a/tools/assistant/tools/assistant/assistant.pro
-+++ b/tools/assistant/tools/assistant/assistant.pro
-@@ -1,7 +1,7 @@
- include(../../../shared/fontpanel/fontpanel.pri)
- TEMPLATE = app
- LANGUAGE = C++
--TARGET = assistant
-+TARGET = assistant-qt4
- contains(QT_CONFIG, webkit):QT += webkit
- CONFIG += qt \
-     warn_on \
---- a/tools/designer/src/designer/designer.pro
-+++ b/tools/designer/src/designer/designer.pro
-@@ -23,7 +23,7 @@ contains(CONFIG, static) {
-     DEFINES += QT_DESIGNER_STATIC
- }
- 
--TARGET = designer
-+TARGET = designer-qt4
- 
- include(../../../shared/fontpanel/fontpanel.pri)
- include(../../../shared/qttoolbardialog/qttoolbardialog.pri)
---- a/tools/linguist/linguist/linguist.pro
-+++ b/tools/linguist/linguist/linguist.pro
-@@ -69,7 +69,7 @@ HEADERS += \
- 
- contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
- DEFINES += QT_KEYWORDS
--TARGET = linguist
-+TARGET = linguist-qt4
- win32:RC_FILE = linguist.rc
- mac {
-     static:CONFIG -= global_init_link_order
---- a/tools/qtconfig/qtconfig.pro
-+++ b/tools/qtconfig/qtconfig.pro
-@@ -19,7 +19,7 @@ FORMS        = mainwindow.ui paletteedit
- RESOURCES    = qtconfig.qrc
- 
- PROJECTNAME        = Qt Configuration
--TARGET             = qtconfig
-+TARGET             = qtconfig-qt4
- DESTDIR            = ../../bin
- 
- target.path=$$[QT_INSTALL_BINS]
---- a/translations/translations.pro
-+++ b/translations/translations.pro
-@@ -1,8 +1,8 @@
- TRANSLATIONS = $$files(*.ts)
- 
--qtPrepareTool(LRELEASE, lrelease)
-+qtPrepareTool(LRELEASE, lrelease-qt4)
- qtPrepareTool(LCONVERT, lconvert)
--qtPrepareTool(LUPDATE, lupdate)
-+qtPrepareTool(LUPDATE, lupdate-qt4)
- LUPDATE += -locations relative -no-ui-lines
- 
- TS_TARGETS =
-@@ -96,7 +96,7 @@ updateqm.input = TRANSLATIONS
- updateqm.output = ${QMAKE_FILE_BASE}.qm
- isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
- updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
--silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands
-+silent:updateqm.commands = @echo lrelease-qt4 ${QMAKE_FILE_IN} && $$updateqm.commands
- updateqm.name = LRELEASE ${QMAKE_FILE_IN}
- updateqm.CONFIG += no_link
- QMAKE_EXTRA_COMPILERS += updateqm
---- a/mkspecs/features/moc.prf
-+++ b/mkspecs/features/moc.prf
-@@ -1,6 +1,6 @@
- 
- #global defaults
--qtPrepareTool(QMAKE_MOC, moc)
-+qtPrepareTool(QMAKE_MOC, moc-qt4)
- isEmpty(MOC_DIR):MOC_DIR = .
- isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_
- isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc
---- a/mkspecs/features/uic.prf
-+++ b/mkspecs/features/uic.prf
-@@ -1,6 +1,6 @@
- defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
- qtPrepareTool(QMAKE_UIC3, uic3)
--qtPrepareTool(QMAKE_UIC, uic)
-+qtPrepareTool(QMAKE_UIC, uic-qt4)
- 
- isEmpty(UI_DIR):UI_DIR = .
- isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -41,8 +41,8 @@ QMAKE_LIBS_WAYLAND =
- QMAKE_LIBDIR_WAYLAND =
- QMAKE_DEFINES_WAYLAND =
- 
--QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
--QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
-+QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc-qt4
-+QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic-qt4
- 
- QMAKE_AR              = ar cqs
- QMAKE_OBJCOPY         = objcopy
---- a/demos/qtdemo/menumanager.cpp
-+++ b/demos/qtdemo/menumanager.cpp
-@@ -297,7 +297,7 @@ void MenuManager::showDocInAssistant(con
-     if (this->assistantProcess.state() != QProcess::Running){
-         QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
- #if !defined(Q_OS_MAC)
--        app += QLatin1String("assistant");
-+        app += QLatin1String("assistant-qt4");
- #else
-         app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");
- #endif
---- a/tools/designer/src/designer/assistantclient.cpp
-+++ b/tools/designer/src/designer/assistantclient.cpp
-@@ -114,7 +114,7 @@ QString AssistantClient::binary()
- {
-     QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
- #if !defined(Q_OS_MAC)
--    app += QLatin1String("assistant");
-+    app += QLatin1String("assistant-qt4");
- #else
-     app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");    
- #endif
---- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
-+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -782,7 +782,7 @@ namespace qdesigner_internal
-         binary += QDir::separator();
-         switch (mode) {
-         case UIC_GenerateCode:
--            binary += QLatin1String("uic");
-+            binary += QLatin1String("uic-qt4");
-             break;
-         case UIC_ConvertV3:
-             binary += QLatin1String("uic3");
---- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-+++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -396,7 +396,7 @@ int main(int argc, char **argv)
-         else {
-             // run moc on this file
-             QProcess proc;
--            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
-+            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
- 
-             if (!proc.waitForStarted()) {
-                 fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");
---- a/mkspecs/hurd-g++/qmake.conf
-+++ b/mkspecs/hurd-g++/qmake.conf
-@@ -42,8 +42,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
- QMAKE_LIBS_OPENVG     = -lOpenVG
- QMAKE_LIBS_THREAD     = -lpthread
- 
--QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
--QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
-+QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc-qt4
-+QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic-qt4
- 
- QMAKE_AR              = ar cqs
- QMAKE_OBJCOPY         = objcopy
diff --git a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
index 359dc52..830058e 100644
--- a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -15,7 +15,7 @@ GMT.) for the symlink, just use current time().
 
 --- a/bin/syncqt
 +++ b/bin/syncqt
-@@ -848,7 +848,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -884,7 +884,7 @@ foreach my $lib (@modules_to_sync) {
                              print "SYMBOL: $_\n";
                          }
                      } else {
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index e6d6657..09cbcd9 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -8,7 +8,7 @@ Trolltech task ID : 181882
 
 --- a/configure
 +++ b/configure
-@@ -228,7 +228,50 @@ linkerSupportsFlag()
+@@ -247,7 +247,50 @@ DeviceVar()
  #-------------------------------------------------------------------------------
  
  # need that throughout the script
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index f26d104..7855a66 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -7,7 +7,7 @@ It breaks qmake projects search.
 
 --- a/configure
 +++ b/configure
-@@ -9005,7 +9005,7 @@ fi
+@@ -9149,7 +9149,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index d5f3083..f56291b 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -10,7 +10,7 @@ let dh_strip do it to generate debug packages.
 
 --- a/configure
 +++ b/configure
-@@ -734,6 +734,8 @@ mkdir -p "$outpath/config.tests"
+@@ -753,6 +753,8 @@ mkdir -p "$outpath/config.tests"
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
diff --git a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
index f264f11..f8c079d 100644
--- a/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
+++ b/debian/patches/16_hide_std_symbols_on_qtwebkit.diff
@@ -17,7 +17,7 @@ Author: Sune Vuorela <debian@pusling.com>
 +
  # Treat warnings as errors on x86/Linux/GCC
  linux-g++* {
-     !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+     !CONFIG(standalone_package):if(isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386)): QMAKE_CXXFLAGS += -Werror
 --- /dev/null
 +++ b/src/3rdparty/webkit/Source/symbols.filter
 @@ -0,0 +1,5 @@
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
  
diff --git a/debian/patches/71_hppa_unaligned_access_fix_458133.diff b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
index 280092f..c1461ea 100644
--- a/debian/patches/71_hppa_unaligned_access_fix_458133.diff
+++ b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
@@ -8,7 +8,7 @@ Fix unaligned access on hppa
 
 --- a/src/3rdparty/sha1/sha1.cpp
 +++ b/src/3rdparty/sha1/sha1.cpp
-@@ -149,10 +149,10 @@ static inline void sha1ProcessChunk(Sha1
+@@ -150,10 +150,10 @@ static inline void sha1ProcessChunk(Sha1
      quint32 d = state->h3;
      quint32 e = state->h4;
  
@@ -22,7 +22,7 @@ Fix unaligned access on hppa
  
      for (int i = 0; i < 16; ++i)
          chunk->words[i] = qFromBigEndian(chunk->words[i]);
-@@ -188,7 +188,7 @@ static inline void sha1ProcessChunk(Sha1
+@@ -189,7 +189,7 @@ static inline void sha1ProcessChunk(Sha1
      // Wipe variables
  #ifdef SHA1_WIPE_VARIABLES
      a = b = c = d = e = 0;
diff --git a/debian/patches/94_armv6_uname_entry.diff b/debian/patches/94_armv6_uname_entry.diff
index 5c80cfe..19bbd24 100644
--- a/debian/patches/94_armv6_uname_entry.diff
+++ b/debian/patches/94_armv6_uname_entry.diff
@@ -7,7 +7,7 @@ Description: Add armv6 uname entry for armhf
 
 --- a/configure
 +++ b/configure
-@@ -242,6 +242,9 @@ case $DPKG_ARCH in
+@@ -261,6 +261,9 @@ case $DPKG_ARCH in
  	armel)
  		UNAME_MACHINE="armv5tel"
  	;;
diff --git a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
index 0f02a1b..00956e6 100644
--- a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
+++ b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
@@ -8,7 +8,7 @@ Author: Joonas Tanskanen <joonas.tanskanen@sasken.com>
 
 --- a/src/gui/kernel/qapplication.cpp
 +++ b/src/gui/kernel/qapplication.cpp
-@@ -1028,6 +1028,11 @@ void QApplicationPrivate::initialize()
+@@ -1031,6 +1031,11 @@ void QApplicationPrivate::initialize()
      q->setAttribute(Qt::AA_S60DisablePartialScreenInputMode);
  #endif
  
diff --git a/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch b/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
index 4d9834a..e20149d 100644
--- a/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
+++ b/debian/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
@@ -14,7 +14,7 @@ Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900
 
 --- a/src/gui/kernel/qapplication_x11.cpp
 +++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -816,6 +816,27 @@ static Bool qt_sync_request_scanner(Disp
+@@ -818,6 +818,27 @@ static Bool qt_sync_request_scanner(Disp
  #endif
  #endif // QT_NO_XSYNC
  
@@ -42,7 +42,7 @@ Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900
  static void qt_x11_create_intern_atoms()
  {
      const char *names[QX11Data::NAtoms];
-@@ -5281,8 +5302,11 @@ bool QETWidget::translateConfigEvent(con
+@@ -5295,8 +5316,11 @@ bool QETWidget::translateConfigEvent(con
          if (d->extra->compress_events) {
              // ConfigureNotify compression for faster opaque resizing
              XEvent otherEvent;
@@ -56,7 +56,7 @@ Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900
                  if (qt_x11EventFilter(&otherEvent))
                      continue;
  
-@@ -5295,13 +5319,19 @@ bool QETWidget::translateConfigEvent(con
+@@ -5309,13 +5333,19 @@ bool QETWidget::translateConfigEvent(con
                  newSize.setWidth(otherEvent.xconfigure.width);
                  newSize.setHeight(otherEvent.xconfigure.height);
  
@@ -77,7 +77,7 @@ Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900
              }
  #ifndef QT_NO_XSYNC
              qt_sync_request_event_data sync_event;
-@@ -5314,9 +5344,14 @@ bool QETWidget::translateConfigEvent(con
+@@ -5328,9 +5358,14 @@ bool QETWidget::translateConfigEvent(con
          }
  
          if (!isCPos) {
diff --git a/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
index 86ac003..bdb555d 100644
--- a/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
+++ b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
@@ -8,9 +8,9 @@ Bug-Debian: http://bugs.debian.org/679874
 Forwarded: not-needed
 Last-Update: 2012-06-20
 
---- qt4-x11-4.8.2.orig/tools/assistant/tools/assistant/mainwindow.cpp
-+++ qt4-x11-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp
-@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
+--- a/tools/assistant/tools/assistant/mainwindow.cpp
++++ b/tools/assistant/tools/assistant/mainwindow.cpp
+@@ -945,8 +945,7 @@ void MainWindow::updateApplicationFont()
      if (helpEngine.usesAppFont())
          font = helpEngine.appFont();
  
diff --git a/debian/patches/no_libicu_message.diff b/debian/patches/no_libicu_message.diff
index fef8897..a6a7fb0 100644
--- a/debian/patches/no_libicu_message.diff
+++ b/debian/patches/no_libicu_message.diff
@@ -8,9 +8,9 @@ Forwarded: not-needed
 
 --- a/src/corelib/tools/qlocale_icu.cpp
 +++ b/src/corelib/tools/qlocale_icu.cpp
-@@ -83,7 +83,9 @@ bool qt_initIcu(const QString &localeStr
-         // resolve libicui18n
+@@ -84,7 +84,9 @@ bool qt_initIcu(const QString &localeStr
          QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
+         lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
          if (!lib.load()) {
 +#if 0
              qWarning() << "Unable to load library icui18n" << lib.errorString();
@@ -18,9 +18,9 @@ Forwarded: not-needed
              status = ErrorLoading;
              return false;
          }
-@@ -112,7 +114,9 @@ bool qt_initIcu(const QString &localeStr
-         // resolve libicuuc
+@@ -114,7 +116,9 @@ bool qt_initIcu(const QString &localeStr
          QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
+         ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
          if (!ucLib.load()) {
 +#if 0
              qWarning() << "Unable to load library icuuc" << ucLib.errorString();
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 8d02d0f..92ad2e1 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3208,7 +3208,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3272,7 +3272,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
          fi
          ;;
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);
          }
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index d7a9ecd..c4edae9 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -16,7 +16,7 @@ Author: Thiago Macieira <thiago@kde.org>
  #endif
  
  #include <stdio.h>
-@@ -87,6 +88,8 @@
+@@ -92,6 +93,8 @@
  
  _LIT(qt_S60Filter, "Series60v?.*.sis");
  _LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\");
@@ -25,7 +25,7 @@ Author: Thiago Macieira <thiago@kde.org>
  #endif
  
  QT_BEGIN_NAMESPACE
-@@ -2225,6 +2228,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2288,6 +2291,27 @@ void qt_message_output(QtMsgType msgType
  #else
          fprintf(stderr, "%s\n", buf);
          fflush(stderr);
diff --git a/debian/patches/series b/debian/patches/series
index f744b2b..22b2b56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,6 @@
 # upstream patches
 Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
-QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
 QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
-QElfParser-fix-type-of-sh_size.patch
-Fix-cursor-truncate-to-include-line-position.patch
-disable-SSL-compression-by-default.patch
-fix_jit_crash_on_x86_64.patch
-add_missing_map_noreserve.patch
-make_rules_for_redirect_stricter.patch
 SSL-certificates-blacklist-mis-issued-Turktrust-cert.patch
 Fix_binary_incompatibility_between_openssl_versions.patch
 change_all_shmget_calls_to_use_user-only_memory.patch
@@ -19,7 +12,6 @@ change_all_shmget_calls_to_use_user-only_memory.patch
 # debian patches
 qtdebug_syslog.patch
 buildable_appchooser_states_demos.patch
-01_debian_append_qt4_suffix.diff
 02_syncqt_sane_timestamp_for_nonexisting_headers.diff
 07_trust_dpkg-arch_over_uname-m.diff
 08_configure_quilt_compat.diff
@@ -51,7 +43,5 @@ qt-multiarch-plugin-path-compat.diff
 s390x_jscore.diff
 add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 CVE-2011-3922.patch
-qt_atomic_sparc64.patch
 no_libicu_message.diff
 QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
-fix_use_after_free_qlocale_unix.patch
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 6391bcc..913c6af 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3248,6 +3248,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3312,6 +3312,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              ;;
          esac
          ;;
diff --git a/debian/qdbus.install b/debian/qdbus.install
index 3439206..228879d 100644
--- a/debian/qdbus.install
+++ b/debian/qdbus.install
@@ -1 +1 @@
-usr/bin/qdbus
+usr/lib/*/qt4/bin/qdbus
diff --git a/debian/qt4-default.install b/debian/qt4-default.install
new file mode 100644
index 0000000..6b53775
--- /dev/null
+++ b/debian/qt4-default.install
@@ -0,0 +1 @@
+usr/lib/*/qtchooser/default.conf
diff --git a/debian/qt4-demos.install b/debian/qt4-demos.install
index b5a7a9d..329ec23 100644
--- a/debian/qt4-demos.install
+++ b/debian/qt4-demos.install
@@ -1,4 +1,4 @@
-usr/bin/qtdemo
+usr/lib/*/qt4/bin/qtdemo
 usr/lib/*/qt4/plugins/designer/libarthurplugin.so
 usr/lib/*/qt4/plugins/designer/libcontainerextension.so
 usr/lib/*/qt4/plugins/designer/libcustomwidgetplugin.so
diff --git a/debian/qt4-designer.install b/debian/qt4-designer.install
index b985046..f0599bd 100644
--- a/debian/qt4-designer.install
+++ b/debian/qt4-designer.install
@@ -1,4 +1,4 @@
-usr/bin/designer-qt4
+usr/lib/*/qt4/bin/designer
 usr/share/qt4/translations/designer_cs.qm
 usr/share/qt4/translations/designer_de.qm
 usr/share/qt4/translations/designer_fr.qm
diff --git a/debian/qt4-designer.links b/debian/qt4-designer.links
deleted file mode 100644
index d5bf5e5..0000000
--- a/debian/qt4-designer.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/designer-qt4             usr/share/qt4/bin/designer
diff --git a/debian/qt4-designer.links.in b/debian/qt4-designer.links.in
new file mode 100644
index 0000000..189f352
--- /dev/null
+++ b/debian/qt4-designer.links.in
@@ -0,0 +1,2 @@
+usr/lib/MULTIARCH/qt4/bin/designer             usr/share/qt4/bin/designer
+usr/lib/MULTIARCH/qt4/bin/designer             usr/bin/designer-qt4
diff --git a/debian/qt4-designer.menu b/debian/qt4-designer.menu
index 5cd519c..b6475b5 100644
--- a/debian/qt4-designer.menu
+++ b/debian/qt4-designer.menu
@@ -2,5 +2,5 @@
 	needs="x11"\
 	section="Applications/Programming"\
 	hints="KDE"\
-	title="Qt Designer"\
-	command="/usr/bin/designer-qt4"
+	title="Qt4 Designer"\
+	command="/usr/lib/*/qt4/bin/designer"
diff --git a/debian/qt4-designer.postinst b/debian/qt4-designer.postinst
deleted file mode 100644
index 8585dfe..0000000
--- a/debian/qt4-designer.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
-    /usr/bin/designer designer "/usr/bin/designer-qt4" "40" \
-    --slave /usr/share/man/man1/designer.1.gz designer.1.gz \
-    "/usr/share/man/man1/designer-qt4.1.gz"
-
-#DEBHELPER#
diff --git a/debian/qt4-designer.preinst b/debian/qt4-designer.preinst
new file mode 100644
index 0000000..7e7a976
--- /dev/null
+++ b/debian/qt4-designer.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove designer "/usr/bin/designer-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-designer.prerm b/debian/qt4-designer.prerm
deleted file mode 100644
index 4151fef..0000000
--- a/debian/qt4-designer.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    upgrade) ;;
-    remove|failed-upgrade|deconfigure)
-        update-alternatives --remove designer "/usr/bin/designer-qt4"
-        ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 11a896f..b4b1744 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -1,17 +1,17 @@
-usr/bin/assistant-qt4
-usr/bin/lconvert
-usr/bin/linguist-qt4
-usr/bin/pixeltool
-usr/bin/qcollectiongenerator
-usr/bin/qdbusviewer
-usr/bin/qdoc3
-usr/bin/qhelpconverter
-usr/bin/qhelpgenerator
-usr/bin/qmlplugindump
-usr/bin/qttracereplay
-usr/bin/qvfb
-usr/bin/xmlpatterns
-usr/bin/xmlpatternsvalidator
+usr/lib/*/qt4/bin/assistant
+usr/lib/*/qt4/bin/lconvert
+usr/lib/*/qt4/bin/linguist
+usr/lib/*/qt4/bin/pixeltool
+usr/lib/*/qt4/bin/qcollectiongenerator
+usr/lib/*/qt4/bin/qdbusviewer
+usr/lib/*/qt4/bin/qdoc3
+usr/lib/*/qt4/bin/qhelpconverter
+usr/lib/*/qt4/bin/qhelpgenerator
+usr/lib/*/qt4/bin/qmlplugindump
+usr/lib/*/qt4/bin/qttracereplay
+usr/lib/*/qt4/bin/qvfb
+usr/lib/*/qt4/bin/xmlpatterns
+usr/lib/*/qt4/bin/xmlpatternsvalidator
 usr/share/qt4/phrasebooks/*
 usr/share/qt4/translations/assistant_cs.qm
 usr/share/qt4/translations/assistant_da.qm
diff --git a/debian/qt4-dev-tools.links.in b/debian/qt4-dev-tools.links.in
new file mode 100644
index 0000000..b4795e3
--- /dev/null
+++ b/debian/qt4-dev-tools.links.in
@@ -0,0 +1,2 @@
+usr/lib/MULTIARCH/qt4/bin/assistant usr/bin/assistant-qt4
+usr/lib/MULTIARCH/qt4/bin/linguist usr/bin/linguist-qt4
diff --git a/debian/qt4-dev-tools.menu b/debian/qt4-dev-tools.menu
index 42b5c0b..288f5ba 100644
--- a/debian/qt4-dev-tools.menu
+++ b/debian/qt4-dev-tools.menu
@@ -2,12 +2,12 @@
 	needs="x11"\
 	section="Applications/Programming"\
 	hints="KDE"\
-	title="Qt Assistant"\
-	command="/usr/bin/assistant-qt4"
+	title="Qt4 Assistant"\
+	command="/usr/lib/*/qt4/bin/assistant"
 
 ?package(qt4-dev-tools):\
 	needs="x11"\
 	section="Applications/Programming"\
 	hints="KDE"\
-	title="Qt Linguist"\
-	command="/usr/bin/linguist-qt4"
+	title="Qt4 Linguist"\
+	command="/usr/lib/*/qt4/bin/linguist"
diff --git a/debian/qt4-dev-tools.postinst b/debian/qt4-dev-tools.postinst
deleted file mode 100644
index a984ad6..0000000
--- a/debian/qt4-dev-tools.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
-    /usr/bin/assistant assistant "/usr/bin/assistant-qt4" "40" \
-    --slave /usr/share/man/man1/assistant.1.gz assistant.1.gz \
-    "/usr/share/man/man1/assistant-qt4.1.gz"
-
-update-alternatives --install \
-    /usr/bin/linguist linguist "/usr/bin/linguist-qt4" "40" \
-    --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
-    "/usr/share/man/man1/linguist-qt4.1.gz"
-
-#DEBHELPER#
diff --git a/debian/qt4-dev-tools.preinst b/debian/qt4-dev-tools.preinst
new file mode 100644
index 0000000..6b3a304
--- /dev/null
+++ b/debian/qt4-dev-tools.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove assistant "/usr/bin/assistant-qt4"
+            update-alternatives --remove linguist "/usr/bin/linguist-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-dev-tools.prerm b/debian/qt4-dev-tools.prerm
deleted file mode 100644
index c986ab3..0000000
--- a/debian/qt4-dev-tools.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    upgrade) ;;
-    remove|failed-upgrade|deconfigure)
-        update-alternatives --remove assistant "/usr/bin/assistant-qt4"
-        update-alternatives --remove linguist "/usr/bin/linguist-qt4"
-        ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/qt4-linguist-tools.install b/debian/qt4-linguist-tools.install
index d1e531b..03a46ed 100644
--- a/debian/qt4-linguist-tools.install
+++ b/debian/qt4-linguist-tools.install
@@ -1,2 +1,2 @@
-usr/bin/lrelease-qt4
-usr/bin/lupdate-qt4
+usr/lib/*/qt4/bin/lrelease
+usr/lib/*/qt4/bin/lupdate
diff --git a/debian/qt4-linguist-tools.links b/debian/qt4-linguist-tools.links
deleted file mode 100644
index d78d5ed..0000000
--- a/debian/qt4-linguist-tools.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/lrelease-qt4    usr/share/qt4/bin/lrelease
-usr/bin/lupdate-qt4     usr/share/qt4/bin/lupdate
diff --git a/debian/qt4-linguist-tools.links.in b/debian/qt4-linguist-tools.links.in
new file mode 100644
index 0000000..74e88e3
--- /dev/null
+++ b/debian/qt4-linguist-tools.links.in
@@ -0,0 +1,4 @@
+usr/lib/MULTIARCH/qt4/bin/lrelease    usr/share/qt4/bin/lrelease
+usr/lib/MULTIARCH/qt4/bin/lupdate     usr/share/qt4/bin/lupdate
+usr/lib/MULTIARCH/qt4/bin/lrelease    usr/bin/lrelease-qt4
+usr/lib/MULTIARCH/qt4/bin/lupdate     usr/bin/lupdate-qt4
diff --git a/debian/qt4-linguist-tools.postinst b/debian/qt4-linguist-tools.postinst
deleted file mode 100644
index affde57..0000000
--- a/debian/qt4-linguist-tools.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
-    /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt4" "40" \
-    --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
-    "/usr/share/man/man1/lupdate-qt4.1.gz"
-
-update-alternatives --install \
-    /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt4" "40" \
-    --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
-    "/usr/share/man/man1/lrelease-qt4.1.gz"
-
-#DEBHELPER#
diff --git a/debian/qt4-linguist-tools.preinst b/debian/qt4-linguist-tools.preinst
new file mode 100644
index 0000000..d1ef0b4
--- /dev/null
+++ b/debian/qt4-linguist-tools.preinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove lupdate "/usr/bin/lupdate-qt4"
+            update-alternatives --remove lrelease "/usr/bin/lrelease-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-linguist-tools.prerm b/debian/qt4-linguist-tools.prerm
deleted file mode 100644
index 350c6eb..0000000
--- a/debian/qt4-linguist-tools.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    upgrade) ;;
-    remove|failed-upgrade|deconfigure)
-        update-alternatives --remove lupdate "/usr/bin/lupdate-qt4"
-        update-alternatives --remove lrelease "/usr/bin/lrelease-qt4"
-        ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/qt4-qmake.install b/debian/qt4-qmake.install
index 2c5af34..c597810 100644
--- a/debian/qt4-qmake.install
+++ b/debian/qt4-qmake.install
@@ -1,2 +1,2 @@
-usr/bin/qmake-qt4
+usr/lib/*/qt4/bin/qmake
 usr/share/qt4/mkspecs/*
diff --git a/debian/qt4-qmake.links b/debian/qt4-qmake.links
deleted file mode 100644
index 8a70be9..0000000
--- a/debian/qt4-qmake.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/qmake-qt4       usr/share/qt4/bin/qmake
diff --git a/debian/qt4-qmake.links.in b/debian/qt4-qmake.links.in
new file mode 100644
index 0000000..c782f1f
--- /dev/null
+++ b/debian/qt4-qmake.links.in
@@ -0,0 +1,2 @@
+usr/lib/MULTIARCH/qt4/bin/qmake       usr/share/qt4/bin/qmake
+usr/lib/MULTIARCH/qt4/bin/qmake       usr/bin/qmake-qt4
diff --git a/debian/qt4-qmake.postinst b/debian/qt4-qmake.postinst
deleted file mode 100644
index 43edfef..0000000
--- a/debian/qt4-qmake.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
-    /usr/bin/qmake qmake "/usr/bin/qmake-qt4" "40" \
-    --slave /usr/share/man/man1/qmake.1.gz qmake.1.gz \
-    "/usr/share/man/man1/qmake-qt4.1.gz"
-
-#DEBHELPER#
diff --git a/debian/qt4-qmake.preinst b/debian/qt4-qmake.preinst
new file mode 100644
index 0000000..41d0219
--- /dev/null
+++ b/debian/qt4-qmake.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove qmake "/usr/bin/qmake-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-qmake.prerm b/debian/qt4-qmake.prerm
deleted file mode 100644
index 49cbd3d..0000000
--- a/debian/qt4-qmake.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    upgrade) ;;
-    remove|failed-upgrade|deconfigure)
-        update-alternatives --remove qmake "/usr/bin/qmake-qt4"
-        ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/qt4-qmlviewer.install b/debian/qt4-qmlviewer.install
index c7e0b5b..413e8b6 100644
--- a/debian/qt4-qmlviewer.install
+++ b/debian/qt4-qmlviewer.install
@@ -1 +1 @@
-usr/bin/qmlviewer
+usr/lib/*/qt4/bin/qmlviewer
diff --git a/debian/qt4-qtconfig.install b/debian/qt4-qtconfig.install
index bbf70df..b7786cf 100644
--- a/debian/qt4-qtconfig.install
+++ b/debian/qt4-qtconfig.install
@@ -1,4 +1,4 @@
-usr/bin/qtconfig-qt4
+usr/lib/*/qt4/bin/qtconfig
 usr/share/qt4/translations/qtconfig_hu.qm
 usr/share/qt4/translations/qtconfig_ja.qm
 usr/share/qt4/translations/qtconfig_ko.qm
diff --git a/debian/qt4-qtconfig.links.in b/debian/qt4-qtconfig.links.in
new file mode 100644
index 0000000..34b29c0
--- /dev/null
+++ b/debian/qt4-qtconfig.links.in
@@ -0,0 +1 @@
+usr/lib/MULTIARCH/qt4/bin/qtconfig usr/bin/qtconfig-qt4
diff --git a/debian/qt4-qtconfig.menu b/debian/qt4-qtconfig.menu
index 26eef10..3ba170e 100644
--- a/debian/qt4-qtconfig.menu
+++ b/debian/qt4-qtconfig.menu
@@ -4,4 +4,4 @@
 	title="QtConfig"\
 	longtitle="Qt Configuration Utility"\
 	hints="Qt4 config tool"\
-	command="/usr/bin/qtconfig-qt4"
+	command="/usr/lib/*/qt4/bin/qtconfig"
diff --git a/debian/qt4-qtconfig.postinst b/debian/qt4-qtconfig.postinst
deleted file mode 100644
index c5f0dcf..0000000
--- a/debian/qt4-qtconfig.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
-    /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-qt4" "40" \
-    --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
-    "/usr/share/man/man1/qtconfig-qt4.1.gz"
-
-#DEBHELPER#
diff --git a/debian/qt4-qtconfig.preinst b/debian/qt4-qtconfig.preinst
new file mode 100644
index 0000000..a043ed8
--- /dev/null
+++ b/debian/qt4-qtconfig.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    upgrade)
+        if dpkg --compare-versions $2 "<<" 4:4.8.5
+        then
+            update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt4"
+        fi ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/qt4-qtconfig.prerm b/debian/qt4-qtconfig.prerm
deleted file mode 100644
index c8fa85a..0000000
--- a/debian/qt4-qtconfig.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    upgrade) ;;
-    remove|failed-upgrade|deconfigure)
-        update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt4"
-        ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 1ebbb5a..1d5a8c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,8 @@ else
   endif
 endif
 
-ifeq ($(DEB_HOST_ARCH),ia64)
+no_pch_architectures := armhf ia64
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_pch_architectures)))
 	extra_configure_opts += -no-pch
 endif
 
@@ -119,7 +120,7 @@ endif
 
 	./configure -confirm-license \
 	            -prefix "/usr" \
-	            -bindir "/usr/bin" \
+	            -bindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" \
 	            -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	            -docdir "/usr/share/qt4/doc" \
 	            -headerdir "/usr/include/qt4" \
@@ -280,6 +281,12 @@ override_dh_auto_install:
 	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/" {} \;
 
+	# Add symlinks for the -qt4 binaries still used by some
+	for links_file in debian/libqt4-dev-bin.links debian/qt4-designer.links debian/qt4-dev-tools.links debian/qt4-linguist-tools.links debian/qt4-qmake.links debian/qt4-qtconfig.links ; do \
+		cat $$links_file.in > $$links_file ; \
+		sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' $$links_file ; \
+	done
+
 	install -D -p -m0644 debian/collection/qtdemo.qhc \
 		debian/qt4-demos/usr/lib/qt4/demos/qtdemo/qtdemo.qhc
 
@@ -312,6 +319,23 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/lib/*/pkgconfig/phonon.pc
 	rm -rf debian/tmp/usr/include/qt4/phonon
 
+	# Add a configuration for qtchooser
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser
+	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf
+	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf
+
+	# Ship 4.conf and qt4.conf for this arch, and a default.conf.
+	# 4.conf makes calling qtchooser prettier.
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
+	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/4.conf
+	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt4.conf
+	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
+
+	# As a special case to avoid FTBFSs for current Qt4 packages, ship a second
+	# default.conf which will be searched by qtchooser. Only Qt4 should ship this.
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default/qtchooser
+	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default/qtchooser/default.conf
+
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/qt4 -depth -type d \( -false \
 	  -o -name .moc\* \
@@ -370,7 +394,7 @@ override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
 prune-nonfree:
-	# Delete zlib's RFCs.
-	find \( -name rfc195* \) -print -delete
+	# Delete RFCs.
+	find \( -name rfc????.txt \) -print -delete
 
 .PHONY: override_dh_auto_test
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 590c767..58332a5 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,4 +1,4 @@
 # libqt4-webkit-dbg is a transitional package for libqtwebkit-dbg
-qt4-x11 source: dbg-package-missing-depends: libqt4-webkit-dbg
+qt4-x11 source: dbg-package-missing-depends libqt4-webkit-dbg
 # qt4-bin-dbg is a collection of debug symbols for binaries
-qt4-x11 source: dbg-package-missing-depends: qt4-bin-dbg
+qt4-x11 source: dbg-package-missing-depends qt4-bin-dbg
diff --git a/debian/watch b/debian/watch
index 6793225..e88deea 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://releases.qt-project.org/qt4/source/ qt-(?:x11|everywhere)-opensource-src-([^-]*)\.tar.gz