[SCM] dolphin packaging branch, master, updated. debian/16.08.3-1-50-gce895fd

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:02:40 UTC 2017


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

The following commit has been merged in the master branch:
commit e350447473e6596d15b89f1e5a2cf25a4de7ee7b
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 14:31:42 2017 +0200

    Mass conflict/break kde-l10n < 17.03.90 [part 2]
    
    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.
    
    This changes applies more accurate heuristics to cover more binary packages.
---
 debian/control | 2 ++
 debian/rules   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/control b/debian/control
index e153275..25177e2 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,8 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ruby
 Suggests: dolphin-plugins
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: file manager
  Dolphin is the default file manager in the Plasma, intended
  to be both powerful and easy to use.
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index b1a5a9c..f4e62f3
--- 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='dolphin-dbg (<= 4:15.12.1-1~~)'

-- 
dolphin packaging



More information about the pkg-kde-commits mailing list