[SCM] umbrello packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-2-gf0c8bcc
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Wed Dec 3 17:17:47 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/umbrello.git;a=commitdiff;h=f0c8bcc
The following commit has been merged in the kubuntu_vivid_archive branch:
commit f0c8bcc455e357183c03b5281682003aba8b7aab
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Dec 3 18:17:44 2014 +0100
New upstream RC release
* New upstream RC release
* New upstream release
* Fix copyright to use GPL-KDEeV as short license.
* New upstream release
* New upstream release
* New upstream beta release RC
* New upstream beta release
* New upstream beta release
* New upstream release
* Merge with Debian, no changes
* Build against boost1.55.
* New upstream KDE Software Compilation release
* New upstream release candidate
* New upstream beta release
* New upstream beta release
* New upstream bugfix release
* New upstream bugfix release
* New upstream bugfix release
* New upstream release
* New upstream RC release
* New upstream beta release
* New upstream beta release
* Bump to Boost 1.54.
* New upstream bugfix release
* New upstream bugfix release.
* New upstream release
* New upstream release
* New upstream RC 2 release
* New upstream RC release
* New upstream bet release
* Add file to umbrello.install
* New upstream release
* Initial package, split from umbrello
---
debian/.gitattributes | 1 -
debian/changelog | 179 ++++++++++++++++++++++++++++++++++++++++++++
debian/control | 8 +-
debian/copyright | 2 +-
debian/source/local-options | 1 -
debian/watch | 4 +-
6 files changed, 187 insertions(+), 8 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 7e7b885..a53eb80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+umbrello (4:14.11.97-0ubuntu1~ubuntu15.04~ppa1) vivid; urgency=medium
+
+ * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 01 Dec 2014 18:03:54 +0100
+
umbrello (4:4.14.2-1) unstable; urgency=medium
* New upstream release (4.14.2).
@@ -24,6 +30,50 @@ umbrello (4:4.13.3-1) unstable; urgency=medium
-- Maximiliano Curia <maxy at debian.org> Fri, 25 Jul 2014 12:23:39 +0200
+umbrello (4:4.14.2-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+ * Fix copyright to use GPL-KDEeV as short license.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Fri, 10 Oct 2014 06:55:48 -0700
+
+umbrello (4:4.14.1-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Mon, 22 Sep 2014 18:06:35 +0200
+
+umbrello (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 20 Aug 2014 13:48:45 +0200
+
+umbrello (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release RC
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Fri, 01 Aug 2014 17:44:21 +0200
+
+umbrello (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Wed, 30 Jul 2014 21:02:20 +0200
+
+umbrello (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+ * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Thu, 24 Jul 2014 23:54:52 +0200
+
+umbrello (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+ * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 17 Jun 2014 10:42:06 +0100
+
umbrello (4:4.13.1-1) unstable; urgency=medium
* New upstream release.
@@ -76,3 +126,132 @@ umbrello (4:4.11.2-1) experimental; urgency=low
* First release of kdesdk after being split by upstream.
-- Maximiliano Curia <maxy at debian.org> Tue, 08 Oct 2013 10:58:24 +0200
+
+umbrello (4:4.13.0-0ubuntu2) UNRELEASED; urgency=medium
+
+ * Build against boost1.55.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com> Sat, 03 May 2014 22:15:52 +0100
+
+umbrello (4:4.13.0-0ubuntu1) trusty; urgency=medium
+
+ * New upstream KDE Software Compilation release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 10 Apr 2014 22:35:55 +0100
+
+umbrello (4:4.12.97-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org> Wed, 02 Apr 2014 12:04:32 +0200
+
+umbrello (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Sun, 23 Mar 2014 13:07:54 +0100
+
+umbrello (4:4.12.90-0ubuntu1) trusty; urgency=medium
+
+ * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 19 Mar 2014 12:12:50 +0000
+
+umbrello (4:4.12.3-0ubuntu1) trusty; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Tue, 04 Mar 2014 21:24:20 +0100
+
+umbrello (4:4.12.2-0ubuntu1) trusty; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Wed, 05 Feb 2014 00:38:16 +0000
+
+umbrello (4:4.12.1-0ubuntu1) trusty; urgency=low
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Thu, 16 Jan 2014 08:52:26 +0000
+
+umbrello (4:4.12.0-0ubuntu1) trusty; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 18 Dec 2013 17:55:54 +0000
+
+umbrello (4:4.11.97-0ubuntu1) trusty; urgency=low
+
+ * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 29 Nov 2013 13:54:20 +0000
+
+umbrello (4:4.11.95-0ubuntu1) trusty; urgency=low
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Mon, 25 Nov 2013 18:48:35 +0100
+
+umbrello (4:4.11.80-0ubuntu1) trusty; urgency=low
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Sat, 23 Nov 2013 18:09:04 +0100
+
+umbrello (4:4.11.2-0ubuntu2) trusty; urgency=low
+
+ * Bump to Boost 1.54.
+
+ -- Dmitrijs Ledkovs <xnox at ubuntu.com> Sat, 26 Oct 2013 22:26:43 +0100
+
+umbrello (4:4.11.2-0ubuntu1) saucy; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 30 Sep 2013 15:04:04 +0100
+
+umbrello (4:4.11.1-0ubuntu1) saucy; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Philip Muškovac <yofel at kubuntu.org> Fri, 06 Sep 2013 22:47:31 +0100
+
+umbrello (4:4.11.0-0ubuntu1) saucy; urgency=low
+
+ [ Howard Chan ]
+ * New upstream release
+
+ [ Jonathan Riddell ]
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 14 Aug 2013 00:48:23 +0100
+
+umbrello (4:4.10.97-0ubuntu1) saucy; urgency=low
+
+ * New upstream RC 2 release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 26 Jul 2013 20:18:19 +0100
+
+umbrello (4:4.10.95-0ubuntu1) saucy; urgency=low
+
+ * New upstream RC release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Fri, 19 Jul 2013 12:33:46 +0000
+
+umbrello (4:4.10.90-0ubuntu1) saucy; urgency=low
+
+ [ Michał Zając ]
+ * New upstream bet release
+
+ [ Philip Muškovac ]
+ * Add file to umbrello.install
+
+ -- Michał Zając <quintasan at kubuntu.org> Fri, 28 Jun 2013 18:38:00 +0100
+
+umbrello (4:4.10.80-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+ * Initial package, split from umbrello
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 21 Jun 2013 02:29:56 +0100
diff --git a/debian/control b/debian/control
index ffcd0e5..1cfecbd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: umbrello
Section: kde
Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>,
Fathi Boudra <fabo at debian.org>,
Modestas Vainius <modax at debian.org>,
@@ -19,14 +19,14 @@ Build-Depends: cmake (>= 2.8),
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
Homepage: http://www.kde.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/umbrello.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/umbrello.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/umbrello.git/
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/umbrello.git
Package: umbrello
Architecture: any
Section: devel
Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: khelpcenter4
+Suggests: khelpcenter
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/copyright b/debian/copyright
index 6e5e3b1..231a8c6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -58,7 +58,7 @@ Copyright: 2011, Andi Fischer <andi.fischer at hispeed.ch>
2005, Oliver M. Kellogg <okellogg at users.sourceforge.net>
2012, Ralf Habacker <ralf.habacker at freenet.de>
2010, Umbrello UML Modeller Authors <uml-devel at uml.sf.net>
-License: GPL-2 or GPL-3 or later editions as approved by KDE eV
+License: GPL-2 or GPL-3 or GPL-KDEeV
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
diff --git a/debian/watch b/debian/watch
index d81628e..12c1252 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
version=3
-http://download.kde.org/stable/([\d.]+)/src/umbrello-([\d.]+).tar.xz
+http://download.kde.org/stable/applications/([\d.]+)/src/umbrello-([\d.]+).tar.xz
+
+http://download.kde.org/unstable/applications/([\d.]+)/src/umbrello-([\d.]+).tar.xz
--
umbrello packaging
More information about the pkg-kde-commits
mailing list