[SCM] kdepim-apps-libs packaging branch, master, updated. debian/16.04.2-2-69-gea7a9c2

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 2 16:43:34 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdepim-apps-libs.git;a=commitdiff;h=0e3f852

The following commit has been merged in the master branch:
commit 0e3f852fbe7e6ece1e3e730d41b8c4913777944f
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:02 2017 +0200

    Mass conflict/break kde-l10n < 17.03.90
    
    In Applications 17.03.90 for all KF5 based applications the translations moved
    from the separate kde-l10n-$lang packages to the respective application tarball.
    
    To aid in a smooth transition we mass confict unsuitably old versions using
    the l10n-packages.mk's ${kde-l10n:all} substvar.
    
    This change was done by a bot trying to only introduce a relationship iff
    a binary package actually contains locales.
---
 debian/control | 4 ++--
 debian/rules   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index b522512..d71c20f 100644
--- a/debian/control
+++ b/debian/control
@@ -42,8 +42,8 @@ Package: kf5-kdepim-apps-libs-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: libkf5composereditorng5 (<= 4:16.04)
-Replaces: libkf5composereditorng5 (<= 4:16.04)
+Breaks: libkf5composereditorng5 (<= 4:16.04), ${kde-l10n:all}
+Replaces: libkf5composereditorng5 (<= 4:16.04), ${kde-l10n:all}
 Description: KDE PIM mail related libraries, data files
  This package is part of the KDE PIM module.
 
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 9ca54cc..30b95d6
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
kdepim-apps-libs packaging



More information about the pkg-kde-commits mailing list