[SCM] kontact packaging branch, master, updated. debian/16.04.3-1-75-g637d371

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 2 16:54:55 UTC 2017


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

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

diff --git a/debian/control b/debian/control
index d8ba535..2cdca13 100644
--- a/debian/control
+++ b/debian/control
@@ -86,8 +86,12 @@ Architecture: any
 Depends: kdepim-runtime, libqt5webengine5, ${misc:Depends}, ${shlibs:Depends}
 Recommends: accountwizard, akregator, kaddressbook, kmail, knotes, korganizer
 Suggests: gnokii
-Breaks: kdepim-doc (<= 4:16.12.0), libkf5messageviewer5 (<= 4:16.04)
-Replaces: kdepim-doc (<= 4:16.12.0), libkf5messageviewer5 (<= 4:16.04)
+Breaks: kdepim-doc (<= 4:16.12.0),
+        libkf5messageviewer5 (<= 4:16.04),
+        ${kde-l10n:all}
+Replaces: kdepim-doc (<= 4:16.12.0),
+          libkf5messageviewer5 (<= 4:16.04),
+          ${kde-l10n:all}
 Homepage: http://kontact.kde.org/
 Description: integrated application for personal information management
  Kontact is the integrated solution to your personal information management
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 4e6d698..0353058
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
 KDEPIM_RUNTIME_VERSION = 4:15.07.90
 
 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_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 

-- 
kontact packaging



More information about the pkg-kde-commits mailing list