[SCM] ksnakeduel packaging branch, kubuntu_vivid_backports, updated. debian/4.14.0-1-16-ga9c7630

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_backports branch:
commit a9c7630587b25d709d972daafdb9f16d20498bba
Merge: affbdc85eda0db106ca69cff99dffe04b7834074 8a4a47b85fc02be42199af5037b8c10f042cad2a
Author: Harald Sitter <sitter at kde.org>
Date:   Wed May 13 15:48:39 2015 +0200

    Merge branch 'kubuntu_vivid_archive' into kubuntu_vivid_backports
    
    Conflicts:
    	debian/patches/series
    	debian/patches/upstream_rename-to-ksnakeduel.diff

 debian/changelog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index f65aa62,5d692ba..5c3c7a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,9 +1,23 @@@
 +ksnakeduel (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Removed upstream applied upstream_rename-to-ksnakeduel.diff 
 +  * New upstream release
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Fix install file.
 +
 +  [ Scarlett Clark ]
 +  * Fix kdelibs version
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 15 Apr 2015 14:46:00 -0700
 +
- 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
  

-- 
ksnakeduel packaging