[SCM] khangman packaging branch, master, updated. debian/14.12.3+dfsg-1-9-g06af7b3

[Scott Kitterman]

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

The following commit has been merged in the master branch:
commit 06af7b3c021675d0d1986a06056e9810cf8044d0
Author: Scott Kitterman <scott at kitterman.com>
Date:   Thu Sep 3 16:13:22 2015 -0400

    * New upstream release
    * Update packaging now that license of themes/winter/khangman_winter.svg has
      been clarified as being DFSG free
      - Remove themes/winter/khangman_winter.svg from Files-excluded in debian/
        copyright
      - Remove debian/patches/drop_cc-nc_theme (and the patch directory)
      - Adjust debian/watch for the elimination of the dfsg suffix
---
 debian/changelog                | 26 +++++++++++++++++++++-----
 debian/copyright                |  1 -
 debian/patches/drop_cc-nc_theme | 39 ---------------------------------------
 debian/patches/series           |  1 -
 debian/watch                    |  3 +--
 5 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe5ba94..04de467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,26 @@
-khangman (4:15.04.3+dfsg-1~) UNRELEASED; urgency=medium
+khangman (4:15.08.0-1) unstable; urgency=medium
 
-  * New upstream release (15.04.0+dfsg).
-  * New upstream release (15.04.1+dfsg).
-  * New upstream release (15.04.3+dfsg).
+  * Upload to unstable
 
- -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 16:42:01 +0200
+  [ Maximiliano Curia ]
+  * Bump minimum version requirement for qtbase5-dev, libqt5svg5-dev, and
+    extra-cmake-modules.
+  * Add qtdeclarative5-dev, libkf5declarative-dev, and kio-dev to
+    build-depends
+  * Update khangman.install to remove usr/lib/*/libkhangmanengine.so and
+    usr/share/kxmlgui5/khangman/khangmanui.rc as they are no longer built by
+    the package
+
+  [ Scott Kitterman ]
+  * New upstream release
+  * Update packaging now that license of themes/winter/khangman_winter.svg has
+    been clarified as being DFSG free
+    - Remove themes/winter/khangman_winter.svg from Files-excluded in debian/
+      copyright
+    - Remove debian/patches/drop_cc-nc_theme (and the patch directory)
+    - Adjust debian/watch for the elimination of the dfsg suffix
+
+ -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 Sep 2015 15:33:28 -0400
 
 khangman (4:14.12.3+dfsg-1) experimental; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 33dbc2b..c36b5ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: khangman
 Upstream-Contact: kde-edu at mail.kde.org
 Source: git://anongit.kde.org/khangman
-Files-Excluded: themes/winter/khangman_winter.svg
 
 Files: *
 Copyright: 2010, Adam Rakowski <foo-script at o2.pl> (GSoC 2010)
diff --git a/debian/patches/drop_cc-nc_theme b/debian/patches/drop_cc-nc_theme
deleted file mode 100644
index 67a1e3f..0000000
--- a/debian/patches/drop_cc-nc_theme
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: khangman/themes/CMakeLists.txt
-===================================================================
---- khangman.orig/themes/CMakeLists.txt	2015-05-27 19:02:38.433906323 +0200
-+++ khangman/themes/CMakeLists.txt	2015-05-27 19:02:48.941480270 +0200
-@@ -1,7 +1,6 @@
- add_subdirectory(desert)
- add_subdirectory(sea)
- add_subdirectory(bees)
--add_subdirectory(winter)
- add_subdirectory(notes)
- 
- install( FILES standardthemes.xml  DESTINATION  ${DATA_INSTALL_DIR}/khangman/themes)
-Index: khangman/themes/standardthemes.xml
-===================================================================
---- khangman.orig/themes/standardthemes.xml	2015-05-27 19:02:38.433906323 +0200
-+++ khangman/themes/standardthemes.xml	2015-05-27 19:02:38.425906649 +0200
-@@ -33,22 +33,6 @@
-     </coords>
-     </theme>
- 
--    <theme name="winter" author="Andreas Kainz" uiname="Winter Theme" svgfilename="khangman_winter.svg">
--    <colors>
--      <letterColor r="0" g="0" b="0" />
--      <guessButtonColor r="0" g="0" b="0" />
--      <guessButtonTextColor r="255" g="255" b="0" />
--      <guessButtonHoverColor r="99" g="105" b="112" />
--      <letterInputTextColor r="255" g="0" b="0" />
--    </colors>
--    <coords>
--      <goodWordPos wratio="0.3571" hratio="0.5327" />
--      <wordRect xratio="0" yratio="0.83" wratio="0.6497" hratio="0.15" />
--      <hintRect xratio="0" yratio="0.74" wratio="0.6497" hratio="0.1857" />
--      <kRect xratio="0.20" yratio="0.15" wratio="0.33" hratio="0.62" />
--    </coords>
--    </theme>
--
-     <theme name="bees" author="Jarle Richard Akselsen" uiname="Bee Theme" svgfilename="khangman_bees.svg">
-     <colors>
-       <letterColor r="255" g="255" b="0" />
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3c115dd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-drop_cc-nc_theme
diff --git a/debian/watch b/debian/watch
index b86b4bc..6bee9c9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts="repacksuffix=+dfsg" \
- http://download.kde.org/stable/applications/([\d.]+)/src/khangman-([\d.]+).tar.xz
+http://download.kde.org/stable/applications/([\d.]+)/src/khangman-([\d.]+).tar.xz

-- 
khangman packaging