[SCM] dolphin-plugins packaging branch, master, updated. debian/16.08.3-1-31-g652b4a4

Maximiliano Curia maxy at moszumanska.debian.org
Tue Oct 31 17:59:24 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/dolphin-plugins.git;a=commitdiff;h=412aad4

The following commit has been merged in the master branch:
commit 412aad4ceb64f0a9cb83ab41c88ad8e10a209dd1
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 13:12:57 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 e447da6..0ba2dd3 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,8 @@ Architecture: any
 Section: devel
 Depends: dolphin, ${misc:Depends}, ${shlibs:Depends}
 Enhances: dolphin
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: dolphin VCS plugins
  This package contains plugins that offer integration in Dolphin with the
  following version control systems:
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index f1f412f..d30af41
--- 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_install:
 	$(overridden_command) --destdir=debian/tmp

-- 
dolphin-plugins packaging



More information about the pkg-kde-commits mailing list