[SCM] parley packaging branch, master, updated. debian/4.13.1-1-123-g80421b1
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jul 29 11:26:05 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/parley.git;a=commitdiff;h=2a144f8
The following commit has been merged in the master branch:
commit 2a144f8b30d6eb9fcc60145637a0c79f8e4fa1f4
Merge: bb6f15ea2792267fb93447453d9ed678e9fd070e 95d98d95265640105aac5c8c3340fe8089448918
Author: Maximiliano Curia <maxy at debian.org>
Date: Tue Jul 29 10:58:00 2014 +0200
Merge commit '95d98d95265640105aac5c8c3340fe8089448918'
Conflicts:
debian/changelog
debian/control
debian/parley.install
debian/rules
debian/watch
debian/changelog | 347 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
debian/control | 5 +-
2 files changed, 348 insertions(+), 4 deletions(-)
diff --cc debian/changelog
index 5a0180f,bf0f067..2f75d5b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+parley (4:4.13.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Add menu file. (Closes: #589313)
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Jul 2014 13:18:24 +0200
+
+ parley (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:04 +0100
+
parley (4:4.13.1-1) unstable; urgency=medium
* New upstream release.
@@@ -56,7 -56,7 +63,7 @@@ parley (4:4.10.4-1) experimental; urgen
[ Pino Toscano ]
* Add the pkg-config build dependency.
--
++
[ Maximiliano Curia ]
* Add watch file.
* Bump debhelper build-dep and compat to 9.
@@@ -91,17 -91,352 +98,351 @@@ parley (4:4.7.4-2) unstable; urgency=lo
parley (4:4.7.4-1) experimental; urgency=low
-- * New upstream release.
--
++ * New upstream release.
++
[ José Manuel Santamaría Lema ]
* Bump kde-sc-dev-latest build dependency to 4:4.7.4.
* Add myself to Uploaders.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 18 Dec 2011 01:37:44 +0100
+ parley (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:31:09 +0100
+
+ parley (4:4.12.97-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org> Wed, 02 Apr 2014 11:57:35 +0200
+
+ parley (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Sun, 23 Mar 2014 12:58:27 +0100
+
+ parley (4:4.12.90-0ubuntu1) trusty; urgency=medium
+
+ * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 19 Mar 2014 12:07:19 +0000
+
+ parley (4:4.12.3-0ubuntu1) trusty; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Tue, 04 Mar 2014 21:18:53 +0100
+
+ parley (4:4.12.2-0ubuntu1) trusty; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Wed, 05 Feb 2014 00:33:36 +0000
+
+ parley (4:4.12.1-0ubuntu1) trusty; urgency=low
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Thu, 16 Jan 2014 08:46:14 +0000
+
+ parley (4:4.12.0-0ubuntu1) trusty; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 18 Dec 2013 17:49:41 +0000
+
+ parley (4:4.11.97-0ubuntu1) trusty; urgency=low
+
+ * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 29 Nov 2013 13:48:12 +0000
+
+ parley (4:4.11.95-0ubuntu1) trusty; urgency=low
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Mon, 25 Nov 2013 18:42:18 +0100
+
+ parley (4:4.11.80-0ubuntu1) trusty; urgency=low
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Sat, 23 Nov 2013 18:02:37 +0100
+
+ parley (4:4.11.2-0ubuntu1) saucy; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 30 Sep 2013 14:59:04 +0100
+
+ parley (4:4.11.1-0ubuntu1) saucy; urgency=low
+
+ * New upstream bugfix release.
+
+ -- Philip Muškovac <yofel at kubuntu.org> Fri, 06 Sep 2013 22:43:54 +0100
+
+ parley (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:43:25 +0100
+
+ parley (4:4.10.97-0ubuntu1) saucy; urgency=low
+
+ * New upstream RC 2 release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 26 Jul 2013 20:11:12 +0100
+
+ parley (4:4.10.95-0ubuntu1) saucy; urgency=low
+
+ * New upstream RC release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Fri, 19 Jul 2013 12:33:33 +0000
+
+ parley (4:4.10.90-0ubuntu1) saucy; urgency=low
+
+ * New upstream bet release
+
+ -- Michał Zając <quintasan at kubuntu.org> Fri, 28 Jun 2013 18:34:51 +0100
+
+ parley (4:4.10.80-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Fri, 21 Jun 2013 02:00:59 +0100
+
+ parley (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Fri, 07 Jun 2013 00:55:32 +0100
+
+ parley (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 23 May 2013 11:04:59 +0000
+
+ parley (4:4.10.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Pino Toscano ]
+ * Bump the kde-sc-dev-latest, kdelibs5-dev and libkdeedu-dev build
+ dependencies to 4.10.
+ * Update Uploaders.
+ * Update copyright.
+
+ -- Sune Vuorela <sune at debian.org> Fri, 12 Apr 2013 20:21:32 +0000
+
+ parley (4:4.10.2-0ubuntu1) raring; urgency=low
+
+ * New upstream bugfix release
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sun, 31 Mar 2013 15:04:45 +0200
+
+ parley (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+
+ * New upstream bugfix release
+
+ -- Philip Muškovac <yofel at kubuntu.org> Tue, 05 Mar 2013 16:58:30 +0000
+
+ parley (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+
+ * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Wed, 06 Feb 2013 12:23:10 +0000
+
+ parley (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+
+ * New upstream release candidate
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 18 Jan 2013 16:33:08 +0000
+
+ parley (4:4.9.97-0ubuntu1) raring; urgency=low
+
+ * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org> Thu, 03 Jan 2013 22:49:37 +0100
+
+ parley (4:4.9.95-0ubuntu1) raring; urgency=low
+
+ * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 18 Dec 2012 23:49:27 +0000
+
+ parley (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+
+ * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 07 Dec 2012 18:19:46 +0000
+
+ parley (4:4.9.80-0ubuntu1) raring; urgency=low
+
+ * New upstream beta release
+ * Add build-dep on pkg-config, makes cmake output cleaner
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 19 Nov 2012 16:22:43 +0000
+
+ parley (4:4.9.3-0ubuntu1) raring; urgency=low
+
+ * New upstream release (LP: #1074747)
+
+ -- Philip Muškovac <yofel at kubuntu.org> Tue, 06 Nov 2012 22:50:53 +0100
+
+ parley (4:4.9.2-0ubuntu1) quantal-proposed; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 02 Oct 2012 15:46:10 +0100
+
+ parley (4:4.9.1-0ubuntu1) quantal; urgency=low
+
+ * New upstream release
+
+ -- Harald Sitter <apachelogger at ubuntu.com> Tue, 04 Sep 2012 15:31:21 +0530
+
+ parley (4:4.9.0-0ubuntu1) quantal; urgency=low
+
+ * Use direct build-depends versions rather than kde-sc-dev-latest
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 26 Jul 2012 22:48:30 +0100
+
+ parley (4:4.8.90-0ubuntu1) quantal; urgency=low
+
+ * New upstream beta release.
+
+ -- Felix Geyer <debfx at ubuntu.com> Mon, 11 Jun 2012 23:48:30 +0200
+
+ parley (4:4.8.80-0ubuntu1) quantal; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 06 Jun 2012 16:08:06 +0100
+
+ parley (4:4.8.4-1) unstable; urgency=low
+
+ * New upstream
+
+ -- Sune Vuorela <sune at debian.org> Wed, 20 Jun 2012 10:07:35 +0200
+
+ parley (4:4.8.3-0ubuntu1) quantal; urgency=low
+
+ * New upstream release
+ - Add libssl-dev to build-dep
+ - Bump Standard-Version to 3.9.3 (no change)
+
+ -- Jonathan Kolberg <bulldog98 at kubuntu.org> Thu, 03 May 2012 10:56:16 +0200
+
+ parley (4:4.8.2-0ubuntu1) precise; urgency=low
+
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 03 Apr 2012 08:51:48 +0000
+
+ parley (4:4.8.1-0ubuntu1) precise; urgency=low
+
- * New upstream release
++ * New upstream release
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sun, 04 Mar 2012 21:04:47 +0100
+
+ parley (4:4.8.0-0ubuntu1) precise; urgency=low
+
+ * New upstream release
+
+ -- Philip Muškovac <yofel at kubuntu.org> Mon, 23 Jan 2012 21:59:40 +0100
+
+ parley (4:4.7.97-0ubuntu1) precise; urgency=low
+
+ * New upstream release candidate
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 05 Jan 2012 12:18:34 +0000
+
+ parley (4:4.7.95-0ubuntu1) precise; urgency=low
+
+ * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sat, 24 Dec 2011 22:00:21 +0100
+
+ parley (4:4.7.90-0ubuntu1) precise; urgency=low
+
+ * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 17 Dec 2011 15:06:58 +0000
+
+ parley (4:4.7.4-2) unstable; urgency=low
+
+ * Team upload. Upload to unstable.
+
+ -- Pino Toscano <pino at debian.org> Wed, 07 Mar 2012 17:26:53 +0100
+
+ parley (4:4.7.4-1) experimental; urgency=low
+
- * New upstream release.
-
++ * New upstream release.
++
+ [ José Manuel Santamaría Lema ]
+ * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
+ * Add myself to Uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 18 Dec 2011 01:37:44 +0100
+
+ parley (4:4.7.3-0ubuntu1) precise; urgency=low
+
+ * New upstream release
+ * Merge with Debian Git, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 23 Nov 2011 23:47:07 +0000
+
parley (4:4.7.2-1) experimental; urgency=low
[ Felix Geyer ]
* Initial release, based on the Kubuntu package.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 03 Dec 2011 10:44:01 -0300
+
+ parley (4:4.7.2-0r0) raring; urgency=low
+
+ [ Felix Geyer ]
+ * Initial release, based on the Kubuntu package.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 26 Oct 2011 15:43:08 +0200
+
+ parley (4:4.7.1-0ubuntu2) oneiric; urgency=low
+
+ * No-change rebuild so translations aren't stripped from .desktop
+ files anymore.
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Fri, 16 Sep 2011 01:17:36 +0200
+
+ parley (4:4.7.1-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Kolberg <bulldog98 at kubuntu-de.org> Thu, 08 Sep 2011 21:40:11 +0200
+
+ parley (4:4.7.0-0ubuntu2) raring; urgency=low
+
+ * Recommend krosspython and python-kde4 to make plugins work.
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Fri, 12 Aug 2011 12:29:54 +0200
+
+ parley (4:4.7.0-0ubuntu1) oneiric; urgency=low
+
- * New upstream release
++ * New upstream release
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sun, 24 Jul 2011 23:51:39 +0200
+
+ parley (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
+
+ * Initial release (parley moved out of kdeedu)
+ * Repacked tarball to include a copy of GPL-2 and GFDL-1.2
+
+ -- Michał Zając <quintasan at kubuntu.org> Mon, 11 Jul 2011 11:50:47 +0200
-
diff --cc debian/control
index 8755567,6d259f3..c0ad066
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
Source: parley
Section: kde
Priority: optional
- Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
++X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
@@@ -17,8 -18,10 +18,10 @@@
pkg-kde-tools (>= 0.12)
Standards-Version: 3.9.5
Homepage: https://projects.kde.org/projects/kde/kdeedu/parley
-X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/parley.git
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/parley
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/parley
-X-Debian-Vcs-Browser: http://anonscm.debian.org/git/pkg-kde/kde-sc/parley.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/parley.git
+Vcs-Browser: http://anonscm.debian.org/git/pkg-kde/kde-sc/parley.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/parley
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/parley
Package: parley
Architecture: any
--
parley packaging
More information about the pkg-kde-commits
mailing list