[SCM] Qt Mobility packaging branch, master, updated. debian/1.0.1-1-2-g36bc815

Fathi Boudra fabo at alioth.debian.org
Tue Jul 13 10:43:51 UTC 2010 

The following commit has been merged in the master branch:
commit 36bc815c5d6de50dc7c503ba8e4f9a4cdd48b998
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jul 13 13:43:02 2010 +0300

    Add libqtwebkit-dev build dependency.
    Add qtmobility-l10n package.
---
 debian/TODO.Debian                                 |    1 -
 debian/changelog                                   |    2 +
 debian/control                                     |   22 ++++++++++++++++++-
 .../patches/05_fix_translations_install_path.diff  |   14 ++++++++++++
 debian/patches/series                              |    1 +
 debian/qtmobility-l10n.install                     |   18 ++++++++++++++++
 6 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
deleted file mode 100644
index 428dd37..0000000
--- a/debian/TODO.Debian
+++ /dev/null
@@ -1 +0,0 @@
-* Fix multimedia module build.
diff --git a/debian/changelog b/debian/changelog
index 58d3905..6323c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtmobility (1.0.1-2) experimental; urgency=low
   * Update debian/control:
     - enable Qt Mobility MultimediaKit module.
     - build depends on Qt 4.7.0~beta2.
+    - add libqtwebkit-dev build dependency.
+  * Add qtmobility-l10n package.
 
  -- Fathi Boudra <fabo at debian.org>  Tue, 13 Jul 2010 09:40:30 +0300
 
diff --git a/debian/control b/debian/control
index f92e2db..0d74c06 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ 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), pkg-kde-tools (>= 0.6.4),
  libqt4-dev (>= 4:4.7.0~beta2), libqt4-opengl-dev (>= 4:4.7.0~beta2),
- libasound2-dev, libbluetooth-dev, libpulse-dev, libx11-dev,
- network-manager-dev, qmf-dev
+ libqtwebkit-dev (>= 1:2.0~week27), libasound2-dev, libbluetooth-dev,
+ libpulse-dev, libx11-dev, network-manager-dev, qmf-dev
 Standards-Version: 3.9.0
 Section: libs
 Homepage: http://labs.trolltech.com/page/Projects/QtMobility
@@ -35,6 +35,7 @@ Description: APIs for mobile device functionality - development files
 Package: libqtbearer1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Bearer Management module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -43,6 +44,7 @@ Description: Qt Mobility Bearer Management module
 Package: libqtcontacts1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Contacts module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -52,6 +54,7 @@ Description: Qt Mobility Contacts module
 Package: libqtlocation1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Location module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -61,6 +64,7 @@ Description: Qt Mobility Location module
 Package: libqtmessaging1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Messaging module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -70,6 +74,7 @@ Description: Qt Mobility Messaging module
 Package: libqtmultimediakit1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility MultimediaKit module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -79,6 +84,7 @@ Description: Qt Mobility MultimediaKit module
 Package: libqtpublishsubscribe1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Publish and Subscribe module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -89,6 +95,7 @@ Description: Qt Mobility Publish and Subscribe module
 Package: libqtsensors1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Sensors module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -97,6 +104,7 @@ Description: Qt Mobility Sensors module
 Package: libqtserviceframework1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Service Framework module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -106,6 +114,7 @@ Description: Qt Mobility Service Framework module
 Package: libqtsysteminfo1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility System Information module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -115,6 +124,7 @@ Description: Qt Mobility System Information module
 Package: libqtversit1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: qtmobility-l10n
 Description: Qt Mobility Versit module
  Qt Mobility delivers a set of new APIs for mobile device functionality.
  .
@@ -153,6 +163,14 @@ Description: Qt Mobility examples
  .
  This package contains Qt Mobility examples.
 
+Package: qtmobility-l10n
+Architecture: all
+Section: localizationn
+Description: APIs for mobile device functionality - localization files
+ Qt Mobility delivers a set of new APIs for mobile device functionality.
+ .
+ This package contains Qt Mobility translations.
+
 Package: qtmobility-dbg
 Priority: extra
 Architecture: any
diff --git a/debian/patches/05_fix_translations_install_path.diff b/debian/patches/05_fix_translations_install_path.diff
new file mode 100644
index 0000000..7f9bf39
--- /dev/null
+++ b/debian/patches/05_fix_translations_install_path.diff
@@ -0,0 +1,14 @@
+Description: install translations in /usr/share/qtmobility/translations/
+             instead of /usr/translations/
+Author: Fathi Boudra <fabo at debian.org>
+--- a/translations/translations.pro
++++ b/translations/translations.pro
+@@ -42,7 +42,7 @@ isEmpty(vcproj) {
+     QMAKE_EXTRA_COMPILERS += phony_src
+ }
+ 
+-translations.path = $${QT_MOBILITY_PREFIX}/translations
++translations.path = $${QT_MOBILITY_PREFIX}/share/qtmobility/translations
+ translations.files = $$TRANSLATIONS
+ translations.files ~= s,\\.ts$,.qm,g
+ translations.files ~= s,^,$$OUT_PWD/,g
diff --git a/debian/patches/series b/debian/patches/series
index ea69fc0..68cabf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 02_no_rpath.diff
 03_ftbfs_multimedia_plugin.diff
 04_ftbfs_multimedia_examples.diff
+05_fix_translations_install_path.diff
diff --git a/debian/qtmobility-l10n.install b/debian/qtmobility-l10n.install
new file mode 100644
index 0000000..7e8d1f2
--- /dev/null
+++ b/debian/qtmobility-l10n.install
@@ -0,0 +1,18 @@
+usr/share/qtmobility/translations/qtmobility_ar.qm
+usr/share/qtmobility/translations/qtmobility_cs.qm
+usr/share/qtmobility/translations/qtmobility_da.qm
+usr/share/qtmobility/translations/qtmobility_de.qm
+usr/share/qtmobility/translations/qtmobility_es.qm
+usr/share/qtmobility/translations/qtmobility_fr.qm
+usr/share/qtmobility/translations/qtmobility_he.qm
+usr/share/qtmobility/translations/qtmobility_hu.qm
+usr/share/qtmobility/translations/qtmobility_ja_JP.qm
+usr/share/qtmobility/translations/qtmobility_pl.qm
+usr/share/qtmobility/translations/qtmobility_pt.qm
+usr/share/qtmobility/translations/qtmobility_ru.qm
+usr/share/qtmobility/translations/qtmobility_sk.qm
+usr/share/qtmobility/translations/qtmobility_sl.qm
+usr/share/qtmobility/translations/qtmobility_sv.qm
+usr/share/qtmobility/translations/qtmobility_uk.qm
+usr/share/qtmobility/translations/qtmobility_zh_CN.qm
+usr/share/qtmobility/translations/qtmobility_zh_TW.qm

-- 
Qt Mobility packaging

More information about the pkg-kde-commits mailing list