[SCM] umbrello packaging branch, master, updated. debian/16.08.3-1-75-gd9bcd95

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit aa6f6c628b756cb95781908749748b1e24d51420
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 14:31:51 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 5647080..89df990 100644
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,8 @@ Architecture: any
 Section: devel
 Depends: kinit, ${misc:Depends}, ${shlibs:Depends}
 Suggests: khelpcenter
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: UML modelling tool and code generator
  Umbrello UML Modeller is a Unified Modelling Language diagram editor for KDE.
  It can create diagrams of software and other systems in the industry-standard
diff --git a/debian/rules b/debian/rules
old mode 100755
new mode 100644
index 10998e6..cf3d2af
--- 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_configure:
 	$(overridden_command) -- -DBUILD_KF5=ON

-- 
umbrello packaging