[SCM] khangman packaging branch, master, updated. debian/4.14.1-1-21-g6665a06

Maximiliano Curia maxy at moszumanska.debian.org
Tue Feb 24 16:25:22 UTC 2015 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/khangman.git;a=commitdiff;h=8d052f7

The following commit has been merged in the master branch:
commit 8d052f7342d67b68727a1f13d1069d36c8afd313
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Fri Dec 12 10:06:49 2014 -0800

    Initial release for KDE applications 14.12 series
    
    * 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.
---
 debian/changelog        | 63 +++++++++++++++++++++++++++++++++++++++++++++----
 debian/control          | 31 +++++++++++++++---------
 debian/copyright        |  4 ++--
 debian/khangman.install | 20 ++++++++--------
 debian/rules            |  2 +-
 debian/watch            |  4 +++-
 6 files changed, 94 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c44b031..fab8873 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+khangman (4:14.12.0-0ubuntu1) UNRELEASED; 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. 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 25 Nov 2014 19:22:14 +0000
+
+khangman (4:4.14.2-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Oct 2014 05:08:13 -0700
+
 khangman (4:4.14.1-1ubuntu1) UNRELEASED; urgency=medium
 
   * Remove kdelibs5-dev depend version as there was not a new release.
@@ -11,6 +29,12 @@ khangman (4:4.14.1-1) unstable; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 17 Sep 2014 09:44:36 +0200
 
+khangman (4:4.14.1-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 22 Sep 2014 17:14:56 +0200
+
 khangman (4:4.14.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -18,6 +42,34 @@ khangman (4:4.14.0-1) unstable; urgency=medium
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 22 Aug 2014 05:24:28 +0200
 
+khangman (4:4.14.0-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Aug 2014 13:09:01 +0200
+
+khangman (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release RC
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 01 Aug 2014 16:47:50 +0200
+
+khangman (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Wed, 30 Jul 2014 18:17:25 +0200
+
+khangman (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+  [ Scarlett Clark ]
+  * New upstream beta release
+
+  [ Jonathan Riddell ]
+  * Add appdata file to .install
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 23:07:18 +0200
+
 khangman (4:4.13.3-1) unstable; urgency=medium
 
   * New upstream release.
@@ -268,7 +320,7 @@ khangman (4:4.9.80-0ubuntu1) raring; urgency=low
   * New upstream beta release
 
   [ Philip Muškovac ]
-  * Remove duplicate copyright field to make lintian happy
+  * Remove duplicate copyright field to make lintian happy 
 
  -- Philip Muškovac <yofel at kubuntu.org>  Fri, 23 Nov 2012 23:29:53 +0100
 
@@ -290,7 +342,7 @@ khangman (4:4.9.1-0ubuntu1) quantal; urgency=low
   * New upstream release
 
   [ Philip Muškovac ]
-  * Change sonames from 4.9.0 to 4.9.*
+  * Change sonames from 4.9.0 to 4.9.* 
 
  -- Harald Sitter <apachelogger at ubuntu.com>  Mon, 10 Sep 2012 18:32:54 +0530
 
@@ -347,7 +399,7 @@ khangman (4:4.8.2-0ubuntu1) precise; urgency=low
 
 khangman (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 20:28:30 +0100
 
@@ -383,8 +435,8 @@ khangman (4:4.7.4-2) unstable; urgency=low
 
 khangman (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.
 
@@ -437,3 +489,4 @@ khangman (4:4.6.90+repack-0ubuntu1) oneiric; urgency=low
   * Repack upstream source to include a copy of GFDL1.2
 
  -- Harald Sitter <apachelogger at ubuntu.com>  Sun, 10 Jul 2011 11:55:40 +0200
+
diff --git a/debian/control b/debian/control
index bd25baf..d171e65 100644
--- a/debian/control
+++ b/debian/control
@@ -1,29 +1,38 @@
 Source: khangman
 Section: kde
 Priority: optional
-Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-X-Ubuntu-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Eshat Cakar <info at eshat.de>,
            Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.11),
-               kdelibs5-dev (>= 4:4.11),
-               libkdeedu-dev (>= 4:4.11),
-               pkg-kde-tools (>= 0.12)
+               extra-cmake-modules (>= 1.2.0),
+               kdoctools-dev,
+               libkeduvocdocument-dev,
+               libkf5completion-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5crash-dev,
+               libkf5i18n-dev,
+               libkf5newstuff-dev,
+               libkf5notifications-dev,
+               libkf5xmlgui-dev,
+               libphonon4qt5-dev,
+               libphonon4qt5experimental-dev,
+               pkg-kde-tools,
+               qtbase5-dev
 Standards-Version: 3.9.5
 Homepage: http://edu.kde.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/khangman.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/khangman.git
-X-Ubuntu-Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
-X-Ubuntu-Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-applications/khangman.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/khangman.git
 
 Package: khangman
 Architecture: any
 Section: misc
 Depends: fonts-dustin, kdeedu-kvtml-data, ${misc:Depends}, ${shlibs:Depends}
-Suggests: khelpcenter4
+Suggests: khelpcenter
 Description: Hangman word puzzle
  KHangMan is the well-known Hangman game, aimed towards children aged 6 and
  above.
diff --git a/debian/copyright b/debian/copyright
index dbcc850..1c605da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/copyright-format/1.0
 Upstream-Name: KHangMan
 Upstream-Contact: kde-edu at mail.kde.org
-Source: ftp.kde.org
+Source: download.kde.org
 
 Files: *
 Copyright: 2001-2009, Anne-Marie Mahfouf <annma at kde.org>
@@ -39,7 +39,7 @@ License: GFDL-1.2+
 
 Files: debian/*
 Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
+           2011, Harald Sitter <apachelogger at ubuntu.com>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/khangman.install b/debian/khangman.install
index c07539b..5a28908 100644
--- a/debian/khangman.install
+++ b/debian/khangman.install
@@ -1,18 +1,18 @@
+etc/
 usr/bin/khangman
-usr/lib/libkhangmanengine.so.*
+usr/lib/*/libkhangmanengine.so.*
 usr/share/appdata/khangman.appdata.xml
-usr/share/applications/kde4/khangman.desktop
-usr/share/doc/kde/HTML/en/khangman/
-usr/share/icons/hicolor/128x128/apps/khangman.png
+usr/share/applications/org.kde.khangman.desktop
+usr/share/config.kcfg/khangman.kcfg
+usr/share/doc/HTML/en/khangman/
 usr/share/icons/hicolor/16x16/apps/khangman.png
 usr/share/icons/hicolor/22x22/apps/khangman.png
 usr/share/icons/hicolor/32x32/apps/khangman.png
 usr/share/icons/hicolor/48x48/apps/khangman.png
 usr/share/icons/hicolor/64x64/apps/khangman.png
+usr/share/icons/hicolor/80x80/apps/khangman-harmattan.png
 usr/share/icons/hicolor/scalable/apps/khangman.svgz
-usr/share/kde4/apps/khangman/khangmanui.rc
-usr/share/kde4/apps/khangman/pics/
-usr/share/kde4/apps/khangman/sounds/
-usr/share/kde4/config.kcfg/khangman.kcfg
-usr/share/kde4/config/khangman.knsrc
-usr/share/man/man6/khangman.6
+usr/share/khangman/pics
+usr/share/khangman/sounds
+usr/share/khangman/themes
+usr/share/kxmlgui5/khangman/khangmanui.rc
diff --git a/debian/rules b/debian/rules
index 244905c..f1f412f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/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_install:
 	$(overridden_command) --destdir=debian/tmp
diff --git a/debian/watch b/debian/watch
index ea8cbb5..ead2527 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
 version=3
-http://download.kde.org/stable/([\d.]+)/src/khangman-([\d.]+).tar.xz
+http://download.kde.org/stable/applications/([\d.]+)/src/khangman-([\d.]+).tar.xz
+
+http://download.kde.org/unstable/applications/([\d.]+)/src/khangman-([\d.]+).tar.xz

-- 
khangman packaging

More information about the pkg-kde-commits mailing list