[SCM] umbrello packaging branch, kubuntu_xenial_archive, updated. debian/15.08.2-1-29-g88c60a0

Sun Feb 7 15:03:29 UTC 2016

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 88c60a0d0fc65326a0744bf284e1022802d68895
Merge: 1cd42a895adb31c710b20a6db6f1429153821421 fccba31d91b915b1f9eb9e037b7a51ddfc22c955
Author: Clive Johnston <clivejo at aol.com>
Date:   Sun Feb 7 15:03:15 2016 +0000

    Merging with Debian and New upstream release

 debian/.gitattributes                       |  1 +
 debian/changelog                            | 57 +++++++++++++++++++++++++++--
 debian/control                              | 32 ++++++++++++----
 debian/patches/QCOMPARE_uses_toString.patch | 51 ++++++++++++++++++++++++++
 debian/patches/fix_build.patch              | 25 +++++++++++++
 debian/patches/series                       |  2 +-
 debian/rules                                |  9 ++++-
 debian/tests/control                        |  3 +-
 debian/tests/testsuite                      |  2 +-
 debian/tests/testsuite.xsession             |  5 ---
 debian/umbrello.install                     | 12 ++++--
 11 files changed, 174 insertions(+), 25 deletions(-)

diff --cc debian/changelog
index 13f1c1c,e2b400b..a580ee9

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,48 -1,44 +1,90 @@@
- umbrello (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
++umbrello (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +  * Wildcard icons in install file
++  * Merged with Debian
 +
-  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 23:59:08 +0000
++ -- Clive Johnston <clivejo at aol.com>  Sun, 07 Feb 2016 14:59:08 +0000
++
+ umbrello (4:15.12.1-1) experimental; urgency=medium
+ 
+   * New upstream release (15.12.0).
+   * New patch: fix_build.patch
+   * New upstream release (15.12.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Feb 2016 10:23:01 +0100
+ 
+ umbrello (4:15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Dec 2015 12:39:09 +0100
+ 
+ umbrello (4:15.08.2-1) unstable; urgency=medium
+ 
+   * New upstream release (15.08.2).
+   * Remove upstream patch: upstream_add_appstream_metadata.diff
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 16 Oct 2015 08:07:01 +0200
  
 +umbrello (4:15.08.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 14 Oct 2015 13:09:45 +0100
 +
+ umbrello (4:15.08.1-1) unstable; urgency=medium
+ 
+   * New upstream release (15.04.0).
+   * New upstream release (15.04.1).
+   * New upstream release (15.04.2).
+   * New upstream release (15.04.3).
+   * New upstream release (15.08.0).
+   * New upstream release (15.08.1).
+   * Disable patch: valgrind_errors
+   * New upstream patch: upstream_add_appstream_metadata.diff
+   * Update install files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 19 Sep 2015 19:10:58 +0200
+ 
 +umbrello (4:15.08.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release (15.08.1)
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 22 Sep 2015 17:48:50 +0100
 +
 +umbrello (4:15.08.0-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Clive Johnston <clivejo at aol.com>  Wed, 26 Aug 2015 18:24:31 +0100
 +
 +umbrello (4:15.07.90-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream beta release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Aug 2015 12:35:42 +0100
 +
 +umbrello (4:15.04.2-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release
 +  * wrap-and-sort 
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +  * Disable applying valgrind_errors, some is no longer needed, the rest is
 +    undocumented and upstream requests comments
 +    https://mail.kde.org/pipermail/umbrello-devel/2015-June/019594.html
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 22:46:15 +0200
 +
+ umbrello (4:14.12.3-1) experimental; urgency=medium
+ 
+   * New upstream release (14.12.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:13:21 +0200
+ 
  umbrello (4:14.12.3-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/rules
index 6542396,10998e6..cff32c4
--- a/debian/rules
+++ b/debian/rules
@@@ -1,8 -1,13 +1,15 @@@
  #!/usr/bin/make -f
  
- include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+ 
+ override_dh_auto_configure:
+ 	$(overridden_command) -- -DBUILD_KF5=ON
  
 +.PHONY: override_dh_auto_test
 +
  override_dh_auto_install:
  	$(overridden_command) --destdir=debian/tmp
+ 
+ override_dh_auto_test:
+ 	# Disable dh_auto_test at build time
+ 	:
diff --cc debian/umbrello.install
index e775f38,c919d57..29e2033
--- a/debian/umbrello.install
+++ b/debian/umbrello.install
@@@ -1,6 -1,11 +1,12 @@@
 +usr/bin/po2xmi
  usr/bin/umbrello
+ usr/bin/po2xmi
  usr/bin/xmi2pot
- usr/share/applications/kde4/umbrello.desktop
- usr/share/doc/kde/HTML/*/umbrello/*
- usr/share/kde4/apps/umbrello/
+ usr/share/applications/org.kde.umbrello.desktop
+ usr/share/appdata/org.kde.umbrello.appdata.xml
+ usr/share/kxmlgui5/umbrello/
+ usr/share/umbrello/
+ usr/share/icons/hicolor/*/actions/umbrello*
+ usr/share/icons/hicolor/*/apps/umbrello.*
+ usr/share/icons/hicolor/*/mimetypes/application-x-uml.png
+ usr/share/doc/HTML/*/umbrello/

-- 
umbrello packaging

