[SCM] kcalc packaging branch, master, updated. debian/16.08.3-1-30-g3af238a

Maximiliano Curia maxy at moszumanska.debian.org
Wed Oct 18 20:22:44 UTC 2017


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

The following commit has been merged in the master branch:
commit 7934d47c4ce8e22567bf1b5e6dc423026af3e57c
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:13:00 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 | 2 ++
 debian/rules   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/control b/debian/control
index afa9c9e..6beef42 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,8 @@ Package: kcalc
 Section: math
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: simple and scientific calculator
  KCalc is a scientific calculator.
  .
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

-- 
kcalc packaging



More information about the pkg-kde-commits mailing list