[SCM] Qt Mobility packaging branch, master, updated. debian/1.2.0-1-3-g74c2783

Fathi Boudra fabo at alioth.debian.org
Fri Sep 23 08:24:39 UTC 2011 

The following commit has been merged in the master branch:
commit 74c2783868fdfa1220ac476ba3df5faf1b18bd4c
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Sep 23 11:23:37 2011 +0300

    Convert the package to multiarch:
     - bump build dependency on debhelper >= 8.1.3~.
     - bump build dependency on libqt4-dev and libqt4-opengl-dev >= 4:4.7.4~.
     - add Multi-Arch: same and Pre-Depends: ${misc:Pre-Depends} fields to shared libraries packages.
     - update installed files to multiarch paths.
     - add support for DEB_HOST_MULTIARCH, needed for libdir and plugindir.
---
 debian/changelog                      |   11 ++++++-
 debian/control                        |   34 ++++++++++++++++++--
 debian/libqtconnectivity1.install     |    2 +-
 debian/libqtcontacts1.install         |    4 +-
 debian/libqtfeedback1.install         |    4 +-
 debian/libqtgallery1.install          |    2 +-
 debian/libqtlocation1.install         |    6 ++--
 debian/libqtmessaging1.install        |    2 +-
 debian/libqtmultimediakit1.install    |   10 +++---
 debian/libqtorganizer1.install        |    2 +-
 debian/libqtpublishsubscribe1.install |    2 +-
 debian/libqtsensors1.install          |    4 +-
 debian/libqtserviceframework1.install |    2 +-
 debian/libqtsysteminfo1.install       |    2 +-
 debian/libqtversit1.install           |    6 ++--
 debian/libqtversitorganizer1.install  |    2 +-
 debian/qtmobility-dev.install         |   56 ++++++++++++++++----------------
 debian/qtmobility-examples.install    |   12 +++---
 debian/rules                          |    6 ++-
 19 files changed, 104 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d7ff28..88f4294 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,16 @@ qtmobility (1.2.0-2) UNRELEASED; urgency=low
   * Use wildcard architectures:
     - !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 -> linux-any
 
- -- Fathi Boudra <fabo at debian.org>  Tue, 21 Jun 2011 12:47:36 +0200
+  [ Fathi Boudra ]
+  * Convert the package to multiarch:
+    - bump build dependency on debhelper >= 8.1.3~.
+    - bump build dependency on libqt4-dev and libqt4-opengl-dev >= 4:4.7.4~.
+    - add Multi-Arch: same and Pre-Depends: ${misc:Pre-Depends} fields to
+      shared libraries packages.
+    - update installed files to multiarch paths.
+    - add support for DEB_HOST_MULTIARCH, needed for libdir and plugindir.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 23 Sep 2011 09:29:49 +0300
 
 qtmobility (1.2.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 34e1972..b058821 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: qtmobility
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 7.4.15),
+Build-Depends: debhelper (>= 8.1.3~),
                libasound2-dev [linux-any],
                libblkid-dev,
                libbluetooth-dev [linux-any],
                libgstreamer-plugins-base0.10-dev,
                libpulse-dev,
-               libqt4-dev (>= 4:4.7.0~rc1),
-               libqt4-opengl-dev (>= 4:4.7.0~rc1),
+               libqt4-dev (>= 4:4.7.4~),
+               libqt4-opengl-dev (>= 4:4.7.4~),
                libudev-dev [linux-any],
                libx11-dev,
                libxext-dev,
@@ -53,6 +53,8 @@ Description: APIs for mobile device functionality - development files
 
 Package: libqtconnectivity1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Connectivity module
@@ -63,6 +65,8 @@ Description: Qt Mobility Connectivity module
 
 Package: libqtcontacts1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Contacts module
@@ -73,6 +77,8 @@ Description: Qt Mobility Contacts module
 
 Package: libqtfeedback1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Feedback module
@@ -83,6 +89,8 @@ Description: Qt Mobility Feedback module
 
 Package: libqtgallery1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Document Gallery module
@@ -93,6 +101,8 @@ Description: Qt Mobility Document Gallery module
 
 Package: libqtlocation1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Location module
@@ -103,6 +113,8 @@ Description: Qt Mobility Location module
 
 Package: libqtmessaging1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Messaging module
@@ -113,6 +125,8 @@ Description: Qt Mobility Messaging module
 
 Package: libqtmultimediakit1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility MultimediaKit module
@@ -123,6 +137,8 @@ Description: Qt Mobility MultimediaKit module
 
 Package: libqtorganizer1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Organizer module
