DEB qt3: Install libraries according to multi-arch rules

Signed-off-by: Slávek Banko <[email protected]>

18 files changed, 99 insertions, 48 deletions

diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control
index 7b8f1477a..a14638b1e 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/control
+++ b/ubuntu/maverick/dependencies/qt3/debian/control
@@ -19,10 +19,11 @@ Homepage: http://www.trinitydesktop.org/
 
 Package: libqt3-mt
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libqt3-mt (<< 4:14.0.0~)
 Breaks: libqt3-mt (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, fontconfig
+Depends: libqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig
 Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
 Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
 Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
@@ -31,8 +32,20 @@ Description: Qt GUI Library (Threaded runtime version), Version 3
  applications that link against the libqt-mt.so.3, e.g. all Trinity
  applications.
 
+Package: libqt3-mt-data
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Conflicts: libqt3-mt (<< 4:14.1.0~)
+Depends: ${shlibs:Depends}
+Description: Data for Qt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech Qt library, version 3. It's necessary for
+ applications that link against the libqt-mt.so.3, e.g. all Trinity
+ applications.
+
 Package: libqt3-mt-mysql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libqt3-mt-mysql (<< 4:14.0.0~)
 Breaks: libqt3-mt-mysql (<< 4:14.0.0~)
@@ -44,6 +57,7 @@ Description: MySQL database driver for Qt3 (Threaded)
 
 Package: libqt3-mt-odbc
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libqt3-mt-odbc (<< 4:14.0.0~)
 Breaks: libqt3-mt-odbc (<< 4:14.0.0~)
@@ -55,6 +69,7 @@ Description: ODBC database driver for Qt3 (Threaded)
 
 Package: libqt3-mt-psql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libqt3-mt-psql (<< 4:14.0.0~)
 Breaks: libqt3-mt-psql (<< 4:14.0.0~)
@@ -67,6 +82,7 @@ Description: PostgreSQL database driver for Qt3 (Threaded)
 
 Package: libqt3-mt-ibase
 Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Conflicts: libqt3c102-mt-ibase
@@ -78,6 +94,7 @@ Description: InterBase/FireBird database driver for Qt3 (Threaded)
 
 Package: libqt3-mt-sqlite
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libqt3-mt-sqlite (<< 4:14.0.0~)
 Breaks: libqt3-mt-sqlite (<< 4:14.0.0~)
@@ -90,6 +107,7 @@ Description: SQLite database driver for Qt3 (Threaded)
 
 Package: libqt3-mt-sqlite3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: SQLite3 database driver for Qt3 (Threaded)
@@ -99,9 +117,11 @@ Description: SQLite3 database driver for Qt3 (Threaded)
 
 Package: libqt3-mt-dev
 Architecture: any
+Multi-Arch: no
 Section: libdevel
 Replaces: libqt3-mt-dev (<< 4:14.0.0~)
 Breaks: libqt3-mt-dev (<< 4:14.0.0~)
+Conflicts: libqt3-mt (<< 4:14.1.0~)
 Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
  libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
  libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
@@ -130,6 +150,7 @@ Description: Qt development files (Threaded)
 
 Package: libqt3-headers
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: libqt3-headers (<< 4:14.0.0~)
 Breaks: libqt3-headers (<< 4:14.0.0~)
@@ -141,6 +162,7 @@ Description:  Qt3 header files
 
 Package: libqt3-compat-headers
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: libqt3-compat-headers (<< 4:14.0.0~)
 Breaks: libqt3-compat-headers (<< 4:14.0.0~)
@@ -157,6 +179,7 @@ Description: Qt 1.x and 2.x compatibility includes
 
 Package: qt3-dev-tools
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: qt3-dev-tools (<< 4:14.0.0~)
 Breaks: qt3-dev-tools (<< 4:14.0.0~)
@@ -170,10 +193,11 @@ Description: Qt3 development tools
 
 Package: qt3-designer
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: qt3-designer (<< 4:14.0.0~)
 Breaks: qt3-designer (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Depends: qt3-designer-plugins (= ${binary:Version}), ${shlibs:Depends}
 Recommends: qt3-dev-tools
 Suggests: qt3-assistant, qt3-doc
 Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
@@ -187,8 +211,18 @@ Description: Qt3 Designer
  automatically for the developer with a project management with qmake
  or automake.
 
+Package: qt3-designer-plugins
+Architecture: any
+Multi-Arch: same
+Section: devel
+Conflicts: qt3-designer (<< 4:14.1.0~)
+Depends: ${shlibs:Depends}
+Description: Qt3 Designer plugins
+ This package contains plugins for Qt3 Designer
+
 Package: qt3-apps-dev
 Architecture: any
+Multi-Arch: no
 Section: devel
 Replaces: qt3-apps-dev (<< 4:14.0.0~)
 Breaks: qt3-apps-dev (<< 4:14.0.0~)
@@ -204,6 +238,7 @@ Description: Qt3 Developer applications development files
 
 Package: qt3-linguist
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: qt3-linguist (<< 4:14.0.0~)
 Breaks: qt3-linguist (<< 4:14.0.0~)
@@ -217,6 +252,7 @@ Description: The Qt3 Linguist
 
 Package: qt3-assistant
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: qt3-assistant (<< 4:14.0.0~)
 Breaks: qt3-assistant (<< 4:14.0.0~)
@@ -235,6 +271,7 @@ Description: The Qt3 assistant application
 
 Package: qt3-qtconfig
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: qt3-qtconfig (<< 4:14.0.0~)
 Breaks: qt3-qtconfig (<< 4:14.0.0~)
@@ -250,6 +287,7 @@ Description: The Qt3 Configuration Application
 
 Package: qt3-dev-tools-embedded
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: qt3-dev-tools-embedded (<< 4:14.0.0~)
 Breaks: qt3-dev-tools-embedded (<< 4:14.0.0~)
@@ -264,6 +302,7 @@ Description: Tools to develop embedded Qt applications
 
 Package: qt3-dev-tools-compat
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: qt3-dev-tools-compat (<< 4:14.0.0~)
 Breaks: qt3-dev-tools-compat (<< 4:14.0.0~)
@@ -280,6 +319,7 @@ Description: Conversion utilities for Qt3 development
 
 Package: libqt3-i18n
 Architecture: all
+Multi-Arch: foreign
 Section: libs
 Replaces: libqt3-i18n (<< 4:14.0.0~)
 Breaks: libqt3-i18n (<< 4:14.0.0~)
@@ -291,6 +331,7 @@ Description: i18n files for Qt3 library
 
 Package: qt3-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: qt3-doc (<< 4:14.0.0~)
 Breaks: qt3-doc (<< 4:14.0.0~)
@@ -304,6 +345,7 @@ Description: Qt3 API documentation
 
 Package: qt3-examples
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: qt3-examples (<< 4:14.0.0~)
 Breaks: qt3-examples (<< 4:14.0.0~)
@@ -318,6 +360,7 @@ Description:  Examples for Qt3
 Package: qt-x11-free-dbg
 Section: libdevel
 Architecture: any
+Multi-Arch: no
 Replaces: qt-x11-free-dbg (<< 4:14.0.0~)
 Breaks: qt-x11-free-dbg (<< 4:14.0.0~)
 Priority: extra
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-data.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-data.install
new file mode 100644
index 000000000..e58f09b34
--- /dev/null
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-data.install
@@ -0,0 +1 @@
+../../debian/qtrc etc/qt3/
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.install
index 09432e016..67cc0c4c9 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.install
@@ -1,9 +1,9 @@
-usr/lib/libqt-mt.la
-usr/lib/libqt-mt.prl
-usr/lib/libqt-mt.so
-usr/lib/libqui.prl
-usr/lib/libqui.so
-usr/lib/pkgconfig/qt-mt.pc
+usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.la
+usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.prl
+usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so
+usr/lib/$(DEB_HOST_MULTIARCH)/libqui.prl
+usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so
+usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/qt-mt.pc
 usr/include/qt3/qgl.h
 usr/include/qt3/qglcolormap.h
 usr/include/qt3/qwidgetfactory.h
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.links b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.links
index 506e3e49b..50d008c6b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.links
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-dev.links
@@ -1,7 +1,11 @@
-/usr/lib/libqt-mt.la /usr/share/qt3/lib/libqt-mt.la
-/usr/lib/libqui.prl /usr/share/qt3/lib/libqui.prl
-/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so
-/usr/lib/libqt-mt.prl /usr/share/qt3/lib/libqt-mt.prl
-/usr/lib/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.la /usr/share/qt3/lib/libqt-mt.la
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.prl /usr/share/qt3/lib/libqui.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.prl /usr/share/qt3/lib/libqt-mt.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3.3
+/usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins /usr/share/qt3/plugins
 /usr/include/qt3 /usr/share/qt3/include
-/usr/lib/qt3/plugins /usr/share/qt3/plugins
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-ibase.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-ibase.install
index e7d5a549a..284782279 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-ibase.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-ibase.install
@@ -1 +1 @@
-usr/lib/qt3/plugins/sqldrivers/libqsqlibase.so
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlibase.so
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-mysql.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-mysql.install
index 8fba7992f..43c82fd7b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-mysql.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-mysql.install
@@ -1 +1 @@
-usr/lib/qt3/plugins/sqldrivers/libqsqlmysql.so
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlmysql.so
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-odbc.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-odbc.install
index f06ddf32c..202c0fff1 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-odbc.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-odbc.install
@@ -1 +1 @@
-usr/lib/qt3/plugins/sqldrivers/libqsqlodbc.so
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlodbc.so
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-psql.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-psql.install
index f9914863f..cf2800373 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-psql.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-psql.install
@@ -1 +1 @@
-usr/lib/qt3/plugins/sqldrivers/libqsqlpsql.so
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlpsql.so
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite.install
index 1bdd0e354..f65aac492 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite.install
@@ -1 +1 @@
-usr/lib/qt3/plugins/sqldrivers/libqsqlite.so
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlite.so
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite3.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite3.install
index 27f831bad..8c5a97c4b 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite3.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt-sqlite3.install
@@ -1 +1 @@
-usr/lib/qt3/plugins/sqldrivers/libqsqlite3.so
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlite3.so
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.install b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.install
index 325e87900..b0c767003 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.install
@@ -1,6 +1,4 @@
-usr/lib/libqt-mt.so.*
-usr/lib/libqui.so.1.*
-usr/lib/qt3/plugins/imageformats/libqmng.so
-usr/lib/qt3/plugins/inputmethods/*.so
-../../debian/qtrc etc/qt3/                                                                              
-../../debian/qt_plugins_3.3rc etc/qt3/                                                                  
+usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.*
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/imageformats/libqmng.so
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/inputmethods/*.so
diff --git a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.links b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.links
index d8375caef..abaab3c97 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.links
+++ b/ubuntu/maverick/dependencies/qt3/debian/libqt3-mt.links
@@ -1,5 +1 @@
-/usr/lib/libqui.so.1.0.0 /usr/lib/libqui.so.1 
-/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1
-/usr/lib/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0
-/usr/lib/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3
-/usr/lib/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3.3
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install
index ad98c3165..30fd28dce 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libeditor.*
-usr/lib/libdesignercore.*
-usr/lib/libqassistantclient.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.*
+usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.*
 usr/include/qt3/qassistantclient.h
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.links b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.links
index 6c031422f..04098d9bd 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.links
+++ b/ubuntu/maverick/dependencies/qt3/debian/qt3-apps-dev.links
@@ -1,8 +1,8 @@
-/usr/lib/libeditor.prl /usr/share/qt3/lib/libeditor.prl
-/usr/lib/libeditor.a /usr/share/qt3/lib/libeditor.a
-/usr/lib/libdesignercore.prl /usr/share/qt3/lib/libdesignercore.prl
-/usr/lib/libdesignercore.a /usr/share/qt3/lib/libdesignercore.a
-/usr/lib/libqassistantclient.prl /usr/share/qt3/lib/libqassistantclient.prl
-/usr/lib/libqassistantclient.a /usr/share/qt3/lib/libqassistantclient.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.prl /usr/share/qt3/lib/libeditor.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.a /usr/share/qt3/lib/libeditor.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.prl /usr/share/qt3/lib/libdesignercore.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.a /usr/share/qt3/lib/libdesignercore.a
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.prl /usr/share/qt3/lib/libqassistantclient.prl
+/usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.a /usr/share/qt3/lib/libqassistantclient.a
 /usr/include/qt3 /usr/share/qt3/tools/designer/editor
 /usr/include/qt3 /usr/share/qt3/tools/designer/interfaces
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer-plugins.install b/ubuntu/maverick/dependencies/qt3/debian/qt3-designer-plugins.install
new file mode 100644
index 000000000..96c6ff294
--- /dev/null
+++ b/ubuntu/maverick/dependencies/qt3/debian/qt3-designer-plugins.install
@@ -0,0 +1 @@
+usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/designer/*
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.install b/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.install
index ac0c0902b..56064e08f 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.install
+++ b/ubuntu/maverick/dependencies/qt3/debian/qt3-designer.install
@@ -5,4 +5,3 @@ usr/share/qt3/templates/*
 usr/share/qt3/doc/html/designer*html
 usr/share/qt3/doc/html/designer*dcf
 usr/share/qt3/doc/html/designer*jpg
-usr/lib/qt3/plugins/designer/*
diff --git a/ubuntu/maverick/dependencies/qt3/debian/qtrc b/ubuntu/maverick/dependencies/qt3/debian/qtrc
index 3c977f4d1..4f44006ae 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/qtrc
+++ b/ubuntu/maverick/dependencies/qt3/debian/qtrc
@@ -1,6 +1,3 @@
-[3.3]
-libraryPath=/usr/lib/trinity/plugins/
-
 [General]
 GUIEffects=general^eanimatecombo^e
 embedFonts=true
@@ -12,7 +9,6 @@ style=Plastik
 
 [KDE]
 contrast=7
-kdeAddedLibraryPaths=/usr/lib/trinity/plugins/^e
 
 [KWinPalette]
 activeBackground=#1f26ad
@@ -29,4 +25,4 @@ inactiveTitleBtnBg=#ebebeb
 [Palette]
 active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
 disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e
-inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
\ No newline at end of file
+inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index b973c1553..aaf7c1246 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/ubuntu/maverick/dependencies/qt3/debian/rules
@@ -47,7 +47,8 @@ CONFIGURE_OPTS = \
 		-datadir	"/usr/share/qt3"		\
 		-headerdir	"/usr/include/qt3"		\
 		-docdir		"/usr/share/qt3/doc"		\
-		-plugindir	"/usr/lib/qt3/plugins"		\
+		-libdir		"/usr/lib/$(DEB_HOST_MULTIARCH)"		\
+		-plugindir	"/usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins"	\
 		-translationdir	"/usr/share/qt3/translations"	\
 						\
 		-thread				\
@@ -216,6 +217,12 @@ clean::
 
 	cd examples/ && find . -name '.obj' | xargs rm -rf
 
+	# revert multi-arch path in install files
+	for a in debian/*install debian/*links; do \
+	    [ ! -f $$a.arch ] || \
+	    mv $$a.arch $$a; \
+	done
+
 	dh_clean
 
 install: build
@@ -226,8 +233,14 @@ install: build
 	dh_clean -i
 	dh_installdirs
 
+	# update multi-arch path in install files
+	for a in debian/*install debian/*links; do \
+	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+	done
+
 	# fix .prl files
-	for a in $(TMP_INSTALL)/usr/lib/*prl; do cat "$$a" | sed \
+	for a in $(TMP_INSTALL)/usr/lib/$(DEB_HOST_MULTIARCH)/*prl; do cat "$$a" | sed \
 	"s#$(QTDIR)#/usr/share/qt3#g" > "$$a".new && mv "$$a".new "$$a"; done
 
 	dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)