[SCM] akonadi-contacts packaging branch, master, updated. 780bbe030a31b3602d2206738d6a651bdf971916

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 2 16:25:20 UTC 2017


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

The following commit has been merged in the master branch:
commit c3d78d6afda49e777af64c58da123dff5e97c217
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Aug 22 16:45:06 2017 +0200

    Add breaks/replaces for kde-l10n-ast and kde-l10n-eo
    
    Not generated by kde-l10n:all
    
    Gbp-Dch: Ignore
---
 debian/control | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index fea030a..5105b79 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,6 @@ Build-Depends: cmake (>= 3.0~),
                libphonon4qt5-dev,
                libphonon4qt5experimental-dev,
                libqt5webchannel5-dev | libqt5webchannel-dev,
-               qtwebengine5-dev | libqt5webengine5-dev,
                libqt5webkit5-dev (>= 5.5.0~),
                libsasl2-dev,
                libxslt1-dev,
@@ -53,6 +52,7 @@ Build-Depends: cmake (>= 3.0~),
                pkg-kde-tools (>= 0.12),
                qtbase5-dev (>= 5.7.0~),
                qttools5-dev,
+               qtwebengine5-dev | libqt5webengine5-dev,
                shared-mime-info (>= 0.30),
                xsltproc,
 Standards-Version: 4.0.1
@@ -64,7 +64,9 @@ Package: akonadi-contacts-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kdepimlibs-data,
+Breaks: kde-l10n-ast (<< 4:17.03.90-0~),
+        kde-l10n-eo (<< 4:17.03.90-0~),
+        kdepimlibs-data,
         libakonadi-kf5 (<< 4:15.07.90+git20150819.1000),
         libkf5akonadicontact5 (<< 4:15.07.90+git20150819.1000),
         libkf5akonadimime5 (<< 4:15.07.90+git20150819.1000),
@@ -72,7 +74,9 @@ Breaks: kdepimlibs-data,
         libkf5akonadixml5 (<< 4:15.07.90+git20150819.1000),
         libkf5contacteditor-data,
         ${kde-l10n:all},
-Replaces: kdepimlibs-data,
+Replaces: kde-l10n-ast (<< 4:17.03.90-0~),
+          kde-l10n-eo (<< 4:17.03.90-0~),
+          kdepimlibs-data,
           libakonadi-kf5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadicontact5 (<< 4:15.07.90+git20150819.1000),
           libkf5akonadimime5 (<< 4:15.07.90+git20150819.1000),
@@ -124,6 +128,8 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: akonadi-contacts-data (<< 4:17.08~),
+        kde-l10n-ast (<< 4:17.03.90-0~),
+        kde-l10n-eo (<< 4:17.03.90-0~),
         kdepimlibs-data (<< 4:16.08~),
         libakonadi-kf5 (<< 4:16.04.3~),
         libkf5akonadicontact5 (<< 4:16.04.3~),
@@ -131,6 +137,8 @@ Breaks: akonadi-contacts-data (<< 4:17.08~),
         libkf5akonadixml5 (<< 4:16.04.3~),
         ${kde-l10n:all},
 Replaces: akonadi-contacts-data (<< 4:17.08~),
+          kde-l10n-ast (<< 4:17.03.90-0~),
+          kde-l10n-eo (<< 4:17.03.90-0~),
           kdepimlibs-data (<< 4:16.08~),
           libakonadi-kf5 (<< 4:16.04.3~),
           libkf5akonadicontact5 (<< 4:16.04.3~),

-- 
akonadi-contacts packaging



More information about the pkg-kde-commits mailing list