[SCM] libkdepim packaging branch, master, updated. debian/16.04.2-3-68-geef233e

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 2 16:58:57 UTC 2017


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

The following commit has been merged in the master branch:
commit f80920af5d3eb925e0004fb8b9e9957a5ce6ec91
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:10 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 | 8 ++++++--
 debian/rules   | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index a5f09cb..24fb3fb 100644
--- a/debian/control
+++ b/debian/control
@@ -57,8 +57,12 @@ Package: libkf5libkdepim-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: kaddressbook (<< 4:16.04), libkf5libkdepim5 (<< 4:16.04)
-Replaces: kaddressbook (<< 4:16.04), libkf5libkdepim5 (<< 4:16.04)
+Breaks: kaddressbook (<< 4:16.04),
+        libkf5libkdepim5 (<< 4:16.04),
+        ${kde-l10n:all}
+Replaces: kaddressbook (<< 4:16.04),
+          libkf5libkdepim5 (<< 4:16.04),
+          ${kde-l10n:all}
 Description: KDE PIM library - data files
  This is the internal runtime package for applications from the KDE PIM module.
  It contains data files used by the library.
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

-- 
libkdepim packaging



More information about the pkg-kde-commits mailing list