[SCM] kde-dev-scripts packaging branch, master, updated. debian/16.08.0-1-45-g092e4a4

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


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-dev-scripts.git;a=commitdiff;h=5b15dc5

The following commit has been merged in the master branch:
commit 5b15dc5b7f19a7146821dda5cf3cc474673b5c13
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 c0ee366..51f5a38 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,8 @@ Suggests: cvs,
           valgrind,
           xsltproc
 Enhances: kate
-Breaks: pkg-kde-tools (<< 0.15.12ubuntu1~)
-Replaces: pkg-kde-tools (<< 0.15.12ubuntu1~)
+Breaks: pkg-kde-tools (<< 0.15.12ubuntu1~), ${kde-l10n:all}
+Replaces: pkg-kde-tools (<< 0.15.12ubuntu1~), ${kde-l10n:all}
 Description: scripts and data files for development
  This package contains scripts and data files to facilitate development of
  KDE software.  Also included are scripts which are not specific to
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index b2c9560..66b5523
--- 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_install:
 	$(overridden_command)

-- 
kde-dev-scripts packaging



More information about the pkg-kde-commits mailing list