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

Tue Jul 29 21:54:41 UTC 2014

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

The following commit has been merged in the master branch:
commit f3c8b458d06e0e295efcd301a9e6263e25db2453
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date:   Fri May 24 08:48:25 2013 +0000

    merge
---
 debian/changelog            | 15 +++++++++++++++
 debian/compat               |  2 +-
 debian/control              | 30 ++++++++++++++++++++---------
 debian/copyright            | 47 +++++++++++++++++++++++++++++++++++++--------
 debian/knavalbattle.install | 14 +++++++++++++-
 debian/rules                | 10 ++++++++++
 6 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11638cf..bc661d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+knavalbattle (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Merge with Debian, remaining change:
+   - rename binary from kbattleship to knavalbattle
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:46 +0000
+
+knavalbattle (4:4.10.2-1) experimental; urgency=low
+
+  * First release of kdegames after being split by upstream.
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 10 Apr 2013 15:51:01 +0200
+
 knavalbattle (4:4.10.2-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release
@@ -55,3 +69,4 @@ knavalbattle (4:4.9.90-0ubuntu1) raring; urgency=low
   * Initial release
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Dec 2012 18:00:35 +0000
+
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 622ef8c..31dc8fd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,26 @@
 Source: knavalbattle
-Priority: extra
-Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
-Build-Depends: cmake,
-               debhelper (>= 8.0.0),
-               kdelibs5-dev (>= 4:4.10.2),
-               libkdegames-dev (>= 4:4.10.2),
-               pkg-kde-tools,
-Standards-Version: 3.9.3
 Section: games
-Homepage: http://www.kde.org
+Priority: optional
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Daniel Schepler <schepler at debian.org>,
+ Sune Vuorela <sune at debian.org>,
+ Fathi Boudra <fabo at debian.org>,
+ Modestas Vainius <modax at debian.org>,
+ George Kiagiadakis <gkiagiad at csd.uoc.gr>,
+ Eshat Cakar <info at eshat.de>,
+ Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
+ Maximiliano Curia <maxy at debian.org>
+Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
+ cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14),
+ kdelibs5-dev (>= 4:4.10),
+ libkdegames-dev (>= 4:4.10)
+Standards-Version: 3.9.4
+Homepage: http://games.kde.org/
+Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/knavalbattle
+Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/knavalbattle
+X-Debian-Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/knavalbattle.git
+X-Debian-Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/knavalbattle.git
 
 Package: knavalbattle
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index c9e8367..c1d51a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,33 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: knavalbattle
-Source: http://kde.org
+Upstream-Name: kbattleship
+Upstream-Contact: Roney Gomes <roney477 at gmail.com>
+                  Albert Astals Cid <aacid at kde.org>
+                  Wolfgang Rohdewald <wolfgang at rohdewald.de>
+Source: http://www.kde.org/download/
 
 Files: *
-Copyright: 2000-2001 Nikolas Zimmermann <wildfox at kde.org>
-           2007 Paolo Capriotti <p.capriotti at gmail.com>
+Copyright: 2000-2005,  Nikolas Zimmermann <wildfox at kde.org>
+           2000-2005, Daniel Molkentin <molkentin at kde.org>
+           2007, Paolo Capriotti <p.capriotti at gmail.com>
+License: GPL-2+
+
+Files: doc/*
+Copyright: 2001, Daniel Molkentin <molkentin at kde.org>
+           2001, Nikolas Zimmermann <wildfox at kde.org>
+           2001, Kevin Krammer <kevin.krammer at gmx.at>
+License: GFDL-1.2+
+
+Files: src/button.cpp
+       src/mainwindow.cpp
+       src/mainwindow.h
+       src/networkdialog.cpp
+       src/networkdialog.h
+Copyright: 2007, Paolo Capriotti <p.capriotti at gmail.com>
+           2007, RiccardoIaconelli <ruphy at fsfe.org>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2012 Jonathan Riddell <jriddell at ubuntu.com>
+Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -19,11 +38,23 @@ License: GPL-2+
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
  .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GFDL-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.2 can be found in "/usr/share/common-licenses/GFDL-1.2".
+
diff --git a/debian/knavalbattle.install b/debian/knavalbattle.install
index 1b91047..a575d49 100644
--- a/debian/knavalbattle.install
+++ b/debian/knavalbattle.install
@@ -1 +1,13 @@
-usr/
+../icons/kbattleship-16.xpm /usr/share/pixmaps
+../icons/kbattleship.xpm /usr/share/pixmaps
+usr/games/kbattleship
+usr/share/applications/kde4/kbattleship.desktop
+usr/share/doc/kde/HTML/en/kbattleship/*
+usr/share/icons/hicolor/128x128/apps/kbattleship.png
+usr/share/icons/hicolor/16x16/apps/kbattleship.png
+usr/share/icons/hicolor/22x22/apps/kbattleship.png
+usr/share/icons/hicolor/32x32/apps/kbattleship.png
+usr/share/icons/hicolor/48x48/apps/kbattleship.png
+usr/share/icons/hicolor/64x64/apps/kbattleship.png
+usr/share/kde4/apps/kbattleship/*
+usr/share/kde4/services/kbattleship.protocol
diff --git a/debian/rules b/debian/rules
index e36ca20..24e3402 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,15 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+.PHONY: override_dh_auto_test
+
 override_dh_auto_configure:
 	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
+
+override_dh_auto_install:
+	$(overridden_command) --destdir=debian/tmp
+
+generate-icons:
+	while read src dest; do \
+		convert debian/tmp/$$src debian/icons/$$dest; \
+	done <debian/icon-list

-- 
knavalbattle packaging

