Merge lp:~timo-jyrinki/kubuntu-packaging/qt4-qtchooser-migration-raring into lp:~kubuntu-packagers/kubuntu-packaging/qt

[Timo Jyrinki]

* 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
  * Clean alternatives on upgrade
  * Add qt4-default package

* 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
  * Clean alternatives on upgrade
  * Add qt4-default package

The package has been so far tested in https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-proper to for example successfully build the qtcreator in there (which uses 'qmake-qt4').

The changes are identical to what's has been done in the Debian experimental branch at http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=shortlog;h=refs/heads/experimental over the last month. One of the most interesting parts is probably the qt4-default and qt5-default packages which provide the default.conf symlink for qtchooser.

qtchooser packaging is available at http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtchooser.git;a=shortlog (Debian) and https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtchooser (raring)

The snapshot release for orig tarball is at http://macieira.org/qtchooser/qtchooser-9-g8f08405.tar.gz . Distro patching adds the GPL required LICENSE files as per https://codereview.qt-project.org/#change,47111 (now merged)

[lp:~timo-jyrinki/kubuntu-packaging/qt4-qtchooser-migration-raring]

352. By Timo Jyrinki on 2013-02-08

Add the symlinks with a for loop instead.

[Didier Roche-Tolomelli (didrocks)]

Excellent work, thanks for cleaning the latest mile! :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-15 12:31:59 +0000
+++ debian/changelog	2013-02-08 06:33:21 +0000
@@ -1,11 +1,20 @@
 qt4-x11 (4:4.8.4+dfsg-0ubuntu3) UNRELEASED; urgency=low
 
+  [ Harald Sitter]
   * Rename fix_medium_font.diff to kubuntu_39_fix_medium_font.diff to reflect
     its origin.
   * Apply kubuntu patches in numeric order.
   * Add more dep3 tags to kubuntu patches.
 
- -- Harald Sitter <[e-mail]>  Mon, 03 Dec 2012 11:12:52 +0100
+  [ Timo Jyrinki ]
+  * 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
+  * Clean alternatives on upgrade
+  * Add qt4-default package
+
+ -- Timo Jyrinki <[e-mail]>  Wed, 16 Jan 2013 07:58:47 +0000
 
 qt4-x11 (4:4.8.4+dfsg-0ubuntu2) raring; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2012-09-24 12:41:03 +0000
+++ debian/control	2013-02-08 06:33:21 +0000
@@ -7,7 +7,8 @@
            Modestas Vainius <[e-mail]>,
            Sune Vuorela <[e-mail]>,
            Pino Toscano <[e-mail]>,
-           Lisandro Damián Nicanor Pérez Meyer <[e-mail]>
+           Lisandro Damián Nicanor Pérez Meyer <[e-mail]>,
+           Timo Jyrinki <[e-mail]>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                flex,
@@ -561,6 +562,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4:4.8.2)
 Replaces: libqt4-dev (<< 4:4.8.2)
+Recommends: qtchooser
 Description: Qt 4 development programs
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -720,7 +722,7 @@
 Replaces: libqt4-core (<< 4.4.0~beta1-1),
           libqt4-designer (<< 4.4.0~beta1-1),
           qt4-dev-tools (<= 4.0.1-2)
-Recommends: libqt4-dev
+Recommends: libqt4-dev, qtchooser
 Description: graphical designer for Qt 4 applications
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -734,7 +736,7 @@
 Depends: libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-core (<< 4.4.0~beta1-1)
 Replaces: libqt4-core (<< 4.4.0~beta1-1)
-Recommends: libqt4-dev, qt4-designer, qt4-doc
+Recommends: libqt4-dev, qt4-designer, qt4-doc, qtchooser
 Suggests: qt4-doc-html
 Conflicts: qt3-dev-tools-embedded
 Description: Qt 4 development tools
@@ -760,6 +762,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
 Replaces: libqt4-dev (<< 4.5.0~beta1+snapshot20090114-1)
+Recommends: qtchooser
 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.
