[SCM] pimcommon packaging branch, master, updated. debian/16.04.2-2-65-gd1a1ec0

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/pimcommon.git;a=commitdiff;h=963d7ef

The following commit has been merged in the master branch:
commit 963d7ef465b7f154b4b6c71502fb1a276cab66ea
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:12 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 a12b756..b3e8623 100644
--- a/debian/control
+++ b/debian/control
@@ -63,8 +63,8 @@ Package: libkf5pimcommon-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: storageservicemanager (<= 4:16.04)
-Replaces: storageservicemanager (<= 4:16.04)
+Breaks: storageservicemanager (<= 4:16.04), ${kde-l10n:all}
+Replaces: storageservicemanager (<= 4:16.04), ${kde-l10n:all}
 Description: Common library for KDE PIM - data files
  This library provides the common parts used across different KDE PIM
  components.
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

-- 
pimcommon packaging