[SCM] kaccounts-integration packaging branch, master, updated. debian/16.08.3-1-45-ge431b6a

Maximiliano Curia maxy at moszumanska.debian.org
Tue Sep 12 14:06:18 UTC 2017


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

The following commit has been merged in the master branch:
commit f6c0f8923b798c3e6f045660c612aaed35839e7b
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:12:59 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 d7d916d..c19d5a9 100644
--- a/debian/control
+++ b/debian/control
@@ -81,6 +81,8 @@ Depends: libkaccounts1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: kaccounts-providers
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: System to administer web accounts
  Small system to administer web accounts for the sites and services
  across the Plasma desktop, including: Google, Facebook, Owncloud, IMAP,
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 2a33369..74d6842
--- 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_strip:
 	$(overridden_command) --dbgsym-migration='kaccounts-integration-dbg (<= 15.12.1-1~~)'

-- 
kaccounts-integration packaging



More information about the pkg-kde-commits mailing list