diff options
54 files changed, 297 insertions, 144 deletions
diff --git a/debian/lenny/dependencies/tqt3/debian/control b/debian/lenny/dependencies/tqt3/debian/control index 4e84ec2c8..abf1caf1e 100644 --- a/debian/lenny/dependencies/tqt3/debian/control +++ b/debian/lenny/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 diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-data.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-data.install new file mode 100644 index 000000000..b9308b1b4 --- /dev/null +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-data.install @@ -0,0 +1 @@ +../../debian/qtrc etc/tqt3/ diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.install index e846fb59e..a022db2cc 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -1,9 +1,9 @@ -usr/lib/libtqt-mt.la -usr/lib/libtqt-mt.prl -usr/lib/libtqt-mt.so -usr/lib/libtqui.prl -usr/lib/libtqui.so -usr/lib/pkgconfig/tqt-mt.pc +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so +usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqglcolormap.h usr/include/tqt3/ntqwidgetfactory.h diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.links b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.links index e382bae07..9da3a5e25 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.links +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-dev.links @@ -1,7 +1,11 @@ -/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la -/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so -/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl /usr/share/tqt3/lib/libtqui.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5 +/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins /usr/share/tqt3/plugins /usr/include/tqt3 /usr/share/tqt3/include -/usr/lib/tqt3/plugins /usr/share/tqt3/plugins diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-ibase.install index 37bbf0bb1..1cdae4fe4 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-ibase.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-ibase.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlibase.so diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-mysql.install index efdb699be..8f5572965 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-mysql.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-mysql.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlmysql.so diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-odbc.install index 3b949c134..d51b3fd7f 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-odbc.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-odbc.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlodbc.so diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-psql.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-psql.install index b93ebe333..a5e2b70cd 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-psql.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-psql.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlpsql.so diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite.install index 928632aa1..d637b096b 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite.so diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install index fccd1c31b..3f3392374 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlite3.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite3.so diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.install b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.install index 519221dff..33303e90c 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.install +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.install @@ -1,6 +1,4 @@ -usr/lib/libtqt-mt.so.* -usr/lib/libtqui.so.1.* -usr/lib/tqt3/plugins/imageformats/libqmng.so -usr/lib/tqt3/plugins/inputmethods/*.so -../../debian/qtrc etc/tqt3/ -../../debian/qt_plugins_3.3rc etc/tqt3/ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.* +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so diff --git a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.links b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.links index fee2958d8..8c8f30e38 100644 --- a/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.links +++ b/debian/lenny/dependencies/tqt3/debian/libtqt3-mt.links @@ -1,5 +1 @@ -/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1 -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0 -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3 -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1 diff --git a/debian/lenny/dependencies/tqt3/debian/qtrc b/debian/lenny/dependencies/tqt3/debian/qtrc index 3c977f4d1..4f44006ae 100644 --- a/debian/lenny/dependencies/tqt3/debian/qtrc +++ b/debian/lenny/dependencies/tqt3/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/debian/lenny/dependencies/tqt3/debian/rules b/debian/lenny/dependencies/tqt3/debian/rules index 27234fcd3..ac5e12b01 100755 --- a/debian/lenny/dependencies/tqt3/debian/rules +++ b/debian/lenny/dependencies/tqt3/debian/rules @@ -51,7 +51,8 @@ CONFIGURE_OPTS = \ -datadir "/usr/share/tqt3" \ -headerdir "/usr/include/tqt3" \ -docdir "/usr/share/tqt3/doc" \ - -plugindir "/usr/lib/tqt3/plugins" \ + -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \ + -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins" \ -translationdir "/usr/share/tqt3/translations" \ \ -thread \ @@ -220,6 +221,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 @@ -230,8 +237,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/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done dh_install $(IBASE) --sourcedir=$(TMP_INSTALL) diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install index 97e2de476..d60b07fc7 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ -usr/lib/libtqteditor.* -usr/lib/libtqtdesignercore.* -usr/lib/libtqassistantclient.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.* usr/include/tqt3/ntqassistantclient.h diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links index b62dc9759..72bd7093a 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ -/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl -/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a -/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl -/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a -/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl -/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer-plugins.install b/debian/lenny/dependencies/tqt3/debian/tqt3-designer-plugins.install new file mode 100644 index 000000000..13fed3016 --- /dev/null +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer-plugins.install @@ -0,0 +1 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/* diff --git a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install index 296634002..829c9a96e 100644 --- a/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install +++ b/debian/lenny/dependencies/tqt3/debian/tqt3-designer.install @@ -5,4 +5,3 @@ usr/share/tqt3/templates/* usr/share/tqt3/doc/html/designer*html usr/share/tqt3/doc/html/designer*dcf usr/share/tqt3/doc/html/designer*jpg -usr/lib/tqt3/plugins/designer/* diff --git a/debian/squeeze/dependencies/tqt3/debian/control b/debian/squeeze/dependencies/tqt3/debian/control index 3460db456..b70b95949 100644 --- a/debian/squeeze/dependencies/tqt3/debian/control +++ b/debian/squeeze/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 diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-data.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-data.install new file mode 100644 index 000000000..b9308b1b4 --- /dev/null +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-data.install @@ -0,0 +1 @@ +../../debian/qtrc etc/tqt3/ diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.install index e846fb59e..a022db2cc 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -1,9 +1,9 @@ -usr/lib/libtqt-mt.la -usr/lib/libtqt-mt.prl -usr/lib/libtqt-mt.so -usr/lib/libtqui.prl -usr/lib/libtqui.so -usr/lib/pkgconfig/tqt-mt.pc +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so +usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqglcolormap.h usr/include/tqt3/ntqwidgetfactory.h diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.links b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.links index e382bae07..9da3a5e25 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.links +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-dev.links @@ -1,7 +1,11 @@ -/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la -/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so -/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl /usr/share/tqt3/lib/libtqui.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5 +/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins /usr/share/tqt3/plugins /usr/include/tqt3 /usr/share/tqt3/include -/usr/lib/tqt3/plugins /usr/share/tqt3/plugins diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-ibase.install index 37bbf0bb1..1cdae4fe4 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-ibase.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-ibase.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlibase.so diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-mysql.install index efdb699be..8f5572965 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-mysql.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-mysql.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlmysql.so diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-odbc.install index 3b949c134..d51b3fd7f 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-odbc.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-odbc.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlodbc.so diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-psql.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-psql.install index b93ebe333..a5e2b70cd 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-psql.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-psql.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlpsql.so diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite.install index 928632aa1..d637b096b 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite.so diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install index fccd1c31b..3f3392374 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlite3.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite3.so diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.install b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.install index 519221dff..33303e90c 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.install +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.install @@ -1,6 +1,4 @@ -usr/lib/libtqt-mt.so.* -usr/lib/libtqui.so.1.* -usr/lib/tqt3/plugins/imageformats/libqmng.so -usr/lib/tqt3/plugins/inputmethods/*.so -../../debian/qtrc etc/tqt3/ -../../debian/qt_plugins_3.3rc etc/tqt3/ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.* +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so diff --git a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.links b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.links index fee2958d8..8c8f30e38 100644 --- a/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.links +++ b/debian/squeeze/dependencies/tqt3/debian/libtqt3-mt.links @@ -1,5 +1 @@ -/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1 -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0 -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3 -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1 diff --git a/debian/squeeze/dependencies/tqt3/debian/qtrc b/debian/squeeze/dependencies/tqt3/debian/qtrc index 3c977f4d1..4f44006ae 100644 --- a/debian/squeeze/dependencies/tqt3/debian/qtrc +++ b/debian/squeeze/dependencies/tqt3/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/debian/squeeze/dependencies/tqt3/debian/rules b/debian/squeeze/dependencies/tqt3/debian/rules index a2d5e0a8d..42f031168 100755 --- a/debian/squeeze/dependencies/tqt3/debian/rules +++ b/debian/squeeze/dependencies/tqt3/debian/rules @@ -51,7 +51,8 @@ CONFIGURE_OPTS = \ -datadir "/usr/share/tqt3" \ -headerdir "/usr/include/tqt3" \ -docdir "/usr/share/tqt3/doc" \ - -plugindir "/usr/lib/tqt3/plugins" \ + -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \ + -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins" \ -translationdir "/usr/share/tqt3/translations" \ \ -thread \ @@ -220,6 +221,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 @@ -230,8 +237,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/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done dh_install $(IBASE) --sourcedir=$(TMP_INSTALL) diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install index 97e2de476..d60b07fc7 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ -usr/lib/libtqteditor.* -usr/lib/libtqtdesignercore.* -usr/lib/libtqassistantclient.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.* usr/include/tqt3/ntqassistantclient.h diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links index b62dc9759..72bd7093a 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ -/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl -/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a -/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl -/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a -/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl -/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer-plugins.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer-plugins.install new file mode 100644 index 000000000..13fed3016 --- /dev/null +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer-plugins.install @@ -0,0 +1 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/* diff --git a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install index 296634002..829c9a96e 100644 --- a/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install +++ b/debian/squeeze/dependencies/tqt3/debian/tqt3-designer.install @@ -5,4 +5,3 @@ usr/share/tqt3/templates/* usr/share/tqt3/doc/html/designer*html usr/share/tqt3/doc/html/designer*dcf usr/share/tqt3/doc/html/designer*jpg -usr/lib/tqt3/plugins/designer/* 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 diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-data.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-data.install new file mode 100644 index 000000000..b9308b1b4 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-data.install @@ -0,0 +1 @@ +../../debian/qtrc etc/tqt3/ diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install index e846fb59e..a022db2cc 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -1,9 +1,9 @@ -usr/lib/libtqt-mt.la -usr/lib/libtqt-mt.prl -usr/lib/libtqt-mt.so -usr/lib/libtqui.prl -usr/lib/libtqui.so -usr/lib/pkgconfig/tqt-mt.pc +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so +usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/tqt-mt.pc usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqglcolormap.h usr/include/tqt3/ntqwidgetfactory.h diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links index e382bae07..9da3a5e25 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-dev.links @@ -1,7 +1,11 @@ -/usr/lib/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la -/usr/lib/libtqui.prl /usr/share/tqt3/lib/libtqui.prl -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so -/usr/lib/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.la /usr/share/tqt3/lib/libtqt-mt.la +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl /usr/share/tqt3/lib/libtqui.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.prl /usr/share/tqt3/lib/libtqt-mt.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5 +/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins /usr/share/tqt3/plugins /usr/include/tqt3 /usr/share/tqt3/include -/usr/lib/tqt3/plugins /usr/share/tqt3/plugins diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install index 37bbf0bb1..1cdae4fe4 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-ibase.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlibase.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlibase.so diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install index efdb699be..8f5572965 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-mysql.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlmysql.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlmysql.so diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install index 3b949c134..d51b3fd7f 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-odbc.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlodbc.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlodbc.so diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install index b93ebe333..a5e2b70cd 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-psql.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlpsql.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlpsql.so diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install index 928632aa1..d637b096b 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlite.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite.so diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install index fccd1c31b..3f3392374 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt-sqlite3.install @@ -1 +1 @@ -usr/lib/tqt3/plugins/sqldrivers/libqsqlite3.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/sqldrivers/libqsqlite3.so diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install index 519221dff..33303e90c 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.install @@ -1,6 +1,4 @@ -usr/lib/libtqt-mt.so.* -usr/lib/libtqui.so.1.* -usr/lib/tqt3/plugins/imageformats/libqmng.so -usr/lib/tqt3/plugins/inputmethods/*.so -../../debian/qtrc etc/tqt3/ -../../debian/qt_plugins_3.3rc etc/tqt3/ +usr/lib/$(DEB_HOST_MULTIARCH)/libtqt-mt.so.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.* +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/imageformats/libqmng.so +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/inputmethods/*.so diff --git a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links index fee2958d8..8c8f30e38 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/libtqt3-mt.links @@ -1,5 +1 @@ -/usr/lib/libtqui.so.1.0.0 /usr/lib/libtqui.so.1 -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1 -/usr/lib/libtqui.so.1.0.0 /usr/share/tqt3/lib/libtqui.so.1.0 -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3 -/usr/lib/libtqt-mt.so.3.5.0 /usr/share/tqt3/lib/libtqt-mt.so.3.5 +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so.1 diff --git a/ubuntu/maverick/dependencies/tqt3/debian/qtrc b/ubuntu/maverick/dependencies/tqt3/debian/qtrc index 3c977f4d1..4f44006ae 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/qtrc +++ b/ubuntu/maverick/dependencies/tqt3/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/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules index a2d5e0a8d..42f031168 100755 --- a/ubuntu/maverick/dependencies/tqt3/debian/rules +++ b/ubuntu/maverick/dependencies/tqt3/debian/rules @@ -51,7 +51,8 @@ CONFIGURE_OPTS = \ -datadir "/usr/share/tqt3" \ -headerdir "/usr/include/tqt3" \ -docdir "/usr/share/tqt3/doc" \ - -plugindir "/usr/lib/tqt3/plugins" \ + -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \ + -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins" \ -translationdir "/usr/share/tqt3/translations" \ \ -thread \ @@ -220,6 +221,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 @@ -230,8 +237,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/tqt3#g" > "$$a".new && mv "$$a".new "$$a"; done dh_install $(IBASE) --sourcedir=$(TMP_INSTALL) diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install index 97e2de476..d60b07fc7 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.install @@ -1,4 +1,4 @@ -usr/lib/libtqteditor.* -usr/lib/libtqtdesignercore.* -usr/lib/libtqassistantclient.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.* +usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.* usr/include/tqt3/ntqassistantclient.h diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links index b62dc9759..72bd7093a 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-apps-dev.links @@ -1,8 +1,8 @@ -/usr/lib/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl -/usr/lib/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a -/usr/lib/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl -/usr/lib/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a -/usr/lib/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl -/usr/lib/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.prl /usr/share/tqt3/lib/libtqteditor.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqteditor.a /usr/share/tqt3/lib/libtqteditor.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.prl /usr/share/tqt3/lib/libtqtdesignercore.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqtdesignercore.a /usr/share/tqt3/lib/libtqtdesignercore.a +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.prl /usr/share/tqt3/lib/libtqassistantclient.prl +/usr/lib/$(DEB_HOST_MULTIARCH)/libtqassistantclient.a /usr/share/tqt3/lib/libtqassistantclient.a /usr/include/tqt3 /usr/share/tqt3/tools/designer/editor /usr/include/tqt3 /usr/share/tqt3/tools/designer/interfaces diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer-plugins.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer-plugins.install new file mode 100644 index 000000000..13fed3016 --- /dev/null +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer-plugins.install @@ -0,0 +1 @@ +usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/designer/* diff --git a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install index 296634002..829c9a96e 100644 --- a/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install +++ b/ubuntu/maverick/dependencies/tqt3/debian/tqt3-designer.install @@ -5,4 +5,3 @@ usr/share/tqt3/templates/* usr/share/tqt3/doc/html/designer*html usr/share/tqt3/doc/html/designer*dcf usr/share/tqt3/doc/html/designer*jpg -usr/lib/tqt3/plugins/designer/* |