[SCM] analitza packaging branch, master, updated. debian/16.08.3-1-35-g2febac2

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:06:07 UTC 2017


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

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

diff --git a/debian/control b/debian/control
index b561cac..dfe5781 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,11 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/analitza.git
 Package: analitza-common
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: libanalitzaplot4 (<< 4:4.12.90), libanalitzaplot5 (<< 4:4.12.90)
+Replaces: libanalitzaplot4 (<< 4:4.12.90),
+          libanalitzaplot5 (<< 4:4.12.90),
+          ${kde-l10n:all}
 Conflicts: libanalitzaplot4 (<< 4:4.12.90), libanalitzaplot5 (<< 4:4.12.90)
+Breaks: ${kde-l10n:all}
 Description: common files for Analitza
  Analitza is a library to parse and work with mathematical expressions. This
  library is being used by KAlgebra and Cantor and may be used in other
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 6681735..0e5ea97
--- 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

-- 
analitza packaging



More information about the pkg-kde-commits mailing list