[SCM] kate packaging branch, master, updated. debian/16.08.3-1-73-g3861dab

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:03:04 UTC 2017


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

The following commit has been merged in the master branch:
commit 7d447ace87633893eca16cac787de58b3f5575d0
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 14:31:43 2017 +0200

    Mass conflict/break kde-l10n < 17.03.90 [part 2]
    
    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.
    
    This changes applies more accurate heuristics to cover more binary packages.
---
 debian/control | 4 ++--
 debian/rules   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 8950d95..93abbed 100644
--- a/debian/control
+++ b/debian/control
@@ -70,8 +70,8 @@ Description: powerful text editor
 Package: kate5-data
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: kate-data (<< 4:4.14.3-0ubuntu4)
-Breaks: kate-data (<< 4:4.14.3-0ubuntu4)
+Replaces: kate-data (<< 4:4.14.3-0ubuntu4), ${kde-l10n:all}
+Breaks: kate-data (<< 4:4.14.3-0ubuntu4), ${kde-l10n:all}
 Description: shared data files for Kate text editor
  This package contains the architecture-independent shared data files needed
  for Kate editor
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index a531a21..e013c81
--- 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
 libpkgs_addsubst_allLibraries = kate-dbg
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk

-- 
kate packaging



More information about the pkg-kde-commits mailing list