[SCM] grantleetheme packaging branch, master, updated. debian/16.04.3-1-46-g81bb2e1

Maximiliano Curia maxy at moszumanska.debian.org
Mon Aug 21 09:51:33 UTC 2017


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

The following commit has been merged in the master branch:
commit bd55bd8c46b1a26eb9fcd2ee939cca7a1e77bb38
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:12:58 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 332da79..a903ec8 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/grantleetheme.git
 Package: libkf5grantleetheme5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5libkdepim5 (<= 4:16.04)
-Replaces: libkf5libkdepim5 (<= 4:16.04)
+Breaks: libkf5libkdepim5 (<= 4:16.04), ${kde-l10n:all}
+Replaces: libkf5libkdepim5 (<= 4:16.04), ${kde-l10n:all}
 Recommends: libkf5grantleetheme-plugins (= ${binary:Version})
 Description: KDE PIM grantlee theme support - library
  This library provides the grantlee theme support for KDE PIM.
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

-- 
grantleetheme packaging



More information about the pkg-kde-commits mailing list