[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:47 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/knavalbattle.git;a=commitdiff;h=3b93bdc
The following commit has been merged in the master branch:
commit 3b93bdc8229bcda873b473e9d14081060a78bca5
Author: Jonathan Riddell <jriddell at ubuntu.com>
Date: Tue Jun 17 16:56:46 2014 +0100
merge with debian
---
debian/.gitattributes | 1 +
debian/changelog | 69 ++++++++++++++++++++++
debian/control | 48 +++++++--------
debian/copyright | 5 +-
debian/icon-list | 4 +-
.../{kbattleship-16.xpm => knavalbattle-16.xpm} | 2 +-
debian/icons/{kbattleship.xpm => knavalbattle.xpm} | 2 +-
debian/knavalbattle.install | 10 ++--
debian/knavalbattle.manpages | 2 +-
debian/knavalbattle.menu | 8 +++
debian/man/{kbattleship.man => knavalbattle.man} | 10 ++--
debian/rules | 2 -
12 files changed, 119 insertions(+), 44 deletions(-)
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index d59a94a..85c2d52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,72 @@
+knavalbattle (4:4.13.2-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+ * Merge with Debian, no changes
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 17 Jun 2014 10:41:54 +0100
+
+knavalbattle (4:4.13.1-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 23 May 2014 10:06:31 +0200
+
+knavalbattle (4:4.12.4-1) unstable; urgency=medium
+
+ * Add kbattleship transitional package.
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 28 Apr 2014 12:25:29 +0200
+
+knavalbattle (4:4.12.2-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Binary package renamed to knavalbattle.
+ * Update install files.
+ * Bump kde-sc-dev-latest build dependency.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 10 Feb 2014 11:32:33 +0100
+
+knavalbattle (4:4.11.5-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Do not disable an empty test set.
+ * Bump Standards-Version to 3.9.5, no changes needed.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 30 Jan 2014 14:21:54 +0100
+
+knavalbattle (4:4.11.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Update build dependencies.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 07 Nov 2013 14:28:25 +0100
+
+knavalbattle (4:4.11.2-1) experimental; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 07 Oct 2013 15:29:38 +0200
+
+knavalbattle (4:4.10.5-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 12 Jul 2013 15:56:04 +0200
+
+knavalbattle (4:4.10.4-1) experimental; urgency=low
+
+ * New upstream release.
+ * Update vcs fields.
+
+ -- Maximiliano Curia <maxy at debian.org> Fri, 14 Jun 2013 10:54:44 +0200
+
+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.13.0-0ubuntu1) trusty; urgency=medium
* New upstream KDE Software Compilation release
diff --git a/debian/control b/debian/control
index 15d6131..db64341 100644
--- a/debian/control
+++ b/debian/control
@@ -4,39 +4,39 @@ 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.13.0),
- libkdegames-dev (>= 4:4.13.0)
-Standards-Version: 3.9.4
+ 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: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.12),
+ kdelibs5-dev (>= 4:4.11),
+ libkdegames-dev (>= 4:4.11),
+ pkg-kde-tools (>= 0.14)
+Standards-Version: 3.9.5
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
+X-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/knavalbattle.git
+X-Debian-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/knavalbattle.git
Package: knavalbattle
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: kbattleship (<< 4:4.9.97-0ubuntu3)
-Breaks: kbattleship (<< 4:4.9.97-0ubuntu3)
-Description: naval battle game
- A naval battle game in the style of battleships.
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: khelpcenter4
+Description: battleship board game
+ KNavalbattle is an implementation of the Battleship game, where two players
+ take turns firing at the opponent's ships by guessing their coordinates.
.
This package is part of the KDE games module.
Package: kbattleship
Architecture: all
-Depends: knavalbattle
Section: oldlibs
-Priority: extra
-Description: dummy package for knavalbattle
- Dummy transitional package for knavalbattle. Can be safely
- removed.
+Depends: knavalbattle, ${misc:Depends}
+Description: transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
diff --git a/debian/copyright b/debian/copyright
index c1d51a3..b6a4fc3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: kbattleship
+Upstream-Name: knavalbattle
Upstream-Contact: Roney Gomes <roney477 at gmail.com>
Albert Astals Cid <aacid at kde.org>
Wolfgang Rohdewald <wolfgang at rohdewald.de>
@@ -38,7 +38,7 @@ 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
@@ -57,4 +57,3 @@ License: GFDL-1.2+
.
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/icon-list b/debian/icon-list
index 9a7a32b..b654c2a 100644
--- a/debian/icon-list
+++ b/debian/icon-list
@@ -1,2 +1,2 @@
-/usr/share/icons/hicolor/16x16/apps/kbattleship.png kbattleship-16.xpm
-/usr/share/icons/hicolor/32x32/apps/kbattleship.png kbattleship.xpm
+/usr/share/icons/hicolor/16x16/apps/knavalbattle.png knavalbattle-16.xpm
+/usr/share/icons/hicolor/32x32/apps/knavalbattle.png knavalbattle.xpm
diff --git a/debian/icons/kbattleship-16.xpm b/debian/icons/knavalbattle-16.xpm
similarity index 99%
rename from debian/icons/kbattleship-16.xpm
rename to debian/icons/knavalbattle-16.xpm
index 055ac53..7fa3868 100644
--- a/debian/icons/kbattleship-16.xpm
+++ b/debian/icons/knavalbattle-16.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kbattleship_16[] = {
+static char *knavalbattle_16[] = {
/* columns rows colors chars-per-pixel */
"16 16 256 2 ",
" c None",
diff --git a/debian/icons/kbattleship.xpm b/debian/icons/knavalbattle.xpm
similarity index 99%
rename from debian/icons/kbattleship.xpm
rename to debian/icons/knavalbattle.xpm
index 4d9dcaf..86f4ec7 100644
--- a/debian/icons/kbattleship.xpm
+++ b/debian/icons/knavalbattle.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *kbattleship[] = {
+static char *knavalbattle[] = {
/* columns rows colors chars-per-pixel */
"32 32 161 2 ",
" c black",
diff --git a/debian/knavalbattle.install b/debian/knavalbattle.install
index e0560d3..42afc86 100644
--- a/debian/knavalbattle.install
+++ b/debian/knavalbattle.install
@@ -1,14 +1,14 @@
-../icons/kbattleship-16.xpm /usr/share/pixmaps
-../icons/kbattleship.xpm /usr/share/pixmaps
+../icons/knavalbattle-16.xpm /usr/share/pixmaps
+../icons/knavalbattle.xpm /usr/share/pixmaps
usr/games/knavalbattle
usr/share/applications/kde4/knavalbattle.desktop
-usr/share/doc/kde/HTML/en/knavalbattle/*
+usr/share/doc/kde/HTML/*/knavalbattle
usr/share/icons/hicolor/128x128/apps/knavalbattle.png
usr/share/icons/hicolor/16x16/apps/knavalbattle.png
usr/share/icons/hicolor/22x22/apps/knavalbattle.png
usr/share/icons/hicolor/32x32/apps/knavalbattle.png
usr/share/icons/hicolor/48x48/apps/knavalbattle.png
usr/share/icons/hicolor/64x64/apps/knavalbattle.png
-usr/share/kde4/apps/knavalbattle/*
-usr/share/kde4/services/knavalbattle.protocol
usr/share/kde4/apps/kconf_update/knavalbattle.upd
+usr/share/kde4/apps/knavalbattle
+usr/share/kde4/services/knavalbattle.protocol
diff --git a/debian/knavalbattle.manpages b/debian/knavalbattle.manpages
index 2088b8e..914e160 100644
--- a/debian/knavalbattle.manpages
+++ b/debian/knavalbattle.manpages
@@ -1 +1 @@
-debian/man/out/kbattleship.6
+debian/man/out/knavalbattle.6
diff --git a/debian/knavalbattle.menu b/debian/knavalbattle.menu
new file mode 100644
index 0000000..5af90ae
--- /dev/null
+++ b/debian/knavalbattle.menu
@@ -0,0 +1,8 @@
+?package(knavalbattle):\
+ needs="x11"\
+ section="Games/Board"\
+ hints="KDE"\
+ title="KNavalbattle"\
+ icon32x32="/usr/share/pixmaps/knavalbattle.xpm"\
+ icon16x16="/usr/share/pixmaps/knavalbattle-16.xpm"\
+ command="/usr/games/knavalbattle"
diff --git a/debian/man/kbattleship.man b/debian/man/knavalbattle.man
similarity index 77%
rename from debian/man/kbattleship.man
rename to debian/man/knavalbattle.man
index 43bd485..f68091b 100644
--- a/debian/man/kbattleship.man
+++ b/debian/man/knavalbattle.man
@@ -1,11 +1,11 @@
-.TH KBATTLESHIP 6
+.TH KNAVALBATTLE 6
.SH NAME
-kbattleship \- The KDE Battleship clone
+knavalbattle \- The KDE Battleship clone
.SH SYNOPSIS
-.B kbattleship
+.B knavalbattle
.I [Qt-options] [KDE-options] [url]
.SH DESCRIPTION
-.B kbattleship
+.B knavalbattle
is a network-enabled implementation of the famous `Battle Ship' game
for KDE.
.TP
@@ -16,4 +16,4 @@ URL of a Naval Battle game server to connect to after startup
More detailed user documentation is available from
.BR help:/kbattleship
(either enter this URL into
Bkonqueror
P, or run `khelpcenter
-help:/kbattleship).
+help:/knavalbattle).
diff --git a/debian/rules b/debian/rules
index 24e3402..1a1dd13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
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
--
knavalbattle packaging
More information about the pkg-kde-commits
mailing list