Migrate to use qtchooser for Qt5 co-installation support

35 files changed, 73 insertions, 561 deletions

diff --git a/debian/changelog b/debian/changelog
index ec4e58d..8dda8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8.2+dfsg-10) UNRELEASED; urgency=low
+
+  * Migrate to use qtchooser for Qt5 co-installation support
+
+ -- Timo Jyrinki <timo@debian.org>  Mon, 07 Jan 2013 12:41:04 +0000
+
 qt4-x11 (4:4.8.2+dfsg-9) unstable; urgency=low
 
   * Fix the Breaks and Replaces version in libqtdbus4 to 4:4.8.2+dfsg-8
diff --git a/debian/control b/debian/control
index 394b5ac..0088ef6 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],
@@ -895,3 +896,16 @@ 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: all
+Depends: qtchooser, ${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.
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
index 3087c6c..08c9aa5 100644
--- a/debian/libqt4-dev-bin.links
+++ b/debian/libqt4-dev-bin.links
@@ -1,3 +1,3 @@
-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/*/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
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.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-dev.install b/debian/libqt4-dev.install
index 6942e37..e1814ba 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -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
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/series b/debian/patches/series
index f259b96..575eaba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,7 +16,6 @@ make_rules_for_redirect_stricter.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
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..85422d0
--- /dev/null
+++ b/debian/qt4-default.install
@@ -0,0 +1 @@
+usr/share/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
index d5bf5e5..7af4fab 100644
--- a/debian/qt4-designer.links
+++ b/debian/qt4-designer.links
@@ -1 +1 @@
-usr/bin/designer-qt4             usr/share/qt4/bin/designer
+usr/lib/*/qt4/bin/designer             usr/share/qt4/bin/designer
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.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.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.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
index d78d5ed..84de28e 100644
--- a/debian/qt4-linguist-tools.links
+++ b/debian/qt4-linguist-tools.links
@@ -1,2 +1,2 @@
-usr/bin/lrelease-qt4    usr/share/qt4/bin/lrelease
-usr/bin/lupdate-qt4     usr/share/qt4/bin/lupdate
+usr/lib/*/qt4/bin/lrelease    usr/share/qt4/bin/lrelease
+usr/lib/*/qt4/bin/lupdate     usr/share/qt4/bin/lupdate
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.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
index 8a70be9..b150de3 100644
--- a/debian/qt4-qmake.links
+++ b/debian/qt4-qmake.links
@@ -1 +1 @@
-usr/bin/qmake-qt4       usr/share/qt4/bin/qmake
+usr/lib/*/qt4/bin/qmake       usr/share/qt4/bin/qmake
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.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.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.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..fa83f42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,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" \
@@ -312,6 +312,12 @@ 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.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\* \