Simon Quigley has proposed merging ~tsimonq2/kubuntu-packaging/+git/kubuntu-khangman:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/klettres:kubuntu_unstable.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~tsimonq2/kubuntu-packaging/+git/kubuntu-khangman/+merge/300962 This fixes the path for the org.kde.khangman.appdata.xml file by deleting the existing entry and adding usr/share/metainfo at the bottom of the install file. -- Your team Kubuntu Packagers is requested to review the proposed merge of ~tsimonq2/kubuntu-packaging/+git/kubuntu-khangman:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/klettres:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog index 80dc7ab..c3ab89f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,8 @@ +<<<<<<< debian/changelog klettres (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium +======= +khangman (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium +>>>>>>> debian/changelog [ Scarlett Clark ] * New upstream release @@ -15,15 +19,24 @@ klettres (4:16.04.3-0ubuntu1) UNRELEASED; urgency=medium * New upstream release (16.04.3) [ Simon Quigley ] +<<<<<<< debian/changelog * Fix the path from appdata to metainfo in the install file -- Clive Johnston <[email protected]> Fri, 08 Jul 2016 01:08:56 +0100 klettres (4:15.12.3-0ubuntu1) xenial; urgency=medium +======= + * Fix the path for org.kde.kiriki.appdata.xml in the install file + + -- Clive Johnston <[email protected]> Fri, 08 Jul 2016 01:04:13 +0100 + +khangman (4:15.12.3-0ubuntu1) xenial; urgency=medium +>>>>>>> debian/changelog * New upstream bugfix release * New upstream bugfix release +<<<<<<< debian/changelog -- Scarlett Clark <[email protected]> Thu, 14 Apr 2016 15:30:46 -0700 klettres (4:15.12.1-1ubuntu1) xenial; urgency=medium @@ -34,10 +47,26 @@ klettres (4:15.12.1-1ubuntu1) xenial; urgency=medium -- Scarlett Clark <[email protected]> Wed, 09 Mar 2016 10:49:45 +0100 klettres (4:15.12.1-1) experimental; urgency=medium +======= + -- Scarlett Clark <[email protected]> Thu, 14 Apr 2016 15:23:52 -0700 + +khangman (4:15.12.1-1ubuntu1) xenial; urgency=medium + + [ Scarlett Clark ] + * Debian merge: No remaining changes. + + [ Clive Johnston ] + * Adding lintian overrides for the font files warnings + + -- Scarlett Clark <[email protected]> Wed, 09 Mar 2016 10:45:00 +0100 + +khangman (4:15.12.1-1) experimental; urgency=medium +>>>>>>> debian/changelog * New upstream release (15.12.0). * New upstream release (15.12.1). +<<<<<<< debian/changelog -- Maximiliano Curia <[email protected]> Mon, 01 Feb 2016 10:22:45 +0100 klettres (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium @@ -53,10 +82,28 @@ klettres (4:15.08.3-1) unstable; urgency=medium -- Maximiliano Curia <[email protected]> Wed, 02 Dec 2015 12:38:55 +0100 klettres (4:15.08.2-0ubuntu1) wily; urgency=medium +======= + -- Maximiliano Curia <[email protected]> Mon, 01 Feb 2016 10:23:18 +0100 + +khangman (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release + + -- Clive Johnston <[email protected]> Sat, 02 Jan 2016 13:55:02 +0000 + +khangman (4:15.08.3-1) unstable; urgency=medium + + * New upstream release (15.08.3). + + -- Maximiliano Curia <[email protected]> Wed, 02 Dec 2015 12:39:17 +0100 + +khangman (4:15.08.2-0ubuntu1) wily; urgency=medium +>>>>>>> debian/changelog * Vivid backport * New upstream release +<<<<<<< debian/changelog -- Scarlett Clark <[email protected]> Wed, 14 Oct 2015 12:31:56 +0100 klettres (4:15.08.1-0ubuntu1) wily; urgency=medium @@ -89,6 +136,59 @@ klettres (4:15.07.90-0ubuntu1) wily; urgency=medium -- Jonathan Riddell <[email protected]> Tue, 18 Aug 2015 10:31:19 +0100 klettres (4:15.04.2-0ubuntu1) wily; urgency=medium +======= + -- Scarlett Clark <[email protected]> Wed, 14 Oct 2015 12:27:01 +0100 + +khangman (4:15.08.1-1) unstable; urgency=medium + + * New upstream release (15.08.1). + + -- Maximiliano Curia <[email protected]> Sat, 19 Sep 2015 02:45:18 +0200 + +khangman (4:15.08.1-0ubuntu1) wily; urgency=medium + + * New upstream release (15.08.1) + + -- Clive Johnston <[email protected]> Tue, 22 Sep 2015 16:53:03 +0100 + +khangman (4:15.08.0-1) unstable; urgency=medium + + * Upload to unstable + + [ Maximiliano Curia ] + * Bump minimum version requirement for qtbase5-dev, libqt5svg5-dev, and + extra-cmake-modules. + * Add qtdeclarative5-dev, libkf5declarative-dev, and kio-dev to + build-depends + * Update khangman.install to remove usr/lib/*/libkhangmanengine.so and + usr/share/kxmlgui5/khangman/khangmanui.rc as they are no longer built by + the package + + [ Scott Kitterman ] + * New upstream release + * Update packaging now that license of themes/winter/khangman_winter.svg has + been clarified as being DFSG free + - Remove themes/winter/khangman_winter.svg from Files-excluded in debian/ + copyright + - Remove debian/patches/drop_cc-nc_theme (and the patch directory) + - Adjust debian/watch for the elimination of the dfsg suffix + + -- Debian/Kubuntu Qt/KDE Maintainers <[email protected]> Thu, 03 Sep 2015 15:33:28 -0400 + +khangman (4:15.08.0-0ubuntu1) wily; urgency=medium + + * new upstream release + + -- Clive Johnston <[email protected]> Wed, 26 Aug 2015 17:26:14 +0100 + +khangman (4:15.07.90-0ubuntu1) wily; urgency=medium + + * new upstream beta release + + -- Jonathan Riddell <[email protected]> Tue, 18 Aug 2015 09:51:21 +0100 + +khangman (4:15.04.2-0ubuntu1) wily; urgency=medium +>>>>>>> debian/changelog [ Scarlett Clark ] * New upstream release @@ -98,6 +198,7 @@ klettres (4:15.04.2-0ubuntu1) wily; urgency=medium [ Jonathan Riddell ] * New upstream release +<<<<<<< debian/changelog -- Jonathan Riddell <[email protected]> Tue, 09 Jun 2015 19:08:04 +0200 klettres (4:14.12.3-0ubuntu1) vivid; urgency=medium @@ -154,10 +255,82 @@ klettres (4:4.14.1-0ubuntu1) utopic; urgency=medium -- Scarlett Clark <[email protected]> Mon, 22 Sep 2014 17:18:25 +0200 klettres (4:4.14.0-1) unstable; urgency=medium +======= + -- Jonathan Riddell <[email protected]> Tue, 09 Jun 2015 19:04:11 +0200 + +khangman (4:14.12.3+dfsg-1) experimental; urgency=medium + + * New upstream release (14.12.3+dfsg). + + -- Maximiliano Curia <[email protected]> Sun, 29 Mar 2015 15:13:48 +0200 + +khangman (4:14.12.3-0ubuntu1) vivid; urgency=medium + + * New upstream release + * Remove wildcard from not-installed and hard code path. + * Manual merge kubuntu_unstable. + * Merge of course broke my build. + + -- Scarlett Clark <[email protected]> Fri, 13 Mar 2015 14:26:50 -0700 + +khangman (4:14.12.2+dfsg-1) experimental; urgency=medium + + [ Scarlett Clark ] + * Remove kdelibs5-dev depend version as there was not a new release. + * Correct the paths in the not-installed. + + [ Maximiliano Curia ] + * New dfsg version (14.12.2+dfsg). + * Update copyright information. + * New patch: drop_cc-nc_theme + + -- Maximiliano Curia <[email protected]> Sun, 22 Feb 2015 15:22:18 +0100 + +khangman (4:14.12.2-0ubuntu1) vivid; urgency=medium + + * New upstream release + + -- Scarlett Clark <[email protected]> Tue, 10 Feb 2015 09:29:46 -0800 + +khangman (4:14.12.0-0ubuntu1) vivid; urgency=medium + + * Initial release for KDE applications 14.12 series + - Change maintainer to Debian/Kubuntu + - Remove X-Ubuntu entries no longer applicable. + - Fix Watch file applications locations + - Fix VCS for new kde-applications location + - KF5 port + * Debian merge, no remaining changes. + * Add missing depend libqt5svg5-dev + * Fix not-installed paths. + + -- Scarlett Clark <[email protected]> Mon, 15 Dec 2014 17:07:35 +0100 + +khangman (4:4.14.2-0ubuntu1) vivid; urgency=medium + + * New upstream release + + -- Scarlett Clark <[email protected]> Fri, 10 Oct 2014 05:08:13 -0700 + +khangman (4:4.14.1-1) unstable; urgency=medium + + * New upstream release (4.14.1). + + -- Maximiliano Curia <[email protected]> Wed, 17 Sep 2014 09:44:36 +0200 + +khangman (4:4.14.1-0ubuntu1) utopic; urgency=medium + + * New upstream release + + -- Scarlett Clark <[email protected]> Mon, 22 Sep 2014 17:14:56 +0200 + +khangman (4:4.14.0-1) unstable; urgency=medium +>>>>>>> debian/changelog * New upstream release. * Update install file. +<<<<<<< debian/changelog -- Maximiliano Curia <[email protected]> Fri, 22 Aug 2014 18:55:10 +0200 klettres (4:4.14.0-0ubuntu1) utopic; urgency=medium @@ -179,6 +352,29 @@ klettres (4:4.13.95-0ubuntu1) utopic; urgency=medium -- Scarlett Clark <[email protected]> Wed, 30 Jul 2014 18:20:57 +0200 klettres (4:4.13.90-0ubuntu1) utopic; urgency=medium +======= + -- Maximiliano Curia <[email protected]> Fri, 22 Aug 2014 05:24:28 +0200 + +khangman (4:4.14.0-0ubuntu1) utopic; urgency=medium + + * New upstream release + + -- Jonathan Riddell <[email protected]> Wed, 20 Aug 2014 13:09:01 +0200 + +khangman (4:4.13.97-0ubuntu1) utopic; urgency=medium + + * New upstream beta release RC + + -- Scarlett Clark <[email protected]> Fri, 01 Aug 2014 16:47:50 +0200 + +khangman (4:4.13.95-0ubuntu1) utopic; urgency=medium + + * New upstream beta release + + -- Scarlett Clark <[email protected]> Wed, 30 Jul 2014 18:17:25 +0200 + +khangman (4:4.13.90-0ubuntu1) utopic; urgency=medium +>>>>>>> debian/changelog [ Scarlett Clark ] * New upstream beta release @@ -186,6 +382,7 @@ klettres (4:4.13.90-0ubuntu1) utopic; urgency=medium [ Jonathan Riddell ] * Add appdata file to .install +<<<<<<< debian/changelog -- Scarlett Clark <[email protected]> Thu, 24 Jul 2014 23:09:55 +0200 klettres (4:4.13.2-0ubuntu1) utopic; urgency=medium @@ -280,10 +477,114 @@ klettres (4:4.11.3-2) unstable; urgency=low -- Maximiliano Curia <[email protected]> Thu, 03 Apr 2014 11:21:06 +0200 klettres (4:4.11.3-1) unstable; urgency=low +======= + -- Scarlett Clark <[email protected]> Thu, 24 Jul 2014 23:07:18 +0200 + +khangman (4:4.13.3-1) unstable; urgency=medium + + * New upstream release. + + -- Maximiliano Curia <[email protected]> Tue, 29 Jul 2014 10:01:34 +0200 + +khangman (4:4.13.2-0ubuntu1) utopic; urgency=medium + + * new upstream release + + -- Jonathan Riddell <[email protected]> Wed, 18 Jun 2014 11:58:10 +0100 + +khangman (4:4.13.1-1ubuntu1) utopic; urgency=medium + + * Merge with Debian, no remaining changes + + -- Rohan Garg <[email protected]> Mon, 16 Jun 2014 17:15:02 +0200 + +khangman (4:4.13.1-1) unstable; urgency=medium + + * New upstream release. + + -- Maximiliano Curia <[email protected]> Fri, 23 May 2014 12:28:18 +0200 + +khangman (4:4.13.0-0ubuntu1) trusty; urgency=medium + + * New upstream KDE Software Compilation release + + -- Jonathan Riddell <[email protected]> Thu, 10 Apr 2014 22:03:46 +0100 + +khangman (4:4.12.97-0ubuntu1) trusty; urgency=medium + + * New upstream release candidate + + -- Philip Muškovac <[email protected]> Wed, 02 Apr 2014 11:27:18 +0200 + +khangman (4:4.12.95-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Rohan Garg <[email protected]> Sun, 23 Mar 2014 12:29:11 +0100 + +khangman (4:4.12.90-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Jonathan Riddell <[email protected]> Wed, 19 Mar 2014 10:58:13 +0000 + +khangman (4:4.12.4-1) unstable; urgency=low + + * Bump Standards-Version to 3.9.5, no changes needed. + * New upstream release. + * New upstream release. + + -- Maximiliano Curia <[email protected]> Mon, 28 Apr 2014 12:24:48 +0200 + +khangman (4:4.12.3-0ubuntu1) trusty; urgency=medium + + * New upstream bugfix release + + -- Rohan Garg <[email protected]> Tue, 04 Mar 2014 20:49:21 +0100 + +khangman (4:4.12.2-0ubuntu1) trusty; urgency=medium + + * New upstream bugfix release + + -- Rohan Garg <[email protected]> Wed, 05 Feb 2014 00:01:27 +0000 + +khangman (4:4.12.1-0ubuntu1) trusty; urgency=low + + * New upstream bugfix release + + -- Rohan Garg <[email protected]> Thu, 16 Jan 2014 08:18:22 +0000 + +khangman (4:4.12.0-0ubuntu1) trusty; urgency=low + + * New upstream release + + -- Jonathan Riddell <[email protected]> Wed, 18 Dec 2013 17:08:31 +0000 + +khangman (4:4.11.97-0ubuntu1) trusty; urgency=low + + * New upstream RC release + + -- Jonathan Riddell <[email protected]> Fri, 29 Nov 2013 13:09:53 +0000 + +khangman (4:4.11.95-0ubuntu1) trusty; urgency=low + + * New upstream beta release + + -- Rohan Garg <[email protected]> Mon, 25 Nov 2013 18:06:44 +0100 + +khangman (4:4.11.80-0ubuntu1) trusty; urgency=low + + * New upstream beta release + + -- Rohan Garg <[email protected]> Sat, 23 Nov 2013 17:41:18 +0100 + +khangman (4:4.11.3-1) unstable; urgency=low +>>>>>>> debian/changelog * New upstream release. * Update build dependencies. +<<<<<<< debian/changelog -- Maximiliano Curia <[email protected]> Fri, 08 Nov 2013 15:23:31 +0100 klettres (4:4.11.2-1) experimental; urgency=low @@ -305,6 +606,30 @@ klettres (4:4.11.1-0ubuntu1) saucy; urgency=low -- Philip Muškovac <[email protected]> Fri, 06 Sep 2013 22:25:07 +0100 klettres (4:4.11.0-0ubuntu1) saucy; urgency=low +======= + -- Maximiliano Curia <[email protected]> Fri, 08 Nov 2013 15:24:08 +0100 + +khangman (4:4.11.2-1) experimental; urgency=low + + * New upstream release. + * Update install files. + + -- Maximiliano Curia <[email protected]> Mon, 07 Oct 2013 16:53:17 +0200 + +khangman (4:4.11.2-0ubuntu1) saucy; urgency=low + + * New upstream bugfix release + + -- Jonathan Riddell <[email protected]> Mon, 30 Sep 2013 14:25:54 +0100 + +khangman (4:4.11.1-0ubuntu1) saucy; urgency=low + + * New upstream bugfix release. + + -- Philip Muškovac <[email protected]> Fri, 06 Sep 2013 22:23:36 +0100 + +khangman (4:4.11.0-0ubuntu1) saucy; urgency=low +>>>>>>> debian/changelog [ Howard Chan ] * New upstream release @@ -312,6 +637,7 @@ klettres (4:4.11.0-0ubuntu1) saucy; urgency=low [ Jonathan Riddell ] * New upstream release +<<<<<<< debian/changelog -- Jonathan Riddell <[email protected]> Wed, 14 Aug 2013 00:19:04 +0100 klettres (4:4.10.97-0ubuntu1) saucy; urgency=low @@ -347,11 +673,51 @@ klettres (4:4.10.5-1) unstable; urgency=low klettres (4:4.10.4-1) experimental; urgency=low * New upstream release. +======= + -- Jonathan Riddell <[email protected]> Wed, 14 Aug 2013 00:16:40 +0100 + +khangman (4:4.10.97-0ubuntu1) saucy; urgency=low + + * New upstream RC 2 release + + -- Jonathan Riddell <[email protected]> Fri, 26 Jul 2013 19:35:53 +0100 + +khangman (4:4.10.95-0ubuntu1) saucy; urgency=low + + * New upstream RC release + + -- Rohan Garg <[email protected]> Fri, 19 Jul 2013 12:32:31 +0000 + +khangman (4:4.10.90-0ubuntu1) saucy; urgency=low + + * New upstream bet release + + -- Michał Zając <[email protected]> Fri, 28 Jun 2013 18:15:10 +0100 + +khangman (4:4.10.80-0ubuntu1) saucy; urgency=low + + * New upstream release + + -- Rohan Garg <[email protected]> Fri, 21 Jun 2013 01:18:45 +0100 + +khangman (4:4.10.5-1) unstable; urgency=low + + * New upstream release. + + -- Maximiliano Curia <[email protected]> Fri, 12 Jul 2013 16:46:01 +0200 + +khangman (4:4.10.4-1) experimental; urgency=low + + * New upstream release. + * Add watch file. + * Update install file. +>>>>>>> debian/changelog * Bump debhelper build-dep and compat to 9. * Bump Standards-Version to 3.9.4. * Update vcs fields. * Add myself to uploaders. +<<<<<<< debian/changelog -- Maximiliano Curia <[email protected]> Fri, 14 Jun 2013 14:31:21 +0200 klettres (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low @@ -442,11 +808,124 @@ klettres (4:4.9.1-0ubuntu1) quantal; urgency=low -- Harald Sitter <[email protected]> Mon, 10 Sep 2012 18:33:50 +0530 klettres (4:4.9.0-0ubuntu1) quantal; urgency=low +======= + -- Maximiliano Curia <[email protected]> Fri, 14 Jun 2013 14:31:50 +0200 + +khangman (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low + + [ Rohan Garg ] + * New upstream bugfix release + + [ Jonathan Riddell ] + * update not-installed + + -- Rohan Garg <[email protected]> Fri, 07 Jun 2013 00:33:10 +0100 + +khangman (4:4.10.3-0ubuntu1) saucy; urgency=low + + * New upstream release + * Merge with Debian, no changes remaining + + -- Jonathan Riddell <[email protected]> Thu, 23 May 2013 11:04:40 +0000 + +khangman (4:4.10.2-1) experimental; urgency=low + + * New upstream release. + * Update uploaders. + * Bump build-deps. + * Update install-file. + + -- Sune Vuorela <[email protected]> Sun, 07 Apr 2013 16:49:01 +0000 + +khangman (4:4.10.2-0ubuntu1) raring; urgency=low + + * New upstream bugfix release + + -- Philip Muškovac <[email protected]> Sun, 31 Mar 2013 14:49:07 +0200 + +khangman (4:4.10.1-0ubuntu1) raring-proposed; urgency=low + + * New upstream bugfix release + + -- Philip Muškovac <[email protected]> Tue, 05 Mar 2013 15:46:17 +0000 + +khangman (4:4.10.0-0ubuntu1) raring-proposed; urgency=low + + * New upstream release + + -- Rohan Garg <[email protected]> Wed, 06 Feb 2013 11:54:32 +0000 + +khangman (4:4.9.98-0ubuntu1) raring-proposed; urgency=low + + * New upstream release candidate + + -- Jonathan Riddell <[email protected]> Fri, 18 Jan 2013 15:38:01 +0000 + +khangman (4:4.9.97-0ubuntu1) raring; urgency=low + + * New upstream release candidate + + -- Philip Muškovac <[email protected]> Thu, 03 Jan 2013 22:35:44 +0100 + +khangman (4:4.9.95-0ubuntu1) raring; urgency=low + + * New upstream RC release + + -- Jonathan Riddell <[email protected]> Tue, 18 Dec 2012 23:30:30 +0000 + +khangman (4:4.9.90-0ubuntu1) raring-proposed; urgency=low + + * New upstream beta release + + -- Jonathan Riddell <[email protected]> Fri, 07 Dec 2012 17:54:34 +0000 + +khangman (4:4.9.80-0ubuntu1) raring; urgency=low + + [ Jonathan Riddell ] + * New upstream beta release + + [ Philip Muškovac ] + * Remove duplicate copyright field to make lintian happy + + -- Philip Muškovac <[email protected]> Fri, 23 Nov 2012 23:29:53 +0100 + +khangman (4:4.9.3-0ubuntu1) raring; urgency=low + + * New upstream release (LP: #1074747) + + -- Philip Muškovac <[email protected]> Tue, 06 Nov 2012 22:36:48 +0100 + +khangman (4:4.9.2-0ubuntu1) quantal-proposed; urgency=low + + * New upstream bugfix release + + -- Jonathan Riddell <[email protected]> Tue, 02 Oct 2012 15:28:11 +0100 + +khangman (4:4.9.1-0ubuntu1) quantal; urgency=low + + [ Harald Sitter ] + * New upstream release + + [ Philip Muškovac ] + * Change sonames from 4.9.0 to 4.9.* + + -- Harald Sitter <[email protected]> Mon, 10 Sep 2012 18:32:54 +0530 + +khangman (4:4.9.0-0ubuntu2) quantal; urgency=low + + * Build-dep on kdelibs 4.9.0a, adjust .install files to new library + version no + + -- Jonathan Riddell <[email protected]> Thu, 02 Aug 2012 11:57:52 +0100 + +khangman (4:4.9.0-0ubuntu1) quantal; urgency=low +>>>>>>> debian/changelog * Use direct build-depends versions rather than kde-sc-dev-latest * New upstream release * New upstream release +<<<<<<< debian/changelog -- Jonathan Riddell <[email protected]> Thu, 26 Jul 2012 22:27:26 +0100 klettres (4:4.8.90-0ubuntu1) quantal; urgency=low @@ -516,20 +995,108 @@ klettres (4:4.7.4-2) unstable; urgency=low -- Pino Toscano <[email protected]> Wed, 07 Mar 2012 11:57:11 +0100 klettres (4:4.7.4-1) experimental; urgency=low +======= + -- Jonathan Riddell <[email protected]> Thu, 26 Jul 2012 22:26:10 +0100 + +khangman (4:4.8.90-0ubuntu1) quantal; urgency=low + + [ Felix Geyer ] + * New upstream beta release. + + [ Jonathan Riddell ] + * Install new files + + -- Felix Geyer <[email protected]> Mon, 11 Jun 2012 23:29:58 +0200 + +khangman (4:4.8.80-0ubuntu1) quantal; urgency=low + + * New upstream release + + -- Jonathan Riddell <[email protected]> Wed, 06 Jun 2012 14:07:37 +0100 + +khangman (4:4.8.4-1) unstable; urgency=low + + * Prepare new upstream + + -- Sune Vuorela <[email protected]> Sun, 17 Jun 2012 00:34:51 +0200 + +khangman (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 <[email protected]> Thu, 03 May 2012 10:19:57 +0200 + +khangman (4:4.8.2-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Philip Muškovac <[email protected]> Mon, 02 Apr 2012 00:01:01 +0200 + +khangman (4:4.8.1-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Philip Muškovac <[email protected]> Sun, 04 Mar 2012 20:28:30 +0100 + +khangman (4:4.8.0-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Jonathan Riddell <[email protected]> Fri, 20 Jan 2012 12:10:30 +0000 + +khangman (4:4.7.97-0ubuntu1) precise; urgency=low + + * New upstream release candidate + + -- Jonathan Riddell <[email protected]> Thu, 05 Jan 2012 12:18:27 +0000 + +khangman (4:4.7.95-0ubuntu1) precise; urgency=low + + * New upstream release candidate + + -- Philip Muškovac <[email protected]> Sat, 24 Dec 2011 20:21:25 +0100 + +khangman (4:4.7.90-0ubuntu1) precise; urgency=low + + * New upstream beta release + + -- Jonathan Riddell <[email protected]> Fri, 16 Dec 2011 13:14:40 +0000 + +khangman (4:4.7.4-2) unstable; urgency=low + + * Team upload. Upload to unstable. + + -- Pino Toscano <[email protected]> Wed, 07 Mar 2012 11:39:27 +0100 + +khangman (4:4.7.4-1) experimental; urgency=low +>>>>>>> debian/changelog * New upstream release. [ José Manuel Santamaría Lema ] * Bump kde-sc-dev-latest build dependency to 4:4.7.4. +<<<<<<< debian/changelog * Add myself to Uploaders. -- Debian Qt/KDE Maintainers <[email protected]> Sun, 18 Dec 2011 01:39:17 +0100 klettres (4:4.7.3-0ubuntu1) precise; urgency=low +======= + + [ Eshat Cakar ] + * Depend on new fonts-dustin package. + + -- Debian Qt/KDE Maintainers <[email protected]> Sun, 18 Dec 2011 01:38:30 +0100 + +khangman (4:4.7.3-0ubuntu1) precise; urgency=low +>>>>>>> debian/changelog * New upstream release * Merge with Debian Git, no changes +<<<<<<< debian/changelog -- Jonathan Riddell <[email protected]> Wed, 23 Nov 2011 23:47:01 +0000 klettres (4:4.7.2-1) experimental; urgency=low @@ -545,10 +1112,28 @@ klettres (4:4.7.2-0r1) raring; urgency=low -- Debian Qt/KDE Maintainers <[email protected]> Mon, 24 Oct 2011 23:09:13 +0200 klettres (4:4.7.1-0ubuntu2) oneiric; urgency=low +======= + -- Jonathan Riddell <[email protected]> Wed, 23 Nov 2011 23:47:00 +0000 + +khangman (4:4.7.2-1) experimental; urgency=low + + * Initial release. Start from the Kubuntu packaging, thanks! + + -- Debian Qt/KDE Maintainers <[email protected]> Sat, 03 Dec 2011 10:42:24 -0300 + +khangman (4:4.7.2-0r2) raring; urgency=low + + * Initial release. Start from the Kubuntu packaging, thanks! + + -- Debian Qt/KDE Maintainers <[email protected]> Sat, 22 Oct 2011 00:10:57 +0200 + +khangman (4:4.7.1-0ubuntu2) oneiric; urgency=low +>>>>>>> debian/changelog * No-change rebuild so translations aren't stripped from .desktop files anymore. +<<<<<<< debian/changelog -- Felix Geyer <[email protected]> Fri, 16 Sep 2011 01:00:52 +0200 klettres (4:4.7.1-0ubuntu1) oneiric; urgency=low @@ -573,3 +1158,25 @@ klettres (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low * Add copyright information for scripts/klettresl10n.rb. -- Harald Sitter <[email protected]> Sun, 10 Jul 2011 11:43:45 +0200 +======= + -- Felix Geyer <[email protected]> Fri, 16 Sep 2011 00:55:17 +0200 + +khangman (4:4.7.1-0ubuntu1) oneiric; urgency=low + + * New upstream release + + -- Jonathan Kolberg <[email protected]> Fri, 09 Sep 2011 23:33:04 -0400 + +khangman (4:4.7.0-0ubuntu1) oneiric; urgency=low + + * New upstream release + + -- Harald Sitter <[email protected]> Sat, 23 Jul 2011 14:54:56 +0200 + +khangman (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low + + * Initial release (moved out of kdeedu) + * Repack upstream source to include a copy of GFDL1.2 + + -- Harald Sitter <[email protected]> Sun, 10 Jul 2011 11:55:40 +0200 +>>>>>>> debian/changelog diff --git a/debian/control b/debian/control index c09b46e..e11f444 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,15 @@ +<<<<<<< debian/control Source: klettres +======= +Source: khangman +>>>>>>> debian/control Section: kde Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers <[email protected]> Uploaders: Eshat Cakar <[email protected]>, Sune Vuorela <[email protected]>, Maximiliano Curia <[email protected]> +<<<<<<< debian/control Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), extra-cmake-modules (>= 1.7.0~), @@ -49,5 +54,46 @@ Depends: ${misc:Depends} Description: data files for KLettres foreign alphabet tutor This package contains architecture-independent data files for KLettres, the foreign alphabet tutor for KDE. +======= +Build-Depends: cmake (>= 2.8.12), + debhelper (>= 9), + extra-cmake-modules (>= 1.7.0~), + kdoctools-dev, + kio-dev, + libkeduvocdocument-dev, + libkf5completion-dev, + libkf5config-dev, + libkf5configwidgets-dev, + libkf5coreaddons-dev, + libkf5crash-dev, + libkf5declarative-dev, + libkf5i18n-dev, + libkf5newstuff-dev, + libkf5notifications-dev, + libkf5xmlgui-dev, + libphonon4qt5-dev (>= 4.6.60), + libphonon4qt5experimental-dev, + libqt5svg5-dev (>= 5.4), + pkg-kde-tools (>> 0.15.15), + qtbase5-dev (>= 5.4), + qtdeclarative5-dev (>= 5.4) +Standards-Version: 3.9.6 +Homepage: http://edu.kde.org/ +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/khangman +Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/khangman + +Package: khangman +Architecture: any +Section: misc +Depends: fonts-dustin, kdeedu-kvtml-data, ${misc:Depends}, ${shlibs:Depends} +Suggests: khelpcenter +Description: Hangman word puzzle + KHangMan is the well-known Hangman game, aimed towards children aged 6 and + above. + . + It picks a random word which the player must reveal by guessing if it contains + certain letters. As the player guesses letters, the word is gradually + revealed, but 10 wrong guesses will end the game. +>>>>>>> debian/control . This package is part of the KDE education module. diff --git a/debian/copyright b/debian/copyright index a646720..bfcead3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,4 @@ +<<<<<<< debian/copyright Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: KLettres Upstream-Contact: [email protected] @@ -38,10 +39,63 @@ License: LGPL-2 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License version 2 as published by the Free Software Foundation; +======= +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: khangman +Upstream-Contact: [email protected] +Source: git://anongit.kde.org/khangman + +Files: * +Copyright: 2010, Adam Rakowski <[email protected]> (GSoC 2010) + 2006, Anne-Marie Mahfouf + 2001-2010, Anne-Marie Mahfouf <[email protected]> + 2003, Dustin Norlander + 1989-1991, Free Software Foundation, Inc + 2012, Laszlo Papp <[email protected]> + 2011, Marco Martin <[email protected]> + 2005, Mark Kretschmann <[email protected]> + 2005, Michael Goettsche + 2007-2010, Pino Toscano <[email protected]> + 2011, Sebastian Kügler <[email protected]> +License: GPL-2+ + +Files: doc/* +Copyright: 2001-2007, Anne-Marie Mahfouf <[email protected]> +License: GFDL-1.2+ + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + . + On Debian systems, the full text of the GNU Free Documentation License + version 1.2 can be found in the file `/usr/share/common-licenses/GFDL-1.2'. + +Files: src/harmattan/GamePage.qml + src/harmattan/LetterElement.qml + src/harmattan/ListItem.qml + src/harmattan/MainPage.qml + src/harmattan/MainSettingsPage.qml + src/harmattan/khangmanenginehelper.cpp + src/harmattan/khangmanenginehelper.h + src/harmattan/main.cpp + src/harmattan/main.qml + src/plasma-active/src/main.cpp + src/plasma-active/src/mainwindow.cpp + src/plasma-active/src/mainwindow.h +Copyright: 2011-2012, Laszlo Papp <[email protected]> + 2011, Marco Martin <[email protected]> + 2011, Sebastian Kügler <[email protected]> +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. +>>>>>>> debian/copyright . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +<<<<<<< debian/copyright Library General Public License for more details. . You should have received a copy of the GNU Library General Public @@ -69,6 +123,54 @@ License: LGPL-2+ along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +======= + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU Lesser General Public License + version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'. + +Files: src/engine/cmake/FindKHangManEngine.cmake + src/harmattan/CommonDialog.qml + src/harmattan/MySelectionDialog.qml + src/harmattan/UIConstants.js +Copyright: 2012, Laszlo Papp + 2011, Nokia Corporation and/or its subsidiary(-ies) +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor + the names of its contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: debian/* +Copyright: 2011, Debian Qt/KDE Maintainers <[email protected]> + 2011, Harald Sitter <[email protected]> +License: GPL-2+ +>>>>>>> debian/copyright License: GPL-2+ This program is free software; you can redistribute it @@ -91,6 +193,7 @@ License: GPL-2+ On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. +<<<<<<< debian/copyright License: GFDL-NIV-1.2+ Permission is granted to copy, distribute and/or modify this document under @@ -100,3 +203,5 @@ License: GFDL-NIV-1.2+ . On Debian systems, the complete text of the GNU Free Documentation License version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'. +======= +>>>>>>> debian/copyright diff --git a/debian/khangman.install b/debian/khangman.install new file mode 100644 index 0000000..70e5800 --- /dev/null +++ b/debian/khangman.install @@ -0,0 +1,9 @@ +etc/xdg/khangman.knsrc +usr/bin/khangman +usr/share/applications/org.kde.khangman.desktop +usr/share/config.kcfg/khangman.kcfg +usr/share/doc/HTML/*/khangman/ +usr/share/icons/*/*/apps/khangman.* +usr/share/icons/*/*/apps/khangman-harmattan.* +usr/share/khangman/ +usr/share/metainfo diff --git a/debian/khangman.lintian-overrides b/debian/khangman.lintian-overrides new file mode 100644 index 0000000..a6638cf --- /dev/null +++ b/debian/khangman.lintian-overrides @@ -0,0 +1,3 @@ +# Font files are in not-installed, so we can ignore these lintian warning +khangman: duplicate-font-file usr/share/khangman/fonts/Domestic_Manners.ttf also in fonts-dustin +khangman: duplicate-font-file usr/share/khangman/fonts/Dustismo_Roman.ttf also in fonts-dustin diff --git a/debian/khangman.manpages b/debian/khangman.manpages new file mode 100644 index 0000000..6f2529c --- /dev/null +++ b/debian/khangman.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man6/khangman.6 diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 0000000..e8c8a6a --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,11 @@ +# Shipped in fonts-dustin +./usr/share/khangman/fonts/Domestic_Manners.ttf +./usr/share/khangman/fonts/Dustismo_Roman.ttf + +# Manpages are compressed +./usr/share/man/man6/khangman.6 + +# khangman-harmattan (qml version) not built, off upstream +# https://bugs.kde.org/show_bug.cgi?id=344834 +./usr/share/icons/hicolor/80x80/apps/khangman-harmattan.png +./usr/share/icons/hicolor/scalable/apps/khangman-harmattan.svgz diff --git a/debian/rules b/debian/rules index 9ca54cc..1989032 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,11 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +<<<<<<< debian/rules override_dh_auto_test: # Disable dh_auto_test at build time : +======= +override_dh_auto_install: + $(overridden_command) --destdir=debian/tmp +>>>>>>> debian/rules diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..2ee6f0f --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +abort-on-upstream-changes diff --git a/debian/watch b/debian/watch index 85404dd..a08b414 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,7 @@ version=3 +<<<<<<< debian/watch http://download.kde.org/stable/applications/([\d.]+)/src/klettres-([\d.]+).tar.xz http://download.kde.org/unstable/applications/([\d.]+)/src/klettres-([\d.]+).tar.xz +======= +http://download.kde.org/stable/applications/([\d.]+)/src/khangman-([\d.]+).tar.xz +>>>>>>> debian/watch
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
