[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-31-gbe474c3
Fathi Boudra
fabo at alioth.debian.org
Tue Dec 27 16:43:29 UTC 2011
The following commit has been merged in the experimental branch:
commit b85d960f4a2f58abf620be937cb3afc53eabcfeb
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Dec 27 18:22:36 2011 +0200
Update debian/control: mark Qt libraries as Multi-Arch.
---
debian/changelog | 1 +
debian/control | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6fc3767..f12bf47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
* Add patches:
- qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
plugin path.
+ * Update debian/control: mark Qt libraries as Multi-Arch.
[ Pino Toscano ]
* Use the hurd-g++ mkspec when building on Hurd:
diff --git a/debian/control b/debian/control
index ca5cda4..99be2a3 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,8 @@ 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)
@@ -89,6 +91,8 @@ 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
@@ -125,6 +129,8 @@ 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)
@@ -137,6 +143,8 @@ 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)
@@ -152,6 +160,8 @@ 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)
@@ -163,6 +173,8 @@ 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
@@ -176,6 +188,8 @@ 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
@@ -191,6 +205,8 @@ 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
@@ -201,6 +217,8 @@ 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
@@ -211,6 +229,8 @@ 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
@@ -221,6 +241,8 @@ 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
@@ -231,6 +253,8 @@ 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
@@ -241,6 +265,8 @@ 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
@@ -251,6 +277,8 @@ 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
@@ -261,6 +289,8 @@ 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)
@@ -287,6 +317,8 @@ 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)
@@ -299,6 +331,8 @@ 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
@@ -308,6 +342,8 @@ 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)
@@ -324,6 +360,8 @@ 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)
@@ -339,6 +377,8 @@ 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)
@@ -352,6 +392,8 @@ 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
@@ -374,6 +416,8 @@ 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)
@@ -386,6 +430,8 @@ 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)
@@ -403,6 +449,8 @@ 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,
@@ -584,9 +632,9 @@ Description: Qt 4 script library debugging symbols
This package contains the debugging symbols for the Qt 4 Script library.
Package: libqt4-webkit-dbg
-Priority: extra
Architecture: any
Section: debug
+Priority: extra
Depends: libqtwebkit4-dbg (>= 2.0~), ${misc:Depends}
Description: transitional package for Qt 4 WebKit debugging symbols
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -746,6 +794,7 @@ 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)
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list