[SCM] knavalbattle packaging branch, master, updated. debian/4.13.1-1-55-g20572e6

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jul 29 21:54:40 UTC 2014


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

The following commit has been merged in the master branch:
commit 847fbc8bac345f0964fc68e982f5cfb0bef7624f
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Mon Jan 14 14:17:16 2013 +0000

    Add transitional package for kbattleships
---
 debian/changelog |  6 ++++++
 debian/control   | 12 +++++++++++-
 debian/copyright |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b05422a..7e5c9f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+knavalbattle (4:4.9.97-0ubuntu2) raring; urgency=low
+
+  * Add transitional package for kbattleships
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Jan 2013 14:15:01 +0000
+
 knavalbattle (4:4.9.97-0ubuntu1) raring; urgency=low
 
   * New upstream release candidate
diff --git a/debian/control b/debian/control
index 01ec088..36be8c5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 Build-Depends: cmake,
                debhelper (>= 8.0.0),
                kdelibs5-dev (>= 4:4.9.97),
-               libkdegames-dev (>= 4:4.9.90),
+               libkdegames-dev (>= 4:4.9.97),
                pkg-kde-tools,
 Standards-Version: 3.9.3
 Section: games
@@ -13,7 +13,17 @@ Homepage: http://www.kde.org
 Package: knavalbattle
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: kbattleships (<< 4:4.9.97-0ubuntu2)
+Breaks: kbattleships (<< 4:4.9.97-0ubuntu2)
 Description: naval battle game
  A naval battle game in the style of battleships.
  .
  This package is part of the KDE games module.
+
+Package: kbattleships
+Architecture: all
+Depends: knavalbattle
+Section: oldlibs
+Description: dummy package for knavalbattle
+ Dummy transitional package for knavalbattle.  Can be safely
+ removed.
diff --git a/debian/copyright b/debian/copyright
index f5b5555..c9e8367 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://kde.org
 Files: *
 Copyright: 2000-2001 Nikolas Zimmermann <wildfox at kde.org>
            2007 Paolo Capriotti <p.capriotti at gmail.com>
-License: GPL-2
+License: GPL-2+
 
 Files: debian/*
 Copyright: 2012 Jonathan Riddell <jriddell at ubuntu.com>

-- 
knavalbattle packaging



More information about the pkg-kde-commits mailing list