@@ -781,6 +784,7 @@
 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)
+Recommends: qtchooser
 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.
@@ -807,7 +811,7 @@
 Architecture: any
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: imagemagick | gifsicle
+Recommends: imagemagick | gifsicle, qtchooser
 Description: Qt 4 QML viewer
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -822,6 +826,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dev (<< 4:4.7.3-2)
 Replaces: libqt4-dev (<< 4:4.7.3-2)
+Recommends: qtchooser
 Description: Qt 4 Linguist tools
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -838,6 +843,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dbus (<< 4:4.7.4-1)
 Replaces: libqt4-dbus (<< 4:4.7.4-1)
+Recommends: qtchooser
 Description: Qt 4 D-Bus tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -872,3 +878,16 @@
  This package contains the complete Qt 4 API documentation (HTML format).
  .
  The documentation is provided in HTML format.
+
+Package: qt4-default
+Architecture: all
+Depends: qtchooser, libqt4-dev, ${misc:Depends}
+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.
 
=== modified file 'debian/libqt4-dev-bin.install'
--- debian/libqt4-dev-bin.install	2012-05-29 13:16:53 +0000
+++ debian/libqt4-dev-bin.install	2013-02-08 06:33:21 +0000
@@ -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
 
=== renamed file 'debian/libqt4-dev-bin.links' => 'debian/libqt4-dev-bin.links.in'
--- debian/libqt4-dev-bin.links	2012-05-29 13:16:53 +0000
+++ debian/libqt4-dev-bin.links.in	2013-02-08 06:33:21 +0000
@@ -1,3 +1,5 @@
-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
+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
 
=== removed file 'debian/libqt4-dev-bin.postinst'
--- debian/libqt4-dev-bin.postinst	2012-05-29 13:16:53 +0000
+++ debian/libqt4-dev-bin.postinst	1970-01-01 00:00:00 +0000
@@ -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#
 
=== added file 'debian/libqt4-dev-bin.preinst'
--- debian/libqt4-dev-bin.preinst	1970-01-01 00:00:00 +0000
+++ debian/libqt4-dev-bin.preinst	2013-02-08 06:33:21 +0000
@@ -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#
 
=== removed file 'debian/libqt4-dev-bin.prerm'
--- debian/libqt4-dev-bin.prerm	2012-05-29 13:16:53 +0000
+++ debian/libqt4-dev-bin.prerm	1970-01-01 00:00:00 +0000
@@ -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#
 
=== modified file 'debian/libqt4-dev.install'
--- debian/libqt4-dev.install	2012-05-29 13:16:53 +0000
+++ debian/libqt4-dev.install	2013-02-08 06:33:21 +0000
@@ -1,3 +1,4 @@
+usr/share/qtchooser/qt4.conf
 #usr/include/qt4/Qt/QtOpenVG
 #usr/include/qt4/Qt/qvg.h
 #usr/include/qt4/QtOpenVG/QtOpenVG
 
