11 files changed, 34 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index 8dda8ec..260a92e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,25 @@
-qt4-x11 (4:4.8.2+dfsg-10) UNRELEASED; urgency=low
+qt4-x11 (4:4.8.4+dfsg-1) UNRELEASED; urgency=low
 
+  * 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
 
- -- Timo Jyrinki <timo@debian.org>  Mon, 07 Jan 2013 12:41:04 +0000
+ -- Timo Jyrinki <timo@debian.org>  Thu, 17 Jan 2013 12:23:33 +0000
 
 qt4-x11 (4:4.8.2+dfsg-9) unstable; urgency=low
 
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-dev-bin.links b/debian/libqt4-dev-bin.links
index 08c9aa5..fe462dc 100644
--- a/debian/libqt4-dev-bin.links
+++ b/debian/libqt4-dev-bin.links
@@ -1,3 +1,5 @@
 usr/lib/*/qt4/bin/moc         usr/share/qt4/bin/moc
 usr/lib/*/qt4/bin/uic         usr/share/qt4/bin/uic
 usr/lib/*/qt4/bin/rcc             usr/share/qt4/bin/rcc
+usr/lib/*/qt4/bin/moc         usr/bin/moc-qt4
+usr/lib/*/qt4/bin/uic         usr/bin/uic-qt4
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/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/series b/debian/patches/series
index 575eaba..273497b 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
 
 # qt-copy patches
 0195-compositing-properties.diff
@@ -47,7 +40,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/qt4-designer.links b/debian/qt4-designer.links
index 7af4fab..2bb19cf 100644
--- a/debian/qt4-designer.links
+++ b/debian/qt4-designer.links
@@ -1 +1,2 @@
 usr/lib/*/qt4/bin/designer             usr/share/qt4/bin/designer
+usr/lib/*/qt4/bin/designer             usr/bin/designer-qt4
diff --git a/debian/qt4-dev-tools.links b/debian/qt4-dev-tools.links
new file mode 100644
index 0000000..10ecd41
--- /dev/null
+++ b/debian/qt4-dev-tools.links
@@ -0,0 +1,2 @@
+usr/lib/*/qt4/bin/assistant usr/bin/assistant-qt4
+usr/lib/*/qt4/bin/linguist usr/bin/linguist-qt4
diff --git a/debian/qt4-linguist-tools.links b/debian/qt4-linguist-tools.links
index 84de28e..d58b13a 100644
--- a/debian/qt4-linguist-tools.links
+++ b/debian/qt4-linguist-tools.links
@@ -1,2 +1,4 @@
 usr/lib/*/qt4/bin/lrelease    usr/share/qt4/bin/lrelease
 usr/lib/*/qt4/bin/lupdate     usr/share/qt4/bin/lupdate
+usr/lib/*/qt4/bin/lrelease    usr/bin/lrelease-qt4
+usr/lib/*/qt4/bin/lupdate     usr/bin/lupdate-qt4
diff --git a/debian/qt4-qmake.links b/debian/qt4-qmake.links
index b150de3..67b1c78 100644
--- a/debian/qt4-qmake.links
+++ b/debian/qt4-qmake.links
@@ -1 +1,2 @@
 usr/lib/*/qt4/bin/qmake       usr/share/qt4/bin/qmake
+usr/lib/*/qt4/bin/qmake       usr/bin/qmake-qt4
diff --git a/debian/qt4-qtconfig.links b/debian/qt4-qtconfig.links
new file mode 100644
index 0000000..e4ad07a
--- /dev/null
+++ b/debian/qt4-qtconfig.links
@@ -0,0 +1 @@
+usr/lib/*/qt4/bin/qtconfig usr/bin/qtconfig-qt4