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

Thu Aug 14 12:08:52 UTC 2014

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

The following commit has been merged in the master branch:
commit b182918467d40c04af7d6f9d16a9406c4b93070e
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Tue May 28 12:12:33 2013 +0000

    merge
---
 debian/changelog        | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 debian/control          | 13 ++++++-------
 debian/copyright        |  2 +-
 debian/khangman.install |  5 +----
 debian/not-installed    |  5 +++--
 5 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab19ef6..98ef45b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+khangman (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Merge with Debian, no changes remaining
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:40 +0000
+
+khangman (4:4.10.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Update uploaders.
+  * Bump build-deps.
+  * Update install-file.
+
+ -- Sune Vuorela <sune at debian.org>  Sun, 07 Apr 2013 16:49:01 +0000
+
 khangman (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -103,6 +119,12 @@ khangman (4:4.8.80-0ubuntu1) quantal; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 06 Jun 2012 14:07:37 +0100
 
+khangman (4:4.8.4-1) unstable; urgency=low
+
+  * Prepare new upstream
+
+ -- Sune Vuorela <sune at debian.org>  Sun, 17 Jun 2012 00:34:51 +0200
+
 khangman (4:4.8.3-0ubuntu1) quantal; urgency=low
 
   * New upstream release
@@ -147,6 +169,24 @@ khangman (4:4.7.90-0ubuntu1) precise; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 16 Dec 2011 13:14:40 +0000
 
+khangman (4:4.7.4-2) unstable; urgency=low
+
+  * Team upload. Upload to unstable.
+
+ -- Pino Toscano <pino at debian.org>  Wed, 07 Mar 2012 11:39:27 +0100
+
+khangman (4:4.7.4-1) experimental; urgency=low
+
+  * New upstream release. 
+  
+  [ José Manuel Santamaría Lema ]
+  * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
+
+  [ Eshat Cakar ]
+  * Depend on new fonts-dustin package.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 18 Dec 2011 01:38:30 +0100
+
 khangman (4:4.7.3-0ubuntu1) precise; urgency=low
 
   * New upstream release
@@ -154,6 +194,12 @@ khangman (4:4.7.3-0ubuntu1) precise; urgency=low
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 23 Nov 2011 23:47:00 +0000
 
+khangman (4:4.7.2-1) experimental; urgency=low
+
+  * Initial release. Start from the Kubuntu packaging, thanks!
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Dec 2011 10:42:24 -0300
+
 khangman (4:4.7.2-0r2) raring; urgency=low
 
   * Initial release. Start from the Kubuntu packaging, thanks!
@@ -185,3 +231,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 a55010c..20eb5cf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,11 @@ 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>,
- José Manuel Santamaría Lema <panfaust at gmail.com>
-Build-Depends: 
+ 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.10.2), libkdeedu-dev (>= 4:4.10.2),
- libssl-dev
-Standards-Version: 3.9.3
+ kdelibs5-dev (>= 4:4.10), libkdeedu-dev (>= 4:4.10)
+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
@@ -19,9 +18,9 @@ X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/khangman.git
 Package: khangman
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dustin, kdeedu-kvtml-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, fonts-dustin, kdeedu-kvtml-data
 Suggests: khelpcenter4
-Description: Hangman word puzzle for KDE
+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 ec32d69..dbcc850 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -39,7 +39,7 @@ License: GFDL-1.2+
 
 Files: debian/*
 Copyright: 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-           2011, Harald Sitter <apachelogger at ubuntu.com>
+Copyright: 2011, Harald Sitter <apachelogger at ubuntu.com>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/khangman.install b/debian/khangman.install
index 5741546..5dd73f5 100644
--- a/debian/khangman.install
+++ b/debian/khangman.install
@@ -1,4 +1,5 @@
 usr/bin/khangman
+usr/lib/libkhangmanengine.so.4*
 usr/share/applications/kde4/khangman.desktop
 usr/share/doc/kde/HTML/en/khangman/
 usr/share/icons/hicolor/128x128/apps/khangman.png
@@ -14,7 +15,3 @@ 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/lib/libkhangmanengine.so.4
-usr/lib/libkhangmanengine.so.4.10.*
-usr/share/icons/hicolor/80x80/apps/khangman-harmattan.png
-usr/share/icons/hicolor/scalable/apps/khangman-harmattan.svgz
diff --git a/debian/not-installed b/debian/not-installed
index 448d58c..6481849 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,12 +1,13 @@
-# Shipped in ttf-dustin
+# Shipped in fonts-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
 
+# New dev stuff
 ./usr/include/khangman/khangman_engine_export.h
 ./usr/include/khangman/khangmanengine.h
 ./usr/include/khangman/prefs.h
-
 ./usr/lib/libkhangmanengine.so
+

-- 
khangman packaging

