DEB tqt3: Install libraries according to multi-arch rules

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 45 insertions, 2 deletions

diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control
index 3460db456..b70b95949 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/control
+++ b/ubuntu/maverick/dependencies/tqt3/debian/control
@@ -19,10 +19,11 @@ Homepage: http://www.trinitydesktop.org
 
 Package: libtqt3-mt
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt (<< 4:14.0.0~)
 Breaks: libtqt3-mt (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, fontconfig
+Depends: libtqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig
 Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
 Suggests: libtqt3-mt-psql, libtqt3-mt-mysql, libtqt3-mt-odbc
 Description: TQt GUI Library (Threaded runtime version), Version 3
@@ -30,8 +31,20 @@ Description: TQt GUI Library (Threaded runtime version), Version 3
  applications that link against the libtqt-mt.so.3, e.g. all Trinity
  applications.
 
+Package: libtqt3-mt-data
+Architecture: all
+Multi-Arch: foreign
+Section: libs
+Conflicts: libtqt3-mt (<< 4:14.1.0~)
+Depends: ${shlibs:Depends}
+Description: Data for TQt GUI Library (Threaded runtime version), Version 3
+ This is the Trolltech TQt library, version 3. It's necessary for
+ applications that link against the libtqt-mt.so.3, e.g. all Trinity
+ applications.
+
 Package: libtqt3-mt-mysql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-mysql (<< 4:14.0.0~)
 Breaks: libtqt3-mt-mysql (<< 4:14.0.0~)
@@ -42,6 +55,7 @@ Description: MySQL database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-odbc
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-odbc (<< 4:14.0.0~)
 Breaks: libtqt3-mt-odbc (<< 4:14.0.0~)
@@ -52,6 +66,7 @@ Description: ODBC database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-psql
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-psql (<< 4:14.0.0~)
 Breaks: libtqt3-mt-psql (<< 4:14.0.0~)
@@ -63,6 +78,7 @@ Description: PostgreSQL database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-ibase
 Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: InterBase/FireBird database driver for TQt3 (Threaded)
@@ -72,6 +88,7 @@ Description: InterBase/FireBird database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-sqlite
 Architecture: any
+Multi-Arch: same
 Section: libs
 Replaces: libtqt3-mt-sqlite (<< 4:14.0.0~)
 Breaks: libtqt3-mt-sqlite (<< 4:14.0.0~)
@@ -83,6 +100,7 @@ Description: SQLite database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-sqlite3
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends}
 Description: SQLite3 database driver for TQt3 (Threaded)
@@ -92,9 +110,11 @@ Description: SQLite3 database driver for TQt3 (Threaded)
 
 Package: libtqt3-mt-dev
 Architecture: any
+Multi-Arch: no
 Section: libdevel
 Replaces: libtqt3-mt-dev (<< 4:14.0.0~)
 Breaks: libtqt3-mt-dev (<< 4:14.0.0~)
+Conflicts: libtqt3-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),
@@ -122,6 +142,7 @@ Description: TQt development files (Threaded)
 
 Package: libtqt3-headers
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: libtqt3-headers (<< 4:14.0.0~)
 Breaks: libtqt3-headers (<< 4:14.0.0~)
@@ -133,6 +154,7 @@ Description:  TQt3 header files
 
 Package: libtqt3-compat-headers
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: libtqt3-compat-headers (<< 4:14.0.0~)
 Breaks: libtqt3-compat-headers (<< 4:14.0.0~)
@@ -149,6 +171,7 @@ Description: TQt 1.x and 2.x compatibility includes
 
 Package: tqt3-dev-tools
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools (<< 4:14.0.0~)
@@ -161,10 +184,11 @@ Description: TQt3 development tools
 
 Package: tqt3-designer
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-designer (<< 4:14.0.0~)
 Breaks: tqt3-designer (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
+Depends: tqt3-designer-plugins (= ${binary:Version}), ${shlibs:Depends}
 Recommends: tqt3-dev-tools
 Suggests: tqt3-assistant, tqt3-doc
 Description: TQt3 Designer
@@ -177,8 +201,18 @@ Description: TQt3 Designer
  automatically for the developer with a project management with qmake
  or automake.
 
+Package: tqt3-designer-plugins
+Architecture: any
+Multi-Arch: same
+Section: devel
+Conflicts: tqt3-designer (<< 4:14.1.0~)
+Depends: ${shlibs:Depends}
+Description: TQt3 Designer plugins
+ This package contains plugins for TQt3 Designer
+
 Package: tqt3-apps-dev
 Architecture: any
+Multi-Arch: no
 Section: devel
 Replaces: tqt3-apps-dev (<< 4:14.0.0~)
 Breaks: tqt3-apps-dev (<< 4:14.0.0~)
@@ -194,6 +228,7 @@ Description: TQt3 Developer applications development files
 
 Package: tqt3-linguist
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-linguist (<< 4:14.0.0~)
 Breaks: tqt3-linguist (<< 4:14.0.0~)
@@ -207,6 +242,7 @@ Description: The TQt3 Linguist
 
 Package: tqt3-assistant
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: tqt3-assistant (<< 4:14.0.0~)
 Breaks: tqt3-assistant (<< 4:14.0.0~)
@@ -225,6 +261,7 @@ Description: The TQt3 assistant application
 
 Package: tqt3-qtconfig
 Architecture: any
+Multi-Arch: foreign
 Section: x11
 Replaces: tqt3-qtconfig (<< 4:14.0.0~)
 Breaks: tqt3-qtconfig (<< 4:14.0.0~)
@@ -240,6 +277,7 @@ Description: The TQt3 Configuration Application
 
 Package: tqt3-dev-tools-embedded
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools-embedded (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools-embedded (<< 4:14.0.0~)
@@ -254,6 +292,7 @@ Description: Tools to develop embedded TQt applications
 
 Package: tqt3-dev-tools-compat
 Architecture: any
+Multi-Arch: foreign
 Section: devel
 Replaces: tqt3-dev-tools-compat (<< 4:14.0.0~)
 Breaks: tqt3-dev-tools-compat (<< 4:14.0.0~)
@@ -270,6 +309,7 @@ Description: Conversion utilities for TQt3 development
 
 Package: libtqt3-i18n
 Architecture: all
+Multi-Arch: foreign
 Section: libs
 Replaces: libtqt3-i18n (<< 4:14.0.0~)
 Breaks: libtqt3-i18n (<< 4:14.0.0~)
@@ -281,6 +321,7 @@ Description: i18n files for TQt3 library
 
 Package: tqt3-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: tqt3-doc (<< 4:14.0.0~)
 Breaks: tqt3-doc (<< 4:14.0.0~)
@@ -294,6 +335,7 @@ Description: TQt3 API documentation
 
 Package: tqt3-examples
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Replaces: tqt3-examples (<< 4:14.0.0~)
 Breaks: tqt3-examples (<< 4:14.0.0~)
@@ -308,6 +350,7 @@ Description:  Examples for TQt3
 Package: tqt-x11-free-dbg
 Section: libdevel
 Architecture: any
+Multi-Arch: no
 Replaces: tqt-x11-free-dbg (<< 4:14.0.0~)
 Breaks: tqt-x11-free-dbg (<< 4:14.0.0~)
 Priority: extra