[SCM] palapeli packaging branch, master, updated. debian/4.13.1-1-52-g84d2ff1
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jul 29 20:49:19 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/palapeli.git;a=commitdiff;h=5e0d84f
The following commit has been merged in the master branch:
commit 5e0d84f714513f0ba9441ba2faabdcb59c0839df
Merge: 7dd215ed424424f7f5b44475cd293ef6e667c6f2 24557e33924c4356cec9512d7b9ca4dea86f87fc
Author: Maximiliano Curia <maxy at debian.org>
Date: Tue Jul 29 16:51:43 2014 +0200
Merge commit '24557e33924c4356cec9512d7b9ca4dea86f87fc'
Conflicts:
debian/changelog
debian/control
debian/watch
debian/changelog | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
debian/control | 5 +-
2 files changed, 188 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index c6da784,61a4e11..3b63e84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+palapeli (4:4.13.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 16 Jul 2014 12:59:47 +0200
+
+ palapeli (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:03 +0100
+
palapeli (4:4.13.1-1) unstable; urgency=medium
* New upstream release.
@@@ -64,3 -65,181 +71,180 @@@ palapeli (4:4.10.2-1) experimental; urg
-- Maximiliano Curia <maxy at debian.org> Fri, 12 Apr 2013 12:12:41 +0200
+ palapeli (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:30:48 +0100
+
+ palapeli (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:11 +0200
+
+ palapeli (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Sun, 23 Mar 2014 12:58:07 +0100
+
+ palapeli (4:4.12.90-0ubuntu1) trusty; urgency=medium
+
+ * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 19 Mar 2014 12:06:56 +0000
+
+ palapeli (4:4.12.3-0ubuntu1) trusty; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Tue, 04 Mar 2014 21:18:32 +0100
+
+ palapeli (4:4.12.2-0ubuntu1) trusty; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Wed, 05 Feb 2014 00:33:07 +0000
+
+ palapeli (4:4.12.1-0ubuntu1) trusty; urgency=low
+
+ * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Thu, 16 Jan 2014 08:45:51 +0000
+
+ palapeli (4:4.12.0-0ubuntu1) trusty; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 18 Dec 2013 17:49:08 +0000
+
+ palapeli (4:4.11.97-0ubuntu1) trusty; urgency=low
+
+ * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 29 Nov 2013 13:47:44 +0000
+
+ palapeli (4:4.11.95-0ubuntu1) trusty; urgency=low
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Mon, 25 Nov 2013 18:41:56 +0100
+
+ palapeli (4:4.11.80-0ubuntu1) trusty; urgency=low
+
+ * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Sat, 23 Nov 2013 18:02:12 +0100
+
+ palapeli (4:4.11.2-0ubuntu1) saucy; urgency=low
+
+ * New upstream bugfix release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 30 Sep 2013 14:58:40 +0100
+
+ palapeli (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:34 +0100
+
+ palapeli (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:04 +0100
+
+ palapeli (4:4.10.97-0ubuntu1) saucy; urgency=low
+
+ * New upstream RC 2 release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 26 Jul 2013 20:10:41 +0100
+
+ palapeli (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
+
+ palapeli (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:35 +0100
+
+ palapeli (4:4.10.80-0ubuntu1) saucy; urgency=low
+
+ * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Fri, 21 Jun 2013 02:00:31 +0100
+
+ palapeli (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+
+ [ Rohan Garg ]
+ * New upstream bugfix release
+
+ [ Jonathan Riddell ]
+ * add not-installed
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Fri, 07 Jun 2013 00:55:10 +0100
+
+ palapeli (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
+
+ palapeli (4:4.10.2-1) experimental; urgency=low
+
+ * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 12 Apr 2013 12:12:41 +0200
+
+ palapeli (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:30 +0200
+
+ palapeli (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:10 +0000
+
+ palapeli (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+
+ * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org> Wed, 06 Feb 2013 12:22:42 +0000
+
+ palapeli (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+
+ * New upstream release candidate
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 18 Jan 2013 16:32:26 +0000
+
+ palapeli (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:24 +0100
+
+ palapeli (4:4.9.95-0ubuntu1) raring; urgency=low
+
+ * Install to /usr/games
+ * Version dependency on kdegames-data
+ * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 18 Dec 2012 23:49:07 +0000
+
+ palapeli (4:4.9.90-0ubuntu1) raring-proposed; urgency=low
+
+ * Initial release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 07 Dec 2012 18:18:28 +0000
-
diff --cc debian/control
index feb54d3,cc8ebf7..ac32a5d
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
Source: palapeli
Section: games
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: Daniel Schepler <schepler at debian.org>,
Sune Vuorela <sune at debian.org>,
Fathi Boudra <fabo at debian.org>,
@@@ -19,8 -20,10 +20,10 @@@ Build-Depends: cmake
shared-mime-info
Standards-Version: 3.9.5
Homepage: http://games.kde.org/
-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/palapeli
-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/palapeli
-X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/palapeli.git
-X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/palapeli.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/palapeli.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/palapeli.git
++X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/palapeli
++X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/palapeli
Package: palapeli-data
Architecture: all
--
palapeli packaging
More information about the pkg-kde-commits
mailing list