[SCM] kcron packaging branch, master, updated. debian/16.08.0-1-42-gad4e85b

Maximiliano Curia maxy at moszumanska.debian.org
Tue Oct 31 18:03:03 UTC 2017


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

The following commit has been merged in the master branch:
commit 030f2f5d8f8763e2a98e28903c8f285f5d20f52a
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:01 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 60be4df..9cacc06 100644
--- a/debian/control
+++ b/debian/control
@@ -39,8 +39,8 @@ Section: admin
 Architecture: any
 Depends: cron | anacron, ${misc:Depends}, ${shlibs:Depends}
 Suggests: khelpcenter
-Breaks: kcron (<< 4:4.4)
-Replaces: kcron (<< 4:4.4)
+Breaks: kcron (<< 4:4.4), ${kde-l10n:all}
+Replaces: kcron (<< 4:4.4), ${kde-l10n:all}
 Description: program scheduler frontend
  kde-config-cron is a KDE configuration module for scheduling programs to run
  at specific intervals using cron, the UNIX scheduling service.
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index b57f3e9..a196c56
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/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

-- 
kcron packaging



More information about the pkg-kde-commits mailing list