[SCM] kde-dev-utils packaging branch, master, updated. debian/16.08.0-1-26-g5fc6d38

Maximiliano Curia maxy at moszumanska.debian.org
Tue Oct 31 18:03:51 UTC 2017


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

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

diff --git a/debian/control b/debian/control
index 08f09f3..4c46914 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,8 @@ Package: kpartloader
 Architecture: any
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: test tool for KParts
  KPartloader is a very simple application to test loading of a KPart.
  KPartloader is called with a simple argument to tell which KPart to load.
@@ -45,6 +47,8 @@ Architecture: any
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: qt5-designer
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: viewer for Qt Designer user interface files
  KUIViewer is a utility to display and check user interface (.ui) files
  created in Qt Designer.  The interfaces can be shown in a variety of
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index b57f3e9..a196c56
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/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

-- 
kde-dev-utils packaging



More information about the pkg-kde-commits mailing list