[SCM] kanagram packaging branch, master, updated. debian/4.12.4-1-129-ge3fc3ea

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d149f95655aece5ab8ab3c725a99c1edc97f6bff
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Tue Jun 3 20:44:07 2014 +0200

    * Merge with debian, no remaining changes
---
 debian/changelog        | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 debian/compat           |  2 +-
 debian/control          | 22 ++++++++++-----------
 debian/kanagram.install |  2 +-
 debian/watch            |  2 ++
 5 files changed, 66 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4150e1f..2dd7438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kanagram (4:4.13.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Merge with debian, no remaining changes
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 03 Jun 2014 20:43:06 +0200
+
 kanagram (4:4.13.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream KDE Software Compilation release
@@ -22,12 +28,26 @@ kanagram (4:4.12.90-0ubuntu1) trusty; urgency=medium
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 10:37:22 +0000
 
+kanagram (4:4.12.4-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Apr 2014 12:25:39 +0200
+
 kanagram (4:4.12.3-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 20:30:00 +0100
 
+kanagram (4:4.12.2-1) experimental; urgency=medium
+
+  * Bump Standards-Version to 3.9.5, no changes needed.
+  * New upstream release.
+  * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Feb 2014 11:32:37 +0100
+
 kanagram (4:4.12.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream bugfix release
@@ -64,6 +84,19 @@ kanagram (4:4.11.80-0ubuntu1) trusty; urgency=low
 
  -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:28:00 +0100
 
+kanagram (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:23:44 +0100
+
+kanagram (4:4.11.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 07 Oct 2013 16:52:48 +0200
+
 kanagram (4:4.11.2-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release
@@ -115,6 +148,24 @@ kanagram (4:4.10.80-0ubuntu1) saucy; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 21 Jun 2013 00:47:53 +0100
 
+kanagram (4:4.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jul 2013 16:42:59 +0200
+
+kanagram (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:00 +0200
+
 kanagram (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
 
   * New upstream bugfix release
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 9738c5b..46cf655 100644
--- a/debian/control
+++ b/debian/control
@@ -4,26 +4,26 @@ 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: debhelper (>= 7.3.16),
- cmake,
- pkg-kde-tools (>= 0.14),
- kde-sc-dev-latest (>= 4:4.10),
- 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.12),
+               libkdeedu-dev (>= 4:4.11),
+               pkg-kde-tools (>= 0.14)
+Standards-Version: 3.9.5
 Homepage: https://projects.kde.org/projects/kde/kdeedu/kanagram
 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
 Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kanagram
-X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kanagram.git
-X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/kanagram.git
+X-Vcs-Debian-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kanagram.git
+X-Vcs-Debian-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kanagram.git
 
 Package: kanagram
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kdeedu-kvtml-data
+Depends: kdeedu-kvtml-data, ${misc:Depends}, ${shlibs:Depends}
 Suggests: khelpcenter4
 Description: jumble word puzzle
  KAnagram is a game where a random word is shown with its letters scrambled.
  To win, the player must rearrange the letters into the correct order.
  .
  This package is part of the KDE education module
-
diff --git a/debian/kanagram.install b/debian/kanagram.install
index 988d6e0..81b38ce 100644
--- a/debian/kanagram.install
+++ b/debian/kanagram.install
@@ -1,5 +1,5 @@
 usr/bin/kanagram
-usr/lib/libkanagramengine.so.4*
+usr/lib/libkanagramengine.so.*
 usr/share/applications/kde4/kanagram.desktop
 usr/share/doc/kde/HTML/en/kanagram/answer-highlight.png
 usr/share/doc/kde/HTML/en/kanagram/common
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b5e26f8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kde.org/pub/kde/stable/([\d\.]*)/src/kanagram-([\d\.]*).tar.xz

-- 
kanagram packaging