@@ -135,6 +151,8 @@ Description: Qt Mobility Organizer module
 
 Package: libqtpublishsubscribe1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Publish and Subscribe module
@@ -146,6 +164,8 @@ Description: Qt Mobility Publish and Subscribe module
 
 Package: libqtsensors1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libqt4-sql-sqlite, ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Sensors module
@@ -155,6 +175,8 @@ Description: Qt Mobility Sensors module
 
 Package: libqtserviceframework1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: hal, qtmobility-l10n
 Description: Qt Mobility Service Framework module
@@ -165,6 +187,8 @@ Description: Qt Mobility Service Framework module
 
 Package: libqtsysteminfo1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility System Information module
@@ -175,6 +199,8 @@ Description: Qt Mobility System Information module
 
 Package: libqtversit1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Versit (vCard) module
@@ -184,6 +210,8 @@ Description: Qt Mobility Versit (vCard) module
 
 Package: libqtversitorganizer1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qtmobility-l10n
 Description: Qt Mobility Versit (Organizer) module
diff --git a/debian/libqtconnectivity1.install b/debian/libqtconnectivity1.install
index ae39d21..6bb535d 100644
--- a/debian/libqtconnectivity1.install
+++ b/debian/libqtconnectivity1.install
@@ -1 +1 @@
-usr/lib/libQtConnectivity.so.*
+usr/lib/*/libQtConnectivity.so.*
diff --git a/debian/libqtcontacts1.install b/debian/libqtcontacts1.install
index 919c6a2..109c425 100644
--- a/debian/libqtcontacts1.install
+++ b/debian/libqtcontacts1.install
@@ -1,2 +1,2 @@
-usr/lib/libQtContacts.so.*
-usr/lib/qt4/plugins/contacts/libqtcontacts_serviceactionmanager.so
+usr/lib/*/libQtContacts.so.*
+usr/lib/*/qt4/plugins/contacts/libqtcontacts_serviceactionmanager.so
diff --git a/debian/libqtfeedback1.install b/debian/libqtfeedback1.install
index 6e1368b..bbb9b1f 100644
--- a/debian/libqtfeedback1.install
+++ b/debian/libqtfeedback1.install
@@ -1,2 +1,2 @@
-usr/lib/libQtFeedback.so.*
-usr/lib/qt4/plugins/feedback/libqtfeedback_mmk.so
+usr/lib/*/libQtFeedback.so.*
+usr/lib/*/qt4/plugins/feedback/libqtfeedback_mmk.so
diff --git a/debian/libqtgallery1.install b/debian/libqtgallery1.install
index 091f377..ac91d09 100644
--- a/debian/libqtgallery1.install
+++ b/debian/libqtgallery1.install
@@ -1 +1 @@
-usr/lib/libQtGallery.so.*
+usr/lib/*/libQtGallery.so.*
diff --git a/debian/libqtlocation1.install b/debian/libqtlocation1.install
index c1460ac..1977c23 100644
--- a/debian/libqtlocation1.install
+++ b/debian/libqtlocation1.install
@@ -1,3 +1,3 @@
-usr/lib/libQtLocation.so.*
-usr/lib/qt4/plugins/geoservices/libqtgeoservices_nokia.so
-usr/lib/qt4/plugins/landmarks/libqtlandmarks_sqlite.so
+usr/lib/*/libQtLocation.so.*
+usr/lib/*/qt4/plugins/geoservices/libqtgeoservices_nokia.so
+usr/lib/*/qt4/plugins/landmarks/libqtlandmarks_sqlite.so
diff --git a/debian/libqtmessaging1.install b/debian/libqtmessaging1.install
index 25d636d..267f9fe 100644
--- a/debian/libqtmessaging1.install
+++ b/debian/libqtmessaging1.install
@@ -1 +1 @@
-usr/lib/libQtMessaging.so.*
+usr/lib/*/libQtMessaging.so.*
diff --git a/debian/libqtmultimediakit1.install b/debian/libqtmultimediakit1.install
index 20d4ea5..089696d 100644
--- a/debian/libqtmultimediakit1.install
+++ b/debian/libqtmultimediakit1.install
@@ -1,5 +1,5 @@
-usr/lib/libQtMultimediaKit.so.*
-usr/lib/qt4/plugins/audio/libqtmedia_pulse.so
-usr/lib/qt4/plugins/mediaservice/libqgstengine.so
-usr/lib/qt4/plugins/mediaservice/libqtmedia_v4lengine.so
-usr/lib/qt4/plugins/playlistformats/libqtmultimediakit_m3u.so
+usr/lib/*/libQtMultimediaKit.so.*
+usr/lib/*/qt4/plugins/audio/libqtmedia_pulse.so
+usr/lib/*/qt4/plugins/mediaservice/libqgstengine.so
+usr/lib/*/qt4/plugins/mediaservice/libqtmedia_v4lengine.so
+usr/lib/*/qt4/plugins/playlistformats/libqtmultimediakit_m3u.so
diff --git a/debian/libqtorganizer1.install b/debian/libqtorganizer1.install
index c4f6a31..4e8cd6e 100644
--- a/debian/libqtorganizer1.install
+++ b/debian/libqtorganizer1.install
@@ -1 +1 @@
-usr/lib/libQtOrganizer.so.*
+usr/lib/*/libQtOrganizer.so.*
diff --git a/debian/libqtpublishsubscribe1.install b/debian/libqtpublishsubscribe1.install
index 665017f..8d5990c 100644
--- a/debian/libqtpublishsubscribe1.install
+++ b/debian/libqtpublishsubscribe1.install
@@ -1 +1 @@
-usr/lib/libQtPublishSubscribe.so.*
+usr/lib/*/libQtPublishSubscribe.so.*
diff --git a/debian/libqtsensors1.install b/debian/libqtsensors1.install
index 21de6de..a663acc 100644
--- a/debian/libqtsensors1.install
+++ b/debian/libqtsensors1.install
@@ -1,2 +1,2 @@
-usr/lib/libQtSensors.so.*
-usr/lib/qt4/plugins/sensors/libqtsensors_generic.so
+usr/lib/*/libQtSensors.so.*
+usr/lib/*/qt4/plugins/sensors/libqtsensors_generic.so
diff --git a/debian/libqtserviceframework1.install b/debian/libqtserviceframework1.install
index 2415df2..f323189 100644
--- a/debian/libqtserviceframework1.install
+++ b/debian/libqtserviceframework1.install
@@ -1 +1 @@
-usr/lib/libQtServiceFramework.so.*
+usr/lib/*/libQtServiceFramework.so.*
diff --git a/debian/libqtsysteminfo1.install b/debian/libqtsysteminfo1.install
index 13b24b9..34447f9 100644
--- a/debian/libqtsysteminfo1.install
+++ b/debian/libqtsysteminfo1.install
@@ -1 +1 @@
-usr/lib/libQtSystemInfo.so.*
+usr/lib/*/libQtSystemInfo.so.*
diff --git a/debian/libqtversit1.install b/debian/libqtversit1.install
index 6fdcd9f..2aeba42 100644
--- a/debian/libqtversit1.install
+++ b/debian/libqtversit1.install
@@ -1,3 +1,3 @@
-usr/lib/libQtVersit.so.*
-usr/lib/qt4/plugins/versit/libqtversit_backuphandler.so
-usr/lib/qt4/plugins/versit/libqtversit_vcardpreserver.so
+usr/lib/*/libQtVersit.so.*
+usr/lib/*/qt4/plugins/versit/libqtversit_backuphandler.so
+usr/lib/*/qt4/plugins/versit/libqtversit_vcardpreserver.so
diff --git a/debian/libqtversitorganizer1.install b/debian/libqtversitorganizer1.install
index 2b68966..1910737 100644
--- a/debian/libqtversitorganizer1.install
+++ b/debian/libqtversitorganizer1.install
@@ -1 +1 @@
-usr/lib/libQtVersitOrganizer.so.*
+usr/lib/*/libQtVersitOrganizer.so.*
diff --git a/debian/qtmobility-dev.install b/debian/qtmobility-dev.install
index 19af027..20ed459 100644
--- a/debian/qtmobility-dev.install
+++ b/debian/qtmobility-dev.install
@@ -456,33 +456,33 @@ usr/include/QtVersitOrganizer/QVersitOrganizerHandlerFactory
 usr/include/QtVersitOrganizer/QVersitOrganizerImporter
 usr/include/QtVersitOrganizer/QVersitOrganizerImporterPropertyHandler
 usr/include/QtVersitOrganizer/QVersitTimeZoneHandler
-usr/lib/libQtConnectivity.prl
-usr/lib/libQtConnectivity.so
-usr/lib/libQtContacts.prl
-usr/lib/libQtContacts.so
-usr/lib/libQtFeedback.prl
-usr/lib/libQtFeedback.so
-usr/lib/libQtGallery.prl
-usr/lib/libQtGallery.so
-usr/lib/libQtLocation.prl
-usr/lib/libQtLocation.so
-usr/lib/libQtMessaging.prl
-usr/lib/libQtMessaging.so
-usr/lib/libQtMultimediaKit.prl
-usr/lib/libQtMultimediaKit.so
-usr/lib/libQtOrganizer.prl
-usr/lib/libQtOrganizer.so
-usr/lib/libQtPublishSubscribe.prl
-usr/lib/libQtPublishSubscribe.so
-usr/lib/libQtSensors.prl
-usr/lib/libQtSensors.so
-usr/lib/libQtServiceFramework.prl
-usr/lib/libQtServiceFramework.so
-usr/lib/libQtSystemInfo.prl
-usr/lib/libQtSystemInfo.so
-usr/lib/libQtVersit.prl
-usr/lib/libQtVersit.so
-usr/lib/libQtVersitOrganizer.prl
-usr/lib/libQtVersitOrganizer.so
+usr/lib/*/libQtConnectivity.prl
+usr/lib/*/libQtConnectivity.so
+usr/lib/*/libQtContacts.prl
+usr/lib/*/libQtContacts.so
+usr/lib/*/libQtFeedback.prl
+usr/lib/*/libQtFeedback.so
+usr/lib/*/libQtGallery.prl
+usr/lib/*/libQtGallery.so
+usr/lib/*/libQtLocation.prl
+usr/lib/*/libQtLocation.so
+usr/lib/*/libQtMessaging.prl
+usr/lib/*/libQtMessaging.so
+usr/lib/*/libQtMultimediaKit.prl
+usr/lib/*/libQtMultimediaKit.so
+usr/lib/*/libQtOrganizer.prl
+usr/lib/*/libQtOrganizer.so
+usr/lib/*/libQtPublishSubscribe.prl
+usr/lib/*/libQtPublishSubscribe.so
+usr/lib/*/libQtSensors.prl
+usr/lib/*/libQtSensors.so
+usr/lib/*/libQtServiceFramework.prl
+usr/lib/*/libQtServiceFramework.so
+usr/lib/*/libQtSystemInfo.prl
+usr/lib/*/libQtSystemInfo.so
+usr/lib/*/libQtVersit.prl
+usr/lib/*/libQtVersit.so
+usr/lib/*/libQtVersitOrganizer.prl
+usr/lib/*/libQtVersitOrganizer.so
 usr/share/qt4/mkspecs/features/mobility.prf
 usr/share/qt4/mkspecs/features/mobilityconfig.prf
diff --git a/debian/qtmobility-examples.install b/debian/qtmobility-examples.install
index 2405ceb..f98fe43 100644
--- a/debian/qtmobility-examples.install
+++ b/debian/qtmobility-examples.install
@@ -1,8 +1,8 @@
-usr/lib/qt4/plugins/sensors/libqtsensors_grueplugin.so
-usr/lib/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
-usr/lib/qt4/plugins/serviceframework/libserviceframework_filemanagerplugin.so
-usr/lib/qt4/plugins/serviceframework/libserviceframework_landlinedialerservice.so
-usr/lib/qt4/plugins/serviceframework/libserviceframework_notesmanagerplugin.so
-usr/lib/qt4/plugins/serviceframework/libserviceframework_voipdialerservice.so
+usr/lib/*/qt4/plugins/sensors/libqtsensors_grueplugin.so
+usr/lib/*/qt4/plugins/serviceframework/libserviceframework_bluetoothtransferplugin.so
+usr/lib/*/qt4/plugins/serviceframework/libserviceframework_filemanagerplugin.so
+usr/lib/*/qt4/plugins/serviceframework/libserviceframework_landlinedialerservice.so
+usr/lib/*/qt4/plugins/serviceframework/libserviceframework_notesmanagerplugin.so
+usr/lib/*/qt4/plugins/serviceframework/libserviceframework_voipdialerservice.so
 usr/lib/qtmobility/demos/
 usr/lib/qtmobility/examples/
diff --git a/debian/rules b/debian/rules
index f64056f..2b0f05b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # QMF environment variables should be set
 export QMF_INCLUDEDIR := /usr/include/qmfclient
 export QMF_LIBDIR := /usr/lib
@@ -14,9 +16,9 @@ override_dh_auto_configure:
 	./configure \
 	    -prefix "/usr" \
 	    -headerdir "/usr/include" \
-	    -libdir "/usr/lib" \
+	    -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	    -bindir "/usr/bin" \
-	    -plugindir "/usr/lib/qt4/plugins" \
+	    -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/plugins" \
 	    -demosdir "/usr/lib/qtmobility/demos" \
 	    -examplesdir "/usr/lib/qtmobility/examples" \
 	    -languages "ar cs da de es fr he hu ja pl pt ru sk sl sv zh_CN zh_TW" \

-- 
Qt Mobility packaging

More information about the pkg-kde-commits mailing list