[SCM] grantlee-editor packaging branch, master, updated. debian/16.04.3-1-78-gcfee869

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 2 16:33:13 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/grantlee-editor.git;a=commitdiff;h=28960df

The following commit has been merged in the master branch:
commit 28960dfc1844c9ff2b8f6567a3affec3b87bd11c
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 | 6 ++++--
 debian/rules   | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index c28a816..12063e4 100644
--- a/debian/control
+++ b/debian/control
@@ -92,11 +92,13 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kaddressbook (<< 4:15),
         kdepim-doc (<= 4:16.08.0+p16.04+git201609),
         kmail (<< 4:4.14.3),
-        libkf5libkdepim5 (<= 4:16.04)
+        libkf5libkdepim5 (<= 4:16.04),
+        ${kde-l10n:all}
 Replaces: kaddressbook (<< 4:15),
           kdepim-doc (<= 4:16.08.0+p16.04+git201609),
           kmail (<< 4:4.14.3),
-          libkf5libkdepim5 (<= 4:16.04)
+          libkf5libkdepim5 (<= 4:16.04),
+          ${kde-l10n:all}
 Suggests: kaddressbook, kmail
 Description: Theme Editors for KDE PIM applications
  KDE PIM Theme Editors allow you to create and edit various KDE themes for
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 88ce9b2..ce4c922
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
 KDEPIM_RUNTIME_VERSION = 4:15.07.90
 
 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
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 

-- 
grantlee-editor packaging



More information about the pkg-kde-commits mailing list