[SCM] khangman packaging branch, master, updated. debian/4.13.1-1-126-gaf8e271

Thu Aug 14 12:08:59 UTC 2014

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/khangman.git;a=commitdiff;h=0ab0a04

The following commit has been merged in the master branch:
commit 0ab0a049b6de489487b930240b0c20a20d69dfe6
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Mon Jun 16 17:14:52 2014 +0200

    * Merge with Debian, no remaining changes
---
 debian/changelog            | 52 +++++++++++++++++++++++++++++++++++++++++++++
 debian/compat               |  2 +-
 debian/control              | 20 ++++++++++-------
 debian/khangman.install     |  2 +-
 debian/source/local-options |  1 +
 debian/watch                |  2 ++
 6 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0dcb82c..0afd0c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+khangman (4:4.13.1-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge with Debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 16 Jun 2014 17:03:36 +0200
+
+khangman (4:4.13.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 23 May 2014 12:28:18 +0200
+
 khangman (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -22,6 +34,14 @@ khangman (4:4.12.90-0ubuntu1) trusty; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  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 <maxy at debian.org>  Mon, 28 Apr 2014 12:24:48 +0200
+
 khangman (4:4.12.3-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
@@ -64,6 +84,20 @@ khangman (4:4.11.80-0ubuntu1) trusty; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:41:18 +0100
 
+khangman (4:4.11.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org>  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 <maxy at debian.org>  Mon, 07 Oct 2013 16:53:17 +0200
+
 khangman (4:4.11.2-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release
@@ -110,6 +144,24 @@ khangman (4:4.10.80-0ubuntu1) saucy; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:18:45 +0100
 
+khangman (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  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.
+  * Bump debhelper build-dep and compat to 9.
+  * Bump Standards-Version to 3.9.4.
+  * Update vcs fields.
+  * Add myself to uploaders.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 14:31:50 +0200
+
 khangman (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
 
   [ Rohan Garg ]
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index c436dde..ee3c0c1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,21 +4,25 @@ Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Eshat Cakar <info at eshat.de>,
- Sune Vuorela <sune at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.10),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.13.0), libkdeedu-dev (>= 4:4.13.0)
-Standards-Version: 3.9.2
+           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)
+Standards-Version: 3.9.5
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/khangman
-X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/khangman.git
-X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/khangman.git
+X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/khangman.git
+X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/khangman.git
 
 Package: khangman
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}, fonts-dustin, kdeedu-kvtml-data
+Depends: fonts-dustin, kdeedu-kvtml-data, ${misc:Depends}, ${shlibs:Depends}
 Suggests: khelpcenter4
 Description: Hangman word puzzle
  KHangMan is the well-known Hangman game, aimed towards children aged 6 and
diff --git a/debian/khangman.install b/debian/khangman.install
index 5dd73f5..86145eb 100644
--- a/debian/khangman.install
+++ b/debian/khangman.install
@@ -1,5 +1,5 @@
 usr/bin/khangman
-usr/lib/libkhangmanengine.so.4*
+usr/lib/libkhangmanengine.so.*
 usr/share/applications/kde4/khangman.desktop
 usr/share/doc/kde/HTML/en/khangman/
 usr/share/icons/hicolor/128x128/apps/khangman.png
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
new file mode 100644
index 0000000..2e41a55
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/khangman-([\d\.]*).tar.xz

-- 
khangman packaging

