[SCM] khangman packaging branch, master, updated. debian/14.12.2+dfsg-1-19-g0dcfa2a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0dcfa2a31d86843c9dfcf74adfa6bd82f104cfcf
Merge: af784b5eaf493da31efb3f5dcdbec52619e0b0a8 28669c581440548fb3799469a3af00245b32ffda
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Mar 26 17:14:52 2015 +0100

    Merge commit '28669c581440548fb3799469a3af00245b32ffda'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright
    	debian/khangman.install
    	debian/khangman.manpages
    	debian/not-installed
    	debian/watch

 debian/changelog     | 9 +++++++++
 debian/not-installed | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index f100a51,2350e32..3f71cf3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,12 +1,31 @@@
 +khangman (4:14.12.3+dfsg-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (14.12.3+dfsg).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 26 Mar 2015 13:07:39 +0100
 +
+ khangman (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
 -  * Remove wildcard from not-installed and hard code path. 
 -  * Manual merge kubuntu_unstable. 
 -  * Merge of course broke my build.. 
++  * Remove wildcard from not-installed and hard code path.
++  * Manual merge kubuntu_unstable.
++  * Merge of course broke my build.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 14:26:50 -0700
+ 
 +khangman (4:14.12.2+dfsg-1) experimental; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Remove kdelibs5-dev depend version as there was not a new release.
 +  * Correct the paths in the not-installed.
 +
 +  [ Maximiliano Curia ]
 +  * New dfsg version (14.12.2+dfsg).
 +  * Update copyright information.
 +  * New patch: drop_cc-nc_theme
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Feb 2015 15:22:18 +0100
 +
  khangman (4:14.12.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release

-- 
khangman packaging