[SCM] Qt 4 packaging branch, master, updated. debian/4.8.4+dfsg-4-44-g12a2090

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Wed Jul 3 15:15:11 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=12a2090

The following commit has been merged in the master branch:
commit 12a2090fa48531f8a9dccf1a1781c4d10c57b21e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jul 3 12:14:50 2013 -0300

    Split out the translations from libqtcore4.
---
 debian/changelog            |    4 ++++
 debian/control              |   14 +++++++++++++-
 debian/libqtcore4.install   |   22 ----------------------
 debian/qtcore4-l10n.install |    1 +
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca8351c..390a274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,10 @@ qt4-x11 (4:4.8.5+dfsg-1) UNRELEASED; urgency=low
     - Override the warning of libqt4-phonon missing a symbol file, we are not
       tracking the provided lib.
   * Remove unused lintian override for libqtdbus4.
+  * Split libqtcore4's translations to qtcore4-l10n.
+    - Make qtcore4-l10n arch all.
+    - Add proper Break and Replaces to qtcore4-l10n against libqtcore4.
+    - Split the install files.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Jun 2013 11:08:53 -0300
 
diff --git a/debian/control b/debian/control
index 3e51261..269cc81 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,7 @@ Package: libqtcore4
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qtcore4-l10n, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libthai0, libicu48
 Description: Qt 4 core module
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -75,6 +75,18 @@ Description: Qt 4 core module
  .
  The QtCore module contains core non-GUI functionality.
 
+Package: qtcore4-l10n
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}
+Breaks: libqtcore4 (<< 4:4.8.5+dfsg-1~)
+Replaces: libqtcore4 (<< 4:4.8.5+dfsg-1~)
+Description: Qt 4 core module translations
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The QtCore module contains the translations of the core non-GUI functionality.
+
 Package: libqt4-core
 Architecture: any
 Section: oldlibs
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index c234bd7..50bc42f 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -4,26 +4,4 @@ usr/lib/*/qt-default/qtchooser/default.conf
 usr/lib/*/qt4/plugins/codecs/*.so
 usr/lib/*/qtchooser/4.conf
 usr/lib/*/qtchooser/qt4.conf
-usr/share/qt4/translations/qt_ar.qm
-usr/share/qt4/translations/qt_cs.qm
-usr/share/qt4/translations/qt_da.qm
-usr/share/qt4/translations/qt_de.qm
-usr/share/qt4/translations/qt_es.qm
-usr/share/qt4/translations/qt_fa.qm
-usr/share/qt4/translations/qt_fr.qm
-usr/share/qt4/translations/qt_gl.qm
-usr/share/qt4/translations/qt_he.qm
-usr/share/qt4/translations/qt_hu.qm
-usr/share/qt4/translations/qt_ja.qm
-usr/share/qt4/translations/qt_ko.qm
-usr/share/qt4/translations/qt_lt.qm
-usr/share/qt4/translations/qt_pl.qm
-usr/share/qt4/translations/qt_pt.qm
-usr/share/qt4/translations/qt_ru.qm
-usr/share/qt4/translations/qt_sk.qm
-usr/share/qt4/translations/qt_sl.qm
-usr/share/qt4/translations/qt_sv.qm
-usr/share/qt4/translations/qt_uk.qm
-usr/share/qt4/translations/qt_zh_CN.qm
-usr/share/qt4/translations/qt_zh_TW.qm
 usr/share/qtchooser/qt4-*.conf
diff --git a/debian/qtcore4-l10n.install b/debian/qtcore4-l10n.install
new file mode 100644
index 0000000..8764bc6
--- /dev/null
+++ b/debian/qtcore4-l10n.install
@@ -0,0 +1 @@
+usr/share/qt4/translations/

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list