[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=9c67464

The following commit has been merged in the master branch:
commit 9c674641e9ba03b559fec55d068b62ab672f2312
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Thu Nov 24 15:42:07 2011 +0000

    * Merge with Debian, no changes
    [ Eshat Cakar ]
    * Initial release. Start from the Kubuntu packaging, thanks!
---
 debian/.gitattributes |  1 +
 debian/changelog      | 13 ++++++++++---
 debian/control        | 19 ++++++++++++-------
 debian/copyright      |  1 +
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 708b76c..64b07f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-kanagram (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
+kanagram (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
-  * kanagram needs to depend on kdeedu-kvtml-data
+  * Merge with Debian, no changes
 
- -- Philip Muškovac <yofel at kubuntu.org>  Sun, 30 Oct 2011 19:38:28 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:46:57 +0000
+
+kanagram (4:4.7.2-0r1) UNRELEASED; urgency=low
+
+  [ Eshat Cakar ]
+  * Initial release. Start from the Kubuntu packaging, thanks!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 26 Oct 2011 17:44:12 +0200
 
 kanagram (4:4.7.1-0ubuntu2) oneiric; urgency=low
 
diff --git a/debian/control b/debian/control
index 1de07a1..0b835dc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,25 @@
 Source: kanagram
 Section: misc
-Priority: extra
+Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~),
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Eshat Cakar <info at eshat.de>
+Build-Depends: debhelper (>= 7.3.16),
  cmake,
  pkg-kde-tools (>= 0.14),
- kde-sc-dev-latest (>= 4:4.7.3),
+ kde-sc-dev-latest (>= 4:4.7.2),
  libkdeedu-dev (>= 4:4.7)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 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
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kanagram/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kanagram/ubuntu
+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
 
 Package: kanagram
-Section: misc
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kdeedu-kvtml-data
+Suggests: khelpcenter4
 Description: jumble word puzzle for KDE
  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.
@@ -24,6 +28,7 @@ Description: jumble word puzzle for KDE
 
 Package: kanagram-dbg
 Section: debug
+Priority: extra
 Architecture: any
 Breaks: kdeedu-dbg (<= 4:4.6.80)
 Replaces: kdeedu-dbg (<= 4:4.6.80)
diff --git a/debian/copyright b/debian/copyright
index 55bb2ac..eeefc6f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,6 +37,7 @@ License: GFDL-1.2
 
 Files: debian/*
 Copyright: 2011 Rohan Garg <rohangarg at kubuntu.org>
+Copyright: 2011 Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
kanagram packaging