=== removed file 'debian/patches/01_debian_append_qt4_suffix.diff'
--- debian/patches/01_debian_append_qt4_suffix.diff	2013-01-15 12:19:28 +0000
+++ debian/patches/01_debian_append_qt4_suffix.diff	1970-01-01 00:00:00 +0000
@@ -1,415 +0,0 @@
-Author: Brian Nelson <[e-mail]>
-Author: Fathi Boudra <[e-mail]>
-Author: Pino Toscano <[e-mail]>
-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(-)
-
-Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/compile.test
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/compile.test	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/compile.test	2013-01-09 12:40:58.041144770 +0000
-@@ -69,7 +69,7 @@
- rm -f "$EXE" "${EXE}.exe"
- 
- echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache"
--"$OUTDIR/bin/qmake" -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" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+"$OUTDIR/bin/qmake-qt4" -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" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
- 
- if [ "$VERBOSE" = "yes" ]; then
-     $MAKE
-Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/doubleformat.test
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/doubleformat.test	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/doubleformat.test	2013-01-09 12:40:13.589143631 +0000
-@@ -10,7 +10,7 @@
- 
- # 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"
-Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/endian.test
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/endian.test	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/endian.test	2013-01-09 12:40:44.073144412 +0000
-@@ -11,7 +11,7 @@
- 
- # 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" "QMAKE_CXXFLAGS*=$SYSROOT" "LIBS*=$SYSROOT" "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" "QMAKE_CXXFLAGS*=$SYSROOT" "LIBS*=$SYSROOT" "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"
- 
- 
-Index: qt-everywhere-opensource-src-4.8.4/config.tests/unix/ptrsize.test
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/unix/ptrsize.test	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/config.tests/unix/ptrsize.test	2013-01-09 12:40:13.589143631 +0000
-@@ -10,7 +10,7 @@
- 
- # 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
-Index: qt-everywhere-opensource-src-4.8.4/config.tests/x11/notype.test
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/config.tests/x11/notype.test	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/config.tests/x11/notype.test	2013-01-09 12:40:13.589143631 +0000
-@@ -27,7 +27,7 @@
-     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
-Index: qt-everywhere-opensource-src-4.8.4/configure
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/configure	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/configure	2013-01-09 12:40:13.593143631 +0000
-@@ -4899,7 +4899,7 @@
- }
- 
- # 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=
-@@ -8683,8 +8683,8 @@
- 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
-@@ -9092,11 +9092,11 @@
- 
- 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
- 
-@@ -9283,7 +9283,7 @@
-         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)"
-Index: qt-everywhere-opensource-src-4.8.4/projects.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/projects.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/projects.pro	2013-01-09 12:40:13.597143632 +0000
-@@ -144,7 +144,7 @@
- equals(QMAKE_HOST.os, Windows) {
-    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
- 
-Index: qt-everywhere-opensource-src-4.8.4/qmake/Makefile.unix
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/qmake/Makefile.unix	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/qmake/Makefile.unix	2013-01-09 12:40:13.597143632 +0000
-@@ -86,17 +86,17 @@
- 
- 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)
-Index: qt-everywhere-opensource-src-4.8.4/tools/linguist/lrelease/lrelease.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/linguist/lrelease/lrelease.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/linguist/lrelease/lrelease.pro	2013-01-09 12:40:13.597143632 +0000
-@@ -1,5 +1,5 @@
- TEMPLATE        = app
--TARGET          = lrelease
-+TARGET          = lrelease-qt4
- DESTDIR         = ../../../bin
- 
- DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-Index: qt-everywhere-opensource-src-4.8.4/tools/linguist/lupdate/lupdate.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/linguist/lupdate/lupdate.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/linguist/lupdate/lupdate.pro	2013-01-09 12:40:13.597143632 +0000
-@@ -1,5 +1,5 @@
- TEMPLATE        = app
--TARGET          = lupdate
-+TARGET          = lupdate-qt4
- DESTDIR          = ../../../bin
- 
- QT              -= gui
-Index: qt-everywhere-opensource-src-4.8.4/src/tools/moc/moc.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/src/tools/moc/moc.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/moc.pro	2013-01-09 12:40:13.597143632 +0000
-@@ -1,5 +1,5 @@
- TEMPLATE	= app
--TARGET		= moc
-+TARGET		= moc-qt4
- 
- DEFINES	       += QT_MOC
- DESTDIR         = ../../../bin
-Index: qt-everywhere-opensource-src-4.8.4/src/tools/uic/uic.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/src/tools/uic/uic.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/src/tools/uic/uic.pro	2013-01-09 12:40:13.597143632 +0000
-@@ -1,5 +1,5 @@
- TEMPLATE = app
--TARGET = uic
-+TARGET = uic-qt4
- 
- DESTDIR = ../../../bin
- DEFINES += QT_UIC
-Index: qt-everywhere-opensource-src-4.8.4/tools/assistant/tools/assistant/assistant.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/assistant/tools/assistant/assistant.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/assistant/tools/assistant/assistant.pro	2013-01-09 12:40:13.597143632 +0000
-@@ -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 \
-Index: qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/designer.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/designer/src/designer/designer.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/designer.pro	2013-01-09 12:40:13.597143632 +0000
-@@ -23,7 +23,7 @@
-     DEFINES += QT_DESIGNER_STATIC
- }
- 
--TARGET = designer
-+TARGET = designer-qt4
- 
- include(../../../shared/fontpanel/fontpanel.pri)
- include(../../../shared/qttoolbardialog/qttoolbardialog.pri)
-Index: qt-everywhere-opensource-src-4.8.4/tools/linguist/linguist/linguist.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/linguist/linguist/linguist.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/linguist/linguist/linguist.pro	2013-01-09 12:40:13.601143632 +0000
-@@ -69,7 +69,7 @@
- 
- 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
-Index: qt-everywhere-opensource-src-4.8.4/tools/qtconfig/qtconfig.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/qtconfig/qtconfig.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/qtconfig/qtconfig.pro	2013-01-09 12:40:13.601143632 +0000
-@@ -19,7 +19,7 @@
- RESOURCES    = qtconfig.qrc
- 
- PROJECTNAME        = Qt Configuration
--TARGET             = qtconfig
-+TARGET             = qtconfig-qt4
- DESTDIR            = ../../bin
- 
- target.path=$$[QT_INSTALL_BINS]
-Index: qt-everywhere-opensource-src-4.8.4/translations/translations.pro
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/translations/translations.pro	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/translations/translations.pro	2013-01-09 12:40:13.601143632 +0000
-@@ -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.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
-Index: qt-everywhere-opensource-src-4.8.4/mkspecs/features/moc.prf
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/features/moc.prf	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/mkspecs/features/moc.prf	2013-01-09 12:40:13.601143632 +0000
-@@ -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
-Index: qt-everywhere-opensource-src-4.8.4/mkspecs/features/uic.prf
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/features/uic.prf	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/mkspecs/features/uic.prf	2013-01-09 12:40:13.601143632 +0000
-@@ -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
-Index: qt-everywhere-opensource-src-4.8.4/mkspecs/common/linux.conf
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/common/linux.conf	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/mkspecs/common/linux.conf	2013-01-09 12:40:13.601143632 +0000
-@@ -41,8 +41,8 @@
- 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
-Index: qt-everywhere-opensource-src-4.8.4/demos/qtdemo/menumanager.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/demos/qtdemo/menumanager.cpp	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/demos/qtdemo/menumanager.cpp	2013-01-09 12:40:13.601143632 +0000
-@@ -297,7 +297,7 @@
-     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
-Index: qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/assistantclient.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/designer/src/designer/assistantclient.cpp	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/designer/assistantclient.cpp	2013-01-09 12:40:13.605143632 +0000
-@@ -114,7 +114,7 @@
- {
-     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
-Index: qt-everywhere-opensource-src-4.8.4/tools/designer/src/lib/shared/qdesigner_utils.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/lib/shared/qdesigner_utils.cpp	2013-01-09 12:40:13.605143632 +0000
-@@ -782,7 +782,7 @@
-         binary += QDir::separator();
-         switch (mode) {
-         case UIC_GenerateCode:
--            binary += QLatin1String("uic");
-+            binary += QLatin1String("uic-qt4");
-             break;
-         case UIC_ConvertV3:
-             binary += QLatin1String("uic3");
-Index: qt-everywhere-opensource-src-4.8.4/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp	2013-01-09 12:40:13.605143632 +0000
-@@ -396,7 +396,7 @@
-         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");
-Index: qt-everywhere-opensource-src-4.8.4/mkspecs/hurd-g++/qmake.conf
-===================================================================
---- qt-everywhere-opensource-src-4.8.4.orig/mkspecs/hurd-g++/qmake.conf	2013-01-09 12:40:13.609143632 +0000
-+++ qt-everywhere-opensource-src-4.8.4/mkspecs/hurd-g++/qmake.conf	2013-01-09 12:40:13.605143632 +0000
-@@ -42,8 +42,8 @@
- 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
 
=== modified file 'debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff'
--- debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff	2013-01-15 12:31:59 +0000
+++ debian/patches/kubuntu_17_enable_qtwebkit_for_qtassistant.diff	2013-02-08 06:33:21 +0000
@@ -40,7 +40,7 @@
 @@ -2,7 +2,8 @@
  TEMPLATE = app
  LANGUAGE = C++
- TARGET = assistant-qt4
+ TARGET = assistant
 -contains(QT_CONFIG, webkit):QT += webkit
 +QT += webkit
 +DEFINES += QT_WEBKIT
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-15 12:11:40 +0000
+++ debian/patches/series	2013-02-08 06:33:21 +0000
@@ -9,7 +9,6 @@
 # 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
 
=== modified file 'debian/qdbus.install'
--- debian/qdbus.install	2011-08-17 20:07:34 +0000
+++ debian/qdbus.install	2013-02-08 06:33:21 +0000
@@ -1,1 +1,1 @@
-usr/bin/qdbus
+usr/lib/*/qt4/bin/qdbus
 
=== added file 'debian/qt4-default.install'
--- debian/qt4-default.install	1970-01-01 00:00:00 +0000
+++ debian/qt4-default.install	2013-02-08 06:33:21 +0000
@@ -0,0 +1,1 @@
+usr/share/qtchooser/default.conf
 
=== modified file 'debian/qt4-demos.install'
--- debian/qt4-demos.install	2011-12-30 17:08:51 +0000
+++ debian/qt4-demos.install	2013-02-08 06:33:21 +0000
@@ -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
 
=== modified file 'debian/qt4-designer.install'
--- debian/qt4-designer.install	2011-11-21 18:30:55 +0000
+++ debian/qt4-designer.install	2013-02-08 06:33:21 +0000
@@ -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
 
=== renamed file 'debian/qt4-designer.links' => 'debian/qt4-designer.links.in'
--- debian/qt4-designer.links	2009-05-06 22:58:25 +0000
+++ debian/qt4-designer.links.in	2013-02-08 06:33:21 +0000
@@ -1,1 +1,2 @@
-usr/bin/designer-qt4             usr/share/qt4/bin/designer
+usr/lib/MULTIARCH/qt4/bin/designer             usr/share/qt4/bin/designer
+usr/lib/MULTIARCH/qt4/bin/designer             usr/bin/designer-qt4
 
=== modified file 'debian/qt4-designer.menu'
--- debian/qt4-designer.menu	2009-05-06 22:58:25 +0000
+++ debian/qt4-designer.menu	2013-02-08 06:33:21 +0000
@@ -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"
 
=== removed file 'debian/qt4-designer.postinst'
--- debian/qt4-designer.postinst	2009-05-06 22:58:25 +0000
+++ debian/qt4-designer.postinst	1970-01-01 00:00:00 +0000
@@ -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#
 
=== added file 'debian/qt4-designer.preinst'
--- debian/qt4-designer.preinst	1970-01-01 00:00:00 +0000
+++ debian/qt4-designer.preinst	2013-02-08 06:33:21 +0000
@@ -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#
 
=== removed file 'debian/qt4-designer.prerm'
--- debian/qt4-designer.prerm	2009-05-06 22:58:25 +0000
+++ debian/qt4-designer.prerm	1970-01-01 00:00:00 +0000
@@ -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#
 
=== modified file 'debian/qt4-dev-tools.install'
--- debian/qt4-dev-tools.install	2011-12-30 17:08:51 +0000
+++ debian/qt4-dev-tools.install	2013-02-08 06:33:21 +0000
@@ -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
 
=== added file 'debian/qt4-dev-tools.links.in'
--- debian/qt4-dev-tools.links.in	1970-01-01 00:00:00 +0000
+++ debian/qt4-dev-tools.links.in	2013-02-08 06:33:21 +0000
@@ -0,0 +1,2 @@
+usr/lib/MULTIARCH/qt4/bin/assistant usr/bin/assistant-qt4
+usr/lib/MULTIARCH/qt4/bin/linguist usr/bin/linguist-qt4
 
=== modified file 'debian/qt4-dev-tools.menu'
--- debian/qt4-dev-tools.menu	2009-05-06 22:58:25 +0000
+++ debian/qt4-dev-tools.menu	2013-02-08 06:33:21 +0000
@@ -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"
 
=== removed file 'debian/qt4-dev-tools.postinst'
--- debian/qt4-dev-tools.postinst	2009-05-06 22:58:25 +0000
+++ debian/qt4-dev-tools.postinst	1970-01-01 00:00:00 +0000
@@ -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#
 
=== added file 'debian/qt4-dev-tools.preinst'
--- debian/qt4-dev-tools.preinst	1970-01-01 00:00:00 +0000
+++ debian/qt4-dev-tools.preinst	2013-02-08 06:33:21 +0000
@@ -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#
 
=== removed file 'debian/qt4-dev-tools.prerm'
--- debian/qt4-dev-tools.prerm	2009-05-06 22:58:25 +0000
+++ debian/qt4-dev-tools.prerm	1970-01-01 00:00:00 +0000
@@ -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#
 
=== modified file 'debian/qt4-linguist-tools.install'
--- debian/qt4-linguist-tools.install	2011-06-23 13:00:06 +0000
+++ debian/qt4-linguist-tools.install	2013-02-08 06:33:21 +0000
@@ -1,2 +1,2 @@
-usr/bin/lrelease-qt4
-usr/bin/lupdate-qt4
+usr/lib/*/qt4/bin/lrelease
+usr/lib/*/qt4/bin/lupdate
 
=== renamed file 'debian/qt4-linguist-tools.links' => 'debian/qt4-linguist-tools.links.in'
--- debian/qt4-linguist-tools.links	2011-06-23 13:00:06 +0000
+++ debian/qt4-linguist-tools.links.in	2013-02-08 06:33:21 +0000
@@ -1,2 +1,4 @@
-usr/bin/lrelease-qt4    usr/share/qt4/bin/lrelease
-usr/bin/lupdate-qt4     usr/share/qt4/bin/lupdate
+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
 
=== removed file 'debian/qt4-linguist-tools.postinst'
--- debian/qt4-linguist-tools.postinst	2011-06-23 13:00:06 +0000
+++ debian/qt4-linguist-tools.postinst	1970-01-01 00:00:00 +0000
@@ -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#
 
=== added file 'debian/qt4-linguist-tools.preinst'
--- debian/qt4-linguist-tools.preinst	1970-01-01 00:00:00 +0000
+++ debian/qt4-linguist-tools.preinst	2013-02-08 06:33:21 +0000
@@ -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#
 
=== removed file 'debian/qt4-linguist-tools.prerm'
--- debian/qt4-linguist-tools.prerm	2011-06-23 13:00:06 +0000
+++ debian/qt4-linguist-tools.prerm	1970-01-01 00:00:00 +0000
@@ -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#
 
=== modified file 'debian/qt4-qmake.install'
--- debian/qt4-qmake.install	2009-05-06 22:58:25 +0000
+++ debian/qt4-qmake.install	2013-02-08 06:33:21 +0000
@@ -1,2 +1,2 @@
-usr/bin/qmake-qt4
+usr/lib/*/qt4/bin/qmake
 usr/share/qt4/mkspecs/*
 
=== renamed file 'debian/qt4-qmake.links' => 'debian/qt4-qmake.links.in'
--- debian/qt4-qmake.links	2011-05-31 14:09:36 +0000
+++ debian/qt4-qmake.links.in	2013-02-08 06:33:21 +0000
@@ -1,1 +1,2 @@
-usr/bin/qmake-qt4       usr/share/qt4/bin/qmake
+usr/lib/MULTIARCH/qt4/bin/qmake       usr/share/qt4/bin/qmake
+usr/lib/MULTIARCH/qt4/bin/qmake       usr/bin/qmake-qt4
 
=== removed file 'debian/qt4-qmake.postinst'
--- debian/qt4-qmake.postinst	2009-05-06 22:58:25 +0000
+++ debian/qt4-qmake.postinst	1970-01-01 00:00:00 +0000
@@ -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#
 
=== added file 'debian/qt4-qmake.preinst'
--- debian/qt4-qmake.preinst	1970-01-01 00:00:00 +0000
+++ debian/qt4-qmake.preinst	2013-02-08 06:33:21 +0000
@@ -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#
 
=== removed file 'debian/qt4-qmake.prerm'
--- debian/qt4-qmake.prerm	2009-05-06 22:58:25 +0000
+++ debian/qt4-qmake.prerm	1970-01-01 00:00:00 +0000
@@ -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#
 
=== modified file 'debian/qt4-qmlviewer.install'
--- debian/qt4-qmlviewer.install	2010-07-07 03:39:15 +0000
+++ debian/qt4-qmlviewer.install	2013-02-08 06:33:21 +0000
@@ -1,1 +1,1 @@
-usr/bin/qmlviewer
+usr/lib/*/qt4/bin/qmlviewer
 
=== modified file 'debian/qt4-qtconfig.install'
--- debian/qt4-qtconfig.install	2011-11-21 18:30:55 +0000
+++ debian/qt4-qtconfig.install	2013-02-08 06:33:21 +0000
@@ -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
 
=== added file 'debian/qt4-qtconfig.links.in'
--- debian/qt4-qtconfig.links.in	1970-01-01 00:00:00 +0000
+++ debian/qt4-qtconfig.links.in	2013-02-08 06:33:21 +0000
@@ -0,0 +1,1 @@
+usr/lib/MULTIARCH/qt4/bin/qtconfig usr/bin/qtconfig-qt4
 
=== modified file 'debian/qt4-qtconfig.menu'
--- debian/qt4-qtconfig.menu	2009-05-06 22:58:25 +0000
+++ debian/qt4-qtconfig.menu	2013-02-08 06:33:21 +0000
@@ -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"
 
=== removed file 'debian/qt4-qtconfig.postinst'
--- debian/qt4-qtconfig.postinst	2009-05-06 22:58:25 +0000
+++ debian/qt4-qtconfig.postinst	1970-01-01 00:00:00 +0000
@@ -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#
 
=== added file 'debian/qt4-qtconfig.preinst'
--- debian/qt4-qtconfig.preinst	1970-01-01 00:00:00 +0000
+++ debian/qt4-qtconfig.preinst	2013-02-08 06:33:21 +0000
@@ -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#
 
=== removed file 'debian/qt4-qtconfig.prerm'
--- debian/qt4-qtconfig.prerm	2009-05-06 22:58:25 +0000
+++ debian/qt4-qtconfig.prerm	1970-01-01 00:00:00 +0000
@@ -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#
 
=== modified file 'debian/rules'
--- debian/rules	2013-01-15 12:05:40 +0000
+++ debian/rules	2013-02-08 06:33:21 +0000
@@ -125,7 +125,7 @@
 
 	./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" \
@@ -291,6 +291,12 @@
 	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
 
@@ -326,6 +332,12 @@
 	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.conf
+	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4.conf
+	ln -s /usr/share/qtchooser/qt4.conf $(CURDIR)/debian/tmp/usr/share/qtchooser/default.conf
+
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/qt4 -depth -type d \( -false \
 	  -o -name .moc\* \
@@ -376,7 +388,7 @@
 override_dh_shlibdeps:
 	# Kubuntu: assistant-qt4 links against libQtWebkit which we don't package in qt4-x11
 	# dependencies are manually added in debian/control
-	dh_shlibdeps -pqt4-dev-tools -Xusr/bin/assistant-qt4
+	dh_shlibdeps -pqt4-dev-tools -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin/assistant
 	dh_shlibdeps -pqt4-demos \
 		-Xusr/lib/qt4/examples/webkit/webplugin/webplugin \
 		-Xusr/lib/qt4/examples/webkit/simpleselector/simpleselector \