Revert multiarch changes.

32 files changed, 114 insertions, 210 deletions

diff --git a/debian/changelog b/debian/changelog
index 14261b7..68750ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,19 +15,14 @@ qt4-x11 (4:4.7.4-1) UNRELEASED; urgency=low
       path resolution and should be obsolete anyway now that multiarch is
       available: we should drop qt from the next ia32-libs upload.
   * Add patches:
-    - qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
-      plugin path.
     - openssl_no_ssl2.patch - OpenSSL in Debian dropped the insecure SSLv2
       protocol. (Closes: #640210)
     - Remove_QtHelp_dependency_on_QtXml.patch - (Closes: #641753)
   * Break qdbus out into a separate 'qdbus' package and make it a dependency of
     libqt4-dbus, because some things will use this at runtime. It makes
     libqt4-dbus genuinely multiarch-installable.
-  * Update debian/control: mark Qt libraries as Multi-Arch.
   * Update debian/rules:
-    - add DEB_HOST_MULTIARCH support for libdir/plugindir.
     - add -reduce-relocations configure option.
-  * Update debian/*.install: update paths for multiarch.
   * Update debian/libqt4-declarative.install: rename libtcpserver.so to
     libqmldbg_tcp.so.
   * Add libqt4-declarative-shaders package.
diff --git a/debian/control b/debian/control
index b40a585..ca5cda4 100644
--- a/debian/control
+++ b/debian/control
@@ -60,8 +60,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=summary
 
 Package: libqtcore4
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 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)
@@ -91,8 +89,6 @@ Description: transitional package for Qt 4 core non-GUI runtime libraries
 
 Package: libqtgui4
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: fontconfig, ${misc:Depends}, ${shlibs:Depends}
 Recommends: libcups2
 Suggests: qt4-qtconfig
@@ -129,8 +125,6 @@ Description: transitional package for Qt 4 GUI runtime libraries
 
 Package: libqt4-network
 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)
@@ -143,8 +137,6 @@ Description: Qt 4 network module
 
 Package: libqt4-opengl
 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)
@@ -160,8 +152,6 @@ Description: Qt 4 OpenGL module
 
 Package: libqt4-script
 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)
@@ -173,8 +163,6 @@ Description: Qt 4 script module
 
 Package: libqt4-scripttools
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 script tools module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -188,8 +176,6 @@ Description: Qt 4 script tools module
 
 Package: libqt4-sql
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: libqt4-sql-mysql | libqt4-sql-odbc | libqt4-sql-psql | libqt4-sql-sqlite | libqt4-sql-sqlite2 | libqt4-sql-ibase [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc]
 Suggests: libqt4-dev
@@ -205,8 +191,6 @@ Description: Qt 4 SQL module
 
 Package: libqt4-sql-ibase
 Architecture: amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 InterBase/FireBird database driver
@@ -217,8 +201,6 @@ Description: Qt 4 InterBase/FireBird database driver
 
 Package: libqt4-sql-mysql
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 MySQL database driver
@@ -229,8 +211,6 @@ Description: Qt 4 MySQL database driver
 
 Package: libqt4-sql-odbc
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 ODBC database driver
@@ -241,8 +221,6 @@ Description: Qt 4 ODBC database driver
 
 Package: libqt4-sql-psql
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 PostgreSQL database driver
@@ -253,8 +231,6 @@ Description: Qt 4 PostgreSQL database driver
 
 Package: libqt4-sql-sqlite
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 SQLite 3 database driver
@@ -265,8 +241,6 @@ Description: Qt 4 SQLite 3 database driver
 
 Package: libqt4-sql-sqlite2
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 SQLite 2 database driver
@@ -277,8 +251,6 @@ Description: Qt 4 SQLite 2 database driver
 
 Package: libqt4-sql-tds
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-dev
 Description: Qt 4 FreeTDS database driver
@@ -289,8 +261,6 @@ Description: Qt 4 FreeTDS database driver
 
 Package: libqt4-svg
 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)
@@ -317,8 +287,6 @@ Description: transitional package for Qt 4 WebKit module
 
 Package: libqt4-xml
 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)
@@ -331,8 +299,6 @@ Description: Qt 4 XML module
 
 Package: libqt4-xmlpatterns
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 XML patterns module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -342,8 +308,6 @@ Description: Qt 4 XML patterns module
 
 Package: libqt4-dbus
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: qdbus (= ${binary:Version}), ${misc:Depends}, ${shlibs: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)
@@ -360,8 +324,6 @@ Description: Qt 4 D-Bus module
 
 Package: libqt4-qt3support
 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)
@@ -377,8 +339,6 @@ Description: Qt 3 compatibility library for Qt 4
 
 Package: libqt4-designer
 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)
@@ -392,8 +352,6 @@ Description: Qt 4 designer module
 
 Package: libqt4-help
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 4 help module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -416,8 +374,6 @@ Description: transitional package for Qt 4 assistant module
 
 Package: libqt4-test
 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)
@@ -430,8 +386,6 @@ Description: Qt 4 test module
 
 Package: libqt4-phonon
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libphonon4
 Breaks: kdelibs5 (<= 4:4.0.80)
@@ -449,8 +403,6 @@ Description: Qt 4 Phonon module
 
 Package: libqt4-declarative
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libqt4-declarative-folderlistmodel,
           libqt4-declarative-gestures,
@@ -794,7 +746,6 @@ Description: Qt 4 Linguist tools
 
 Package: qdbus
 Architecture: any
-Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqt4-dbus (<< 4:4.7.4-1)
 Replaces: libqt4-dbus (<< 4:4.7.4-1)
diff --git a/debian/libqt4-dbus.install b/debian/libqt4-dbus.install
index 3c1a8b2..4e6f1b4 100644
--- a/debian/libqt4-dbus.install
+++ b/debian/libqt4-dbus.install
@@ -1 +1 @@
-usr/lib/*/libQtDBus.so.*
+usr/lib/libQtDBus.so.*
diff --git a/debian/libqt4-declarative.install b/debian/libqt4-declarative.install
index ca454e8..0513837 100644
--- a/debian/libqt4-declarative.install
+++ b/debian/libqt4-declarative.install
@@ -1,3 +1,3 @@
-usr/lib/*/libQtDeclarative.so.*
-usr/lib/*/qt4/plugins/designer/libqdeclarativeview.so
-usr/lib/*/qt4/plugins/qmltooling/libqmldbg_tcp.so
+usr/lib/libQtDeclarative.so.*
+usr/lib/qt4/plugins/designer/libqdeclarativeview.so
+usr/lib/qt4/plugins/qmltooling/libqmldbg_tcp.so
diff --git a/debian/libqt4-designer.install b/debian/libqt4-designer.install
index a4c8978..d5101f3 100644
--- a/debian/libqt4-designer.install
+++ b/debian/libqt4-designer.install
@@ -1,2 +1,2 @@
-usr/lib/*/libQtDesigner.so.*
-usr/lib/*/libQtDesignerComponents.so.*
+usr/lib/libQtDesigner.so.*
+usr/lib/libQtDesignerComponents.so.*
diff --git a/debian/libqt4-dev.install b/debian/libqt4-dev.install
index 1f26a75..32de6b6 100644
--- a/debian/libqt4-dev.install
+++ b/debian/libqt4-dev.install
@@ -2758,58 +2758,58 @@ usr/include/qt4/QtXmlPatterns/qxmlresultitems.h
 usr/include/qt4/QtXmlPatterns/qxmlschema.h
 usr/include/qt4/QtXmlPatterns/qxmlschemavalidator.h
 usr/include/qt4/QtXmlPatterns/qxmlserializer.h
-usr/lib/*/libQt3Support.prl
-usr/lib/*/libQt3Support.so
-usr/lib/*/libQtCLucene.prl
-usr/lib/*/libQtCLucene.so
-usr/lib/*/libQtCore.prl
-usr/lib/*/libQtCore.so
-usr/lib/*/libQtDBus.prl
-usr/lib/*/libQtDBus.so
-usr/lib/*/libQtDeclarative.prl
-usr/lib/*/libQtDeclarative.so
-usr/lib/*/libQtDesigner.prl
-usr/lib/*/libQtDesigner.so
-usr/lib/*/libQtDesignerComponents.prl
-usr/lib/*/libQtDesignerComponents.so
-usr/lib/*/libQtGui.prl
-usr/lib/*/libQtGui.so
-usr/lib/*/libQtHelp.prl
-usr/lib/*/libQtHelp.so
-usr/lib/*/libQtNetwork.prl
-usr/lib/*/libQtNetwork.so
-usr/lib/*/libQtScript.prl
-usr/lib/*/libQtScript.so
-usr/lib/*/libQtScriptTools.prl
-usr/lib/*/libQtScriptTools.so
-usr/lib/*/libQtSql.prl
-usr/lib/*/libQtSql.so
-usr/lib/*/libQtSvg.prl
-usr/lib/*/libQtSvg.so
-usr/lib/*/libQtTest.prl
-usr/lib/*/libQtTest.so
-usr/lib/*/libQtUiTools.a
-usr/lib/*/libQtUiTools.prl
-usr/lib/*/libQtXml.prl
-usr/lib/*/libQtXml.so
-usr/lib/*/libQtXmlPatterns.prl
-usr/lib/*/libQtXmlPatterns.so
-usr/lib/*/pkgconfig/Qt3Support.pc
-usr/lib/*/pkgconfig/QtCLucene.pc
-usr/lib/*/pkgconfig/QtCore.pc
-usr/lib/*/pkgconfig/QtDBus.pc
-usr/lib/*/pkgconfig/QtDeclarative.pc
-usr/lib/*/pkgconfig/QtDesigner.pc
-usr/lib/*/pkgconfig/QtDesignerComponents.pc
-usr/lib/*/pkgconfig/QtGui.pc
-usr/lib/*/pkgconfig/QtHelp.pc
-usr/lib/*/pkgconfig/QtNetwork.pc
-usr/lib/*/pkgconfig/QtScript.pc
-usr/lib/*/pkgconfig/QtScriptTools.pc
-usr/lib/*/pkgconfig/QtSql.pc
-usr/lib/*/pkgconfig/QtSvg.pc
-usr/lib/*/pkgconfig/QtTest.pc
-usr/lib/*/pkgconfig/QtUiTools.pc
-usr/lib/*/pkgconfig/QtXml.pc
-usr/lib/*/pkgconfig/QtXmlPatterns.pc
+usr/lib/libQt3Support.prl
+usr/lib/libQt3Support.so
+usr/lib/libQtCLucene.prl
+usr/lib/libQtCLucene.so
+usr/lib/libQtCore.prl
+usr/lib/libQtCore.so
+usr/lib/libQtDBus.prl
+usr/lib/libQtDBus.so
+usr/lib/libQtDeclarative.prl
+usr/lib/libQtDeclarative.so
+usr/lib/libQtDesigner.prl
+usr/lib/libQtDesigner.so
+usr/lib/libQtDesignerComponents.prl
+usr/lib/libQtDesignerComponents.so
+usr/lib/libQtGui.prl
+usr/lib/libQtGui.so
+usr/lib/libQtHelp.prl
+usr/lib/libQtHelp.so
+usr/lib/libQtNetwork.prl
+usr/lib/libQtNetwork.so
+usr/lib/libQtScript.prl
+usr/lib/libQtScript.so
+usr/lib/libQtScriptTools.prl
+usr/lib/libQtScriptTools.so
+usr/lib/libQtSql.prl
+usr/lib/libQtSql.so
+usr/lib/libQtSvg.prl
+usr/lib/libQtSvg.so
+usr/lib/libQtTest.prl
+usr/lib/libQtTest.so
+usr/lib/libQtUiTools.a
+usr/lib/libQtUiTools.prl
+usr/lib/libQtXml.prl
+usr/lib/libQtXml.so
+usr/lib/libQtXmlPatterns.prl
+usr/lib/libQtXmlPatterns.so
+usr/lib/pkgconfig/Qt3Support.pc
+usr/lib/pkgconfig/QtCLucene.pc
+usr/lib/pkgconfig/QtCore.pc
+usr/lib/pkgconfig/QtDBus.pc
+usr/lib/pkgconfig/QtDeclarative.pc
+usr/lib/pkgconfig/QtDesigner.pc
+usr/lib/pkgconfig/QtDesignerComponents.pc
+usr/lib/pkgconfig/QtGui.pc
+usr/lib/pkgconfig/QtHelp.pc
+usr/lib/pkgconfig/QtNetwork.pc
+usr/lib/pkgconfig/QtScript.pc
+usr/lib/pkgconfig/QtScriptTools.pc
+usr/lib/pkgconfig/QtSql.pc
+usr/lib/pkgconfig/QtSvg.pc
+usr/lib/pkgconfig/QtTest.pc
+usr/lib/pkgconfig/QtUiTools.pc
+usr/lib/pkgconfig/QtXml.pc
+usr/lib/pkgconfig/QtXmlPatterns.pc
 usr/share/qt4/q3porting.xml
diff --git a/debian/libqt4-help.install b/debian/libqt4-help.install
index c16b647..5c16f94 100644
--- a/debian/libqt4-help.install
+++ b/debian/libqt4-help.install
@@ -1,4 +1,4 @@
-usr/lib/*/libQtHelp.so.*
+usr/lib/libQtHelp.so.*
 usr/share/qt4/translations/qt_help_cs.qm
 usr/share/qt4/translations/qt_help_da.qm
 usr/share/qt4/translations/qt_help_de.qm
diff --git a/debian/libqt4-network.install b/debian/libqt4-network.install
index 7693f89..13e4a4d 100644
--- a/debian/libqt4-network.install
+++ b/debian/libqt4-network.install
@@ -1,2 +1,2 @@
-usr/lib/*/libQtNetwork.so.*
-usr/lib/*/qt4/plugins/bearer
+usr/lib/libQtNetwork.so.*
+usr/lib/qt4/plugins/bearer
diff --git a/debian/libqt4-opengl-dev.install b/debian/libqt4-opengl-dev.install
index 8e645ac..f43c100 100644
--- a/debian/libqt4-opengl-dev.install
+++ b/debian/libqt4-opengl-dev.install
@@ -30,6 +30,6 @@ usr/include/qt4/QtOpenGL/qglframebufferobject.h
 usr/include/qt4/QtOpenGL/qglpixelbuffer.h
 usr/include/qt4/QtOpenGL/qglscreen_qws.h
 usr/include/qt4/QtOpenGL/qglshaderprogram.h
-usr/lib/*/libQtOpenGL.prl
-usr/lib/*/libQtOpenGL.so
-usr/lib/*/pkgconfig/QtOpenGL.pc
+usr/lib/libQtOpenGL.prl
+usr/lib/libQtOpenGL.so
+usr/lib/pkgconfig/QtOpenGL.pc
diff --git a/debian/libqt4-opengl.install b/debian/libqt4-opengl.install
index 2261055..c998942 100644
--- a/debian/libqt4-opengl.install
+++ b/debian/libqt4-opengl.install
@@ -1,2 +1,2 @@
-usr/lib/*/libQtOpenGL.so.*
-usr/lib/*/qt4/plugins/graphicssystems/libqglgraphicssystem.so
+usr/lib/libQtOpenGL.so.*
+usr/lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
diff --git a/debian/libqt4-phonon.install b/debian/libqt4-phonon.install
index 0f2ac5c..d42354a 100644
--- a/debian/libqt4-phonon.install
+++ b/debian/libqt4-phonon.install
@@ -1,2 +1,2 @@
-usr/lib/*/libphonon.so.4*
-usr/lib/*/qt4/plugins/designer/libphononwidgets.so
+usr/lib/libphonon.so.4*
+usr/lib/qt4/plugins/designer/libphononwidgets.so
diff --git a/debian/libqt4-qt3support.install b/debian/libqt4-qt3support.install
index a9b8d03..137efdd 100644
--- a/debian/libqt4-qt3support.install
+++ b/debian/libqt4-qt3support.install
@@ -1,3 +1,3 @@
-usr/lib/*/libQt3Support.so.*
-usr/lib/*/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
-usr/lib/*/qt4/plugins/designer/libqt3supportwidgets.so
+usr/lib/libQt3Support.so.*
+usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
+usr/lib/qt4/plugins/designer/libqt3supportwidgets.so
diff --git a/debian/libqt4-script.install b/debian/libqt4-script.install
index 8874873..53d05ca 100644
--- a/debian/libqt4-script.install
+++ b/debian/libqt4-script.install
@@ -1,2 +1,2 @@
-usr/lib/*/libQtScript.so.*
-usr/lib/*/qt4/plugins/script/libqtscriptdbus.so
+usr/lib/libQtScript.so.*
+usr/lib/qt4/plugins/script/libqtscriptdbus.so
diff --git a/debian/libqt4-scripttools.install b/debian/libqt4-scripttools.install
index 77e8f11..f3495aa 100644
--- a/debian/libqt4-scripttools.install
+++ b/debian/libqt4-scripttools.install
@@ -1 +1 @@
-usr/lib/*/libQtScriptTools.so.*
+usr/lib/libQtScriptTools.so.*
diff --git a/debian/libqt4-sql-ibase.install b/debian/libqt4-sql-ibase.install
index a0f729c..f31ca81 100644
--- a/debian/libqt4-sql-ibase.install
+++ b/debian/libqt4-sql-ibase.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlibase.so
+usr/lib/qt4/plugins/sqldrivers/libqsqlibase.so
diff --git a/debian/libqt4-sql-mysql.install b/debian/libqt4-sql-mysql.install
index a5eb38f..c89284a 100644
--- a/debian/libqt4-sql-mysql.install
+++ b/debian/libqt4-sql-mysql.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlmysql.so
+usr/lib/qt4/plugins/sqldrivers/libqsqlmysql.so
diff --git a/debian/libqt4-sql-odbc.install b/debian/libqt4-sql-odbc.install
index 39148bb..209b0a2 100644
--- a/debian/libqt4-sql-odbc.install
+++ b/debian/libqt4-sql-odbc.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlodbc.so
+usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so
diff --git a/debian/libqt4-sql-psql.install b/debian/libqt4-sql-psql.install
index 3625b58..46b396b 100644
--- a/debian/libqt4-sql-psql.install
+++ b/debian/libqt4-sql-psql.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlpsql.so
+usr/lib/qt4/plugins/sqldrivers/libqsqlpsql.so
diff --git a/debian/libqt4-sql-sqlite.install b/debian/libqt4-sql-sqlite.install
index 20da1e0..1f329f8 100644
--- a/debian/libqt4-sql-sqlite.install
+++ b/debian/libqt4-sql-sqlite.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlite.so
+usr/lib/qt4/plugins/sqldrivers/libqsqlite.so
diff --git a/debian/libqt4-sql-sqlite2.install b/debian/libqt4-sql-sqlite2.install
index 8cde965..bcac43d 100644
--- a/debian/libqt4-sql-sqlite2.install
+++ b/debian/libqt4-sql-sqlite2.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlite2.so
+usr/lib/qt4/plugins/sqldrivers/libqsqlite2.so
diff --git a/debian/libqt4-sql-tds.install b/debian/libqt4-sql-tds.install
index a4750b2..6f70205 100644
--- a/debian/libqt4-sql-tds.install
+++ b/debian/libqt4-sql-tds.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqltds.so
+usr/lib/qt4/plugins/sqldrivers/libqsqltds.so
diff --git a/debian/libqt4-sql.install b/debian/libqt4-sql.install
index fcc7cd3..04783f7 100644
--- a/debian/libqt4-sql.install
+++ b/debian/libqt4-sql.install
@@ -1 +1 @@
-usr/lib/*/libQtSql.so.*
+usr/lib/libQtSql.so.*
diff --git a/debian/libqt4-svg.install b/debian/libqt4-svg.install
index 9bc9c83..71d996e 100644
--- a/debian/libqt4-svg.install
+++ b/debian/libqt4-svg.install
@@ -1,3 +1,3 @@
-usr/lib/*/libQtSvg.so.*
-usr/lib/*/qt4/plugins/iconengines/libqsvgicon.so
-usr/lib/*/qt4/plugins/imageformats/libqsvg.so
+usr/lib/libQtSvg.so.*
+usr/lib/qt4/plugins/iconengines/libqsvgicon.so
+usr/lib/qt4/plugins/imageformats/libqsvg.so
diff --git a/debian/libqt4-test.install b/debian/libqt4-test.install
index 5f881e5..6552ae6 100644
--- a/debian/libqt4-test.install
+++ b/debian/libqt4-test.install
@@ -1 +1 @@
-usr/lib/*/libQtTest.so.*
+usr/lib/libQtTest.so.*
diff --git a/debian/libqt4-xml.install b/debian/libqt4-xml.install
index 857718d..6366cb3 100644
--- a/debian/libqt4-xml.install
+++ b/debian/libqt4-xml.install
@@ -1 +1 @@
-usr/lib/*/libQtXml.so.*
+usr/lib/libQtXml.so.*
diff --git a/debian/libqt4-xmlpatterns.install b/debian/libqt4-xmlpatterns.install
index 5b59b87..a8b4816 100644
--- a/debian/libqt4-xmlpatterns.install
+++ b/debian/libqt4-xmlpatterns.install
@@ -1 +1 @@
-usr/lib/*/libQtXmlPatterns.so.*
+usr/lib/libQtXmlPatterns.so.*
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index 8bc52e6..687a5b3 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -1,6 +1,6 @@
-usr/lib/*/libQtCLucene.so.*
-usr/lib/*/libQtCore.so.*
-usr/lib/*/qt4/plugins/codecs/*.so
+usr/lib/libQtCLucene.so.*
+usr/lib/libQtCore.so.*
+usr/lib/qt4/plugins/codecs/*.so
 usr/share/qt4/translations/qt_ar.qm
 usr/share/qt4/translations/qt_cs.qm
 usr/share/qt4/translations/qt_da.qm
diff --git a/debian/libqtgui4.install b/debian/libqtgui4.install
index 33cf0bf..f8f9973 100644
--- a/debian/libqtgui4.install
+++ b/debian/libqtgui4.install
@@ -1,9 +1,9 @@
-usr/lib/*/libQtGui.so.*
-usr/lib/*/qt4/plugins/accessible/libqtaccessiblewidgets.so
-usr/lib/*/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
-usr/lib/*/qt4/plugins/imageformats/libqgif.so
-usr/lib/*/qt4/plugins/imageformats/libqico.so
-usr/lib/*/qt4/plugins/imageformats/libqjpeg.so
-usr/lib/*/qt4/plugins/imageformats/libqmng.so
-usr/lib/*/qt4/plugins/imageformats/libqtiff.so
-usr/lib/*/qt4/plugins/inputmethods/libqimsw-multi.so
+usr/lib/libQtGui.so.*
+usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
+usr/lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
+usr/lib/qt4/plugins/imageformats/libqgif.so
+usr/lib/qt4/plugins/imageformats/libqico.so
+usr/lib/qt4/plugins/imageformats/libqjpeg.so
+usr/lib/qt4/plugins/imageformats/libqmng.so
+usr/lib/qt4/plugins/imageformats/libqtiff.so
+usr/lib/qt4/plugins/inputmethods/libqimsw-multi.so
diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
deleted file mode 100644
index 2f5a5bb..0000000
--- a/debian/patches/qt-multiarch-plugin-path-compat.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: include legacy pre-multiarch plugin path
- A full multiarch system requires an architecture-qualified plugin path for
- Qt, but installed systems may still have plugins (e.g., from other
- distribution packages) in another pre-multiarch directory.  When constructing
- the plugin path, include both the configured plugin path and a plugin path
- with the architecture triplet stripped out.
-Author: Steve Langasek <steve.langasek@ubuntu.com>
-Last-Update: 2011-09-23
-
----
- src/corelib/kernel/qcoreapplication.cpp |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/src/corelib/kernel/qcoreapplication.cpp
-+++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2324,6 +2324,23 @@ QStringList QCoreApplication::libraryPat
-             if (!app_libpaths->contains(installPathPlugins))
-                 app_libpaths->append(installPathPlugins);
-         }
-+        QString pathSep("/");
-+        QStringList dirnames = QString(installPathPlugins).split(QLatin1Char('/'), QString::SkipEmptyParts);
-+        if (dirnames[0] == QLatin1String("usr") && dirnames[1] == QLatin1String("lib") && dirnames[3] == QLatin1String("qt4"))
-+        {
-+            QString legacyPathPlugins = pathSep;
-+            int i = 0;
-+            for (QStringList::const_iterator it = dirnames.constBegin(); it != dirnames.constEnd(); ++it) {
-+                if (++i == 3)
-+                    continue;
-+                legacyPathPlugins = legacyPathPlugins + QString(*it) + pathSep;
-+            }
-+            if (QFile::exists(legacyPathPlugins)) {
-+                legacyPathPlugins = QDir(legacyPathPlugins).canonicalPath();
-+                if (!app_libpaths->contains(legacyPathPlugins))
-+                    app_libpaths->append(legacyPathPlugins);
-+            }
-+        }
- #endif
- 
-         // If QCoreApplication is not yet instantiated,
diff --git a/debian/patches/series b/debian/patches/series
index 5bd84ee..84a262a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,7 +49,6 @@ kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 armv6_Include_explicitly_IT_instructions.patch
 armv6_Add_support_for_ARMv7_atomic_operations.patch
-qt-multiarch-plugin-path-compat.diff
 s390x_jscore.diff
 blacklist-diginotar-cert.diff
 openssl_no_ssl2.patch
diff --git a/debian/qt4-demos.install b/debian/qt4-demos.install
index b5a7a9d..3e7cb40 100644
--- a/debian/qt4-demos.install
+++ b/debian/qt4-demos.install
@@ -1,8 +1,8 @@
 usr/bin/qtdemo
-usr/lib/*/qt4/plugins/designer/libarthurplugin.so
-usr/lib/*/qt4/plugins/designer/libcontainerextension.so
-usr/lib/*/qt4/plugins/designer/libcustomwidgetplugin.so
-usr/lib/*/qt4/plugins/designer/libtaskmenuextension.so
-usr/lib/*/qt4/plugins/designer/libworldtimeclockplugin.so
+usr/lib/qt4/plugins/designer/libarthurplugin.so
+usr/lib/qt4/plugins/designer/libcontainerextension.so
+usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so
+usr/lib/qt4/plugins/designer/libtaskmenuextension.so
+usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so
 usr/lib/qt4/demos
 usr/lib/qt4/examples
diff --git a/debian/rules b/debian/rules
index 89e89a4..70c47b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
 export LDFLAGS := -Wl,--as-needed
@@ -101,11 +99,11 @@ endif
 	./configure -confirm-license \
 	            -prefix "/usr" \
 	            -bindir "/usr/bin" \
-	            -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
+	            -libdir "/usr/lib" \
 	            -docdir "/usr/share/qt4/doc" \
 	            -headerdir "/usr/include/qt4" \
 	            -datadir "/usr/share/qt4" \
-	            -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins" \
+	            -plugindir "/usr/lib/qt4/plugins" \
 	            -importdir "/usr/lib/qt4/imports" \
 	            -translationdir "/usr/share/qt4/translations" \
 	            -sysconfdir "/etc/xdg" \
@@ -249,7 +247,7 @@ override_dh_auto_install:
 	                          debian/tmp/usr/include/
 
 	# Fix wrong path in pkgconfig files
-	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
+	find $(CURDIR)/debian/tmp/usr/lib/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
 	# Fix wrong path in prl files
 	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
@@ -281,10 +279,10 @@ override_dh_auto_install:
 	rm -f debian/tmp//usr/share/qt4/mkspecs/modules/qt_webkit_version.pri
 
 	# Remove phonon development files
-	rm -f debian/tmp/usr/lib/*/libphonon.la
-	rm -f debian/tmp/usr/lib/*/libphonon.prl
-	rm -f debian/tmp/usr/lib/*/libphonon.so
-	rm -f debian/tmp/usr/lib/*/pkgconfig/phonon.pc
+	rm -f debian/tmp/usr/lib/libphonon.la
+	rm -f debian/tmp/usr/lib/libphonon.prl
+	rm -f debian/tmp/usr/lib/libphonon.so
+	rm -f debian/tmp/usr/lib/pkgconfig/phonon.pc
 	rm -rf debian/tmp/usr/include/qt4/phonon
 
 	# Remove leftover directories