[SCM] ksnakeduel packaging branch, master, updated. debian/14.12.3-1-21-ga679d63

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 0c7566bd6f8d848bfb4f55a690c04d9f544bdfb7
Merge: 733380d822f6b2e99e8cb58cf41d8e2a0c807042 5c0f4cfc2e430ef3e26ca10a7cb6f803e9078e3d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jul 13 13:15:00 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_wily_archive'
    
    Conflicts:
    	debian/patches/upstream_rename-to-ksnakeduel.diff

 debian/changelog                                  |  27 +++-
 debian/control                                    |   4 +-
 debian/ksnakeduel.install                         |  36 +----
 debian/patches/series                             |   1 -
 debian/patches/upstream_rename-to-ksnakeduel.diff | 182 ----------------------
 5 files changed, 26 insertions(+), 224 deletions(-)

diff --cc debian/changelog
index 3174669,41e269b..0f10327
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,28 +1,42 @@@
+ ksnakeduel (4:15.04.2-0ubuntu1) wily; urgency=medium
+ 
+   [ Scarlett Clark ]
 -  * Removed upstream applied upstream_rename-to-ksnakeduel.diff 
++  * Removed upstream applied upstream_rename-to-ksnakeduel.diff
+   * New upstream release
+ 
+   [ José Manuel Santamaría Lema ]
+   * Fix install file.
+ 
+   [ Scarlett Clark ]
+   * Fix kdelibs version
+   * New upstream release
 -  * kde4 games need to depend on 14.12 series libkdegames. 
++  * kde4 games need to depend on 14.12 series libkdegames.
+ 
+   [ Jonathan Riddell ]
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 09 Jun 2015 19:22:43 +0200
+ 
 +ksnakeduel (4:15.04.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (15.04.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 16:25:12 +0200
 +
 +ksnakeduel (4:14.12.3-1) experimental; urgency=medium
 +
 +  * New upstream release (14.12.3).
 +  * Bump Standards-Version to 3.9.6.
 +  * Refresh patch.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 29 Mar 2015 15:13:07 +0200
 +
- ksnakeduel (4:14.12.3-0ubuntu1) vivid; urgency=medium
+ ksnakeduel (4:14.12.0-0ubuntu3) vivid; urgency=medium
  
-   * New upstream release
-   * Release to archive.
+   * Update upstream_rename-to-ksnakeduel.diff to fix call to ksnakeduel
+     binary in .desktop LP: #1451424 ".desktop file still calls ktron"
  
-  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 15:09:08 -0700
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 04 May 2015 14:19:52 +0200
  
  ksnakeduel (4:14.12.0-0ubuntu1) vivid; urgency=medium
  
diff --cc debian/control
index d590a44,6d26a3b..96c7317
--- a/debian/control
+++ b/debian/control
@@@ -13,10 -13,10 +13,10 @@@ Uploaders: Daniel Schepler <schepler at de
  Build-Depends: cmake,
                 debhelper (>= 9),
                 kde-sc-dev-latest (>= 4:4.11),
-                kdelibs5-dev (>= 4:4.11),
-                libkdegames-dev (>= 4:4.11),
+                kdelibs5-dev (>= 4:4.14),
+                libkdegames-dev,
                 pkg-kde-tools (>= 0.14)
 -Standards-Version: 3.9.5
 +Standards-Version: 3.9.6
  Homepage: http://games.kde.org/
  Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/ksnakeduel.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/ksnakeduel.git

-- 
ksnakeduel packaging