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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 237c4278cc5aba9655b4aa60176f2f29bdfcf037
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Fri Nov 25 17:40:28 2011 +0000

    * Merge with Debian Git, no changes
    * Initial release. Start from the Kubuntu packaging, thanks!
---
 debian/.gitattributes           |  1 +
 debian/changelog                | 11 +++++++++--
 debian/control                  | 12 ++++++++----
 debian/copyright                |  1 +
 debian/khangman.install         | 16 ++++++++++++++++
 debian/not-installed            |  6 ++++++
 debian/rules                    |  3 +++
 debian/source/lintian-overrides |  1 -
 debian/source/local-options     |  1 +
 9 files changed, 45 insertions(+), 7 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 f8a660a..aec63d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-khangman (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
+khangman (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
+  * Merge with Debian Git, no changes
 
- -- Philip Muškovac <yofel at kubuntu.org>  Tue, 01 Nov 2011 14:21:55 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:47:00 +0000
+
+khangman (4:4.7.2-0r2) UNRELEASED; urgency=low
+
+  * Initial release. Start from the Kubuntu packaging, thanks!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 22 Oct 2011 00:10:57 +0200
 
 khangman (4:4.7.1-0ubuntu2) oneiric; urgency=low
 
diff --git a/debian/control b/debian/control
index 526b905..07bb7dc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,18 @@ Source: khangman
 Section: kde
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-XSBC-Original-Maintainer: Harald Sitter <apachelogger at ubuntu.com>
-Build-Depends: kde-sc-dev-latest (>= 4:4.7.3),
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Eshat Cakar <info at eshat.de>,
+ José Manuel Santamaría Lema <panfaust at gmail.com>
+Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
  cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
  kdelibs5-dev (>= 4:4.7), libkdeedu-dev (>= 4:4.7)
 Standards-Version: 3.9.2
 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
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/khangman/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/khangman/ubuntu
+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
 
 Package: khangman
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 0030a0e..dbcc850 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,6 +38,7 @@ License: GFDL-1.2+
  `/usr/share/common-licenses/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>
 License: GPL-2+
 
diff --git a/debian/khangman.install b/debian/khangman.install
new file mode 100644
index 0000000..658040c
--- /dev/null
+++ b/debian/khangman.install
@@ -0,0 +1,16 @@
+usr/bin/khangman
+usr/share/applications/kde4/khangman.desktop
+usr/share/doc/kde/HTML/en/khangman/
+usr/share/icons/hicolor/128x128/apps/khangman.png
+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/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
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..201d9a9
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,6 @@
+# Shipped in ttf-dustin
+./usr/share/kde4/apps/khangman/fonts/Domestic_Manners.ttf
+./usr/share/kde4/apps/khangman/fonts/Dustismo_Roman.ttf
+
+# Manpages are compressed
+./usr/share/man/man6/khangman.6
diff --git a/debian/rules b/debian/rules
index 6a77e53..244905c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+override_dh_auto_install:
+	$(overridden_command) --destdir=debian/tmp
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index b69bb99..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kdeedu source: dbg-package-missing-depends kdeedu-dbg
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

-- 
khangman packaging