[SCM] ksnakeduel packaging branch, master, updated. debian/4.14.0-1-5-g10851c6

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Fri Mar 13 22:01:32 UTC 2015


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

The following commit has been merged in the master branch:
commit 10851c61a790d5d5da2332903f150e1836437e5f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Mar 13 23:01:26 2015 +0100

    sync to archive
---
 debian/.gitattributes                             |   1 -
 debian/changelog                                  | 286 +++++++++++++++++++++-
 debian/control                                    |  16 +-
 debian/icon-list                                  |   4 -
 debian/kblackbox.install                          |  12 -
 debian/{ktron.install => ksnakeduel.install}      |   4 +-
 debian/ktron.links                                |   1 -
 debian/ktron.manpages                             |   1 -
 debian/ktron.menu                                 |  16 --
 debian/man/kdeopt.part                            | 110 ---------
 debian/man/ktron.man                              |  28 ---
 debian/patches/series                             |   1 +
 debian/patches/upstream_rename-to-ksnakeduel.diff | 182 ++++++++++++++
 debian/rules                                      |   5 -
 debian/watch                                      |   3 +-
 15 files changed, 471 insertions(+), 199 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index fe60324..6d65e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,27 +1,84 @@
-ksnakeduel (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
+ksnakeduel (4:14.12.0-0ubuntu1) vivid; urgency=medium
 
+  [ Scarlett Clark ]
+  * Remove kdelibs5-dev depend version as there was not a new release.
+
+  [ Jonathan Riddell ]
   * New upstream release
+  * Add upstream_rename-to-ksnakeduel.diff to complete rename
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 12 Mar 2015 09:41:47 -0700
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 18 Dec 2014 17:01:05 +0100
 
-ksnakeduel (4:14.12.2-0ubuntu1) UNRELEASED; urgency=medium
+ksnakeduel (4:4.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Maximiliano Curia <maxy at debian.org>  Sat, 23 Aug 2014 00:10:01 +0200
+
+ksnakeduel (4:4.14.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
-  * Fix version as this is part of the kde-applications suite.
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 06 Feb 2015 20:11:04 -0800
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Oct 2014 06:10:31 -0700
 
-ksnakeduel (4:4.14.0-1ubuntu1) UNRELEASED; urgency=medium
+ksnakeduel (4:4.14.1-0ubuntu1) utopic; urgency=medium
 
-  * Remove kdelibs5-dev depend version as there was not a new release.
+  * New upstream release
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 12 Dec 2014 14:20:30 -0800
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Mon, 22 Sep 2014 17:35:29 +0200
 
-ksnakeduel (4:4.14.0-1) unstable; urgency=medium
+ksnakeduel (4:4.14.0-0ubuntu1) utopic; urgency=medium
 
-  * New upstream release.
+  * New upstream release
 
- -- Maximiliano Curia <maxy at debian.org>  Sat, 23 Aug 2014 00:10:01 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 20 Aug 2014 13:23:55 +0200
+
+ksnakeduel (4:4.13.97-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release RC
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Fri, 01 Aug 2014 17:10:09 +0200
+
+ksnakeduel (4:4.13.95-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Wed, 30 Jul 2014 18:34:53 +0200
+
+ksnakeduel (4:4.13.90-0ubuntu1) utopic; urgency=medium
+
+  * New upstream beta release
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Thu, 24 Jul 2014 23:27:26 +0200
+
+ksnakeduel (4:4.13.2-0ubuntu4) utopic; urgency=medium
+
+  * Rename the ktron binary package to ksnakeduel again and drop the
+    transitional package
+  * Remove ktron.menu again which was re-added in the last merge
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sun, 06 Jul 2014 23:32:57 +0200
+
+ksnakeduel (4:4.13.2-0ubuntu3) utopic; urgency=medium
+
+  * Add a transitional package for ksnakeduel 
+  * ktron breaks/replaces ksnakeduel << 4:4.13.2
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sun, 06 Jul 2014 22:25:11 +0200
+
+ksnakeduel (4:4.13.2-0ubuntu2) utopic; urgency=medium
+
+  * Raise kde build-deps to >= 4:4.13.2 so we build against the correct
+    libkdegames version
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Thu, 26 Jun 2014 21:44:01 +0200
+
+ksnakeduel (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:59 +0100
 
 ksnakeduel (4:4.12.4-1) unstable; urgency=medium
 
@@ -58,9 +115,216 @@ ksnakeduel (4:4.10.4-1) experimental; urgency=low
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Jun 2013 10:54:26 +0200
 
+ksnakeduel (4:4.13.0-0ubuntu1) trusty; urgency=medium
+
+  * New upstream KDE Software Compilation release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 10 Apr 2014 22:15:15 +0100
+
+ksnakeduel (4:4.12.97-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 02 Apr 2014 11:41:44 +0200
+
+ksnakeduel (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+  * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Sun, 23 Mar 2014 12:41:53 +0100
+
+ksnakeduel (4:4.12.90-0ubuntu1) trusty; urgency=medium
+
+  * New upstream beta release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Mar 2014 11:27:59 +0000
+
+ksnakeduel (4:4.12.3-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Tue, 04 Mar 2014 21:02:25 +0100
+
+ksnakeduel (4:4.12.2-0ubuntu1) trusty; urgency=medium
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 05 Feb 2014 00:14:08 +0000
+
+ksnakeduel (4:4.12.1-0ubuntu1) trusty; urgency=low
+
+  * New upstream bugfix release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 16 Jan 2014 08:28:48 +0000
+
+ksnakeduel (4:4.12.0-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 18 Dec 2013 17:25:10 +0000
+
+ksnakeduel (4:4.11.97-0ubuntu1) trusty; urgency=low
+
+  * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 29 Nov 2013 13:24:44 +0000
+
+ksnakeduel (4:4.11.95-0ubuntu1) trusty; urgency=low
+
+  * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Mon, 25 Nov 2013 18:21:52 +0100
+
+ksnakeduel (4:4.11.80-0ubuntu1) trusty; urgency=low
+
+  * New upstream beta release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Sat, 23 Nov 2013 17:49:37 +0100
+
+ksnakeduel (4:4.11.2-0ubuntu1) saucy; urgency=low
+
+  * New upstream bugfix release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 30 Sep 2013 14:39:32 +0100
+
+ksnakeduel (4:4.11.1-0ubuntu1) saucy; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 06 Sep 2013 22:31:27 +0100
+
+ksnakeduel (4:4.11.0-0ubuntu1) saucy; urgency=low
+
+  [ Howard Chan ]
+  * New upstream release
+
+  [ Jonathan Riddell ]
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 14 Aug 2013 00:27:49 +0100
+
+ksnakeduel (4:4.10.97-0ubuntu1) saucy; urgency=low
+
+  * New upstream RC 2 release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 26 Jul 2013 19:50:03 +0100
+
+ksnakeduel (4:4.10.95-0ubuntu1) saucy; urgency=low
+
+  * New upstream RC release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 19 Jul 2013 12:33:03 +0000
+
+ksnakeduel (4:4.10.90-0ubuntu1) saucy; urgency=low
+
+  * New upstream bet release
+
+ -- Michał Zając <quintasan at kubuntu.org>  Fri, 28 Jun 2013 18:22:46 +0100
+
+ksnakeduel (4:4.10.80-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 21 Jun 2013 01:34:46 +0100
+
+ksnakeduel (4:4.10.4-0ubuntu1) saucy-proposed; urgency=low
+
+  [ Rohan Garg ]
+  * New upstream bugfix release
+
+  [ Jonathan Riddell ]
+  * remove incorrect ksnakeduel.menu
+  * fix ksnakeduel: extended-description-line-too-long
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Fri, 07 Jun 2013 00:41:52 +0100
+
+ksnakeduel (4:4.10.3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release
+  * Merge with debian, remaining changes:
+   - Remove kblackbox.install
+   - Rename binary to ksnakeduel and make ktron a dummy
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 May 2013 11:04:53 +0000
+
 ksnakeduel (4:4.10.2-1) experimental; urgency=low
 
   * First release of kdegames after being split by upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 11 Apr 2013 20:25:20 +0200
 
+ksnakeduel (4:4.10.2-0ubuntu2) saucy; urgency=low
+
+  * Rebuild without libkdegamesprivate1.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Wed, 22 May 2013 22:41:06 +0100
+
+ksnakeduel (4:4.10.2-0ubuntu1) raring; urgency=low
+
+  * New upstream bugfix release
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sun, 31 Mar 2013 14:56:28 +0200
+
+ksnakeduel (4:4.10.1-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream bugfix release
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Mar 2013 16:38:06 +0000
+
+ksnakeduel (4:4.10.0-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream release
+
+ -- Rohan Garg <rohangarg at kubuntu.org>  Wed, 06 Feb 2013 12:03:03 +0000
+
+ksnakeduel (4:4.9.98-0ubuntu1) raring-proposed; urgency=low
+
+  * New upstream release candidate
+  * Add missing .install file
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 18 Jan 2013 15:51:59 +0000
+
+ksnakeduel (4:4.9.97-0ubuntu3) raring; urgency=low
+
+  * Put ktron dummy package into section oldlibs
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 16 Jan 2013 17:12:32 +0000
+
+ksnakeduel (4:4.9.97-0ubuntu2) raring; urgency=low
+
+  * Add dummy package for ktron
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 14 Jan 2013 12:33:23 +0000
+
+ksnakeduel (4:4.9.97-0ubuntu1) raring; urgency=low
+
+  * New upstream release candidate
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Thu, 03 Jan 2013 22:42:30 +0100
+
+ksnakeduel (4:4.9.95-0ubuntu1) raring; urgency=low
+
+  * Install to /usr/games
+  * Version dependency on kdegames-data
+  * New upstream RC release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 18 Dec 2012 23:39:11 +0000
+
+ksnakeduel (4:4.9.90-0ubuntu3) raring; urgency=low
+
+  * Replace/break ktron
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Dec 2012 23:31:06 +0000
+
+ksnakeduel (4:4.9.90-0ubuntu2) raring; urgency=low
+
+  * Fix copyright holder and section
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Dec 2012 13:33:11 +0000
+
+ksnakeduel (4:4.9.90-0ubuntu1) raring; urgency=low
+
+  * Initial release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 03 Dec 2012 17:39:47 +0000
+
diff --git a/debian/control b/debian/control
index cf12b1c..bb333f5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ksnakeduel
 Section: games
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Debian/Kubuntu 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>,
@@ -18,19 +18,21 @@ Build-Depends: cmake,
                pkg-kde-tools (>= 0.14)
 Standards-Version: 3.9.5
 Homepage: http://games.kde.org/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/ksnakeduel.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/ksnakeduel.git
+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
 
-Package: ktron
+Package: ksnakeduel
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: khelpcenter4
-Description: Tron-like snakerace game
+Replaces: ktron (<< 4:4.9.97-0ubuntu2)
+Breaks: ktron (<< 4:4.9.97-0ubuntu2)
+Recommends: khelpcenter
+Description: snake race game
  The object of the game is to avoid running into walls, your own tail,
  and that of your opponent, while at the same time you have to try to
  get your opponent to run into them.
  .
- KTron also includes kdesnake, a special mode of the game where you can play
+ It also includes kdesnake, a special mode of the game where you can play
  the classical snake action game. In snake you steer a snake which has to eat
  food. While eating, the snake grows. But once a player collides with the other
  snake or the wall, the game is lost. This becomes, of course, more and more
diff --git a/debian/icon-list b/debian/icon-list
deleted file mode 100644
index 50b74ed..0000000
--- a/debian/icon-list
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/share/icons/hicolor/16x16/apps/kdesnake.png kdesnake-16.xpm
-/usr/share/icons/hicolor/32x32/apps/kdesnake.png kdesnake.xpm
-/usr/share/icons/hicolor/16x16/apps/ktron.png ktron-16.xpm
-/usr/share/icons/hicolor/32x32/apps/ktron.png ktron.xpm
diff --git a/debian/kblackbox.install b/debian/kblackbox.install
deleted file mode 100644
index 88e6986..0000000
--- a/debian/kblackbox.install
+++ /dev/null
@@ -1,12 +0,0 @@
-../icons/kblackbox-16.xpm /usr/share/pixmaps
-../icons/kblackbox.xpm /usr/share/pixmaps
-usr/games/kblackbox
-usr/share/applications/kde4/kblackbox.desktop
-usr/share/doc/kde/HTML/en/kblackbox/*
-usr/share/icons/hicolor/128x128/apps/kblackbox.png
-usr/share/icons/hicolor/16x16/apps/kblackbox.png
-usr/share/icons/hicolor/22x22/apps/kblackbox.png
-usr/share/icons/hicolor/32x32/apps/kblackbox.png
-usr/share/icons/hicolor/48x48/apps/kblackbox.png
-usr/share/icons/hicolor/64x64/apps/kblackbox.png
-usr/share/kde4/apps/kblackbox/*
diff --git a/debian/ktron.install b/debian/ksnakeduel.install
similarity index 95%
rename from debian/ktron.install
rename to debian/ksnakeduel.install
index 8b0c5d8..e9fa9e1 100644
--- a/debian/ktron.install
+++ b/debian/ksnakeduel.install
@@ -3,9 +3,9 @@
 ../icons/ktron-16.xpm /usr/share/pixmaps
 ../icons/ktron.xpm /usr/share/pixmaps
 usr/games/kdesnake
-usr/games/ktron
+usr/games/ksnakeduel
+usr/share/applications/kde4/ksnakeduel.desktop
 usr/share/applications/kde4/kdesnake.desktop
-usr/share/applications/kde4/ktron.desktop
 usr/share/doc/kde/HTML/en/ktron/common
 usr/share/doc/kde/HTML/en/ktron/index.cache.bz2
 usr/share/doc/kde/HTML/en/ktron/index.docbook
diff --git a/debian/ktron.links b/debian/ktron.links
deleted file mode 100644
index 6665bb5..0000000
--- a/debian/ktron.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/man/man6/ktron.6.gz /usr/share/man/man6/kdesnake.6.gz
diff --git a/debian/ktron.manpages b/debian/ktron.manpages
deleted file mode 100644
index 025ec56..0000000
--- a/debian/ktron.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/ktron.6
diff --git a/debian/ktron.menu b/debian/ktron.menu
deleted file mode 100644
index 7cf0544..0000000
--- a/debian/ktron.menu
+++ /dev/null
@@ -1,16 +0,0 @@
-?package(ktron):\
-	needs="x11"\
-	section="Games/Action"\
-	hints="KDE,Tron"\
-	title="KTron"\
-	icon32x32="/usr/share/pixmaps/ktron.xpm"\
-	icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
-	command="/usr/games/ktron"
-?package(ktron):\
-	needs="x11"\
-	section="Games/Action"\
-	hints="KDE,Snake"\
-	title="KTron"\
-	icon32x32="/usr/share/pixmaps/kdesnake.xpm"\
-	icon16x16="/usr/share/pixmaps/kdesnake-16.xpm"\
-	command="/usr/games/kdesnake"
diff --git a/debian/man/kdeopt.part b/debian/man/kdeopt.part
deleted file mode 100644
index 5557afa..0000000
--- a/debian/man/kdeopt.part
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" This portion of the manual page is from kdeopt.man, from the
-.\" kdegames Debian package.
-.SH GENERIC OPTIONS
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-kde
-Show KDE specific options.
-.TP
-.B \-\-help-all
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license
-Show license information.
-.TP
-.B \-\-
-End of options.
-.SH QT OPTIONS
-.TP
-.B \-\-display 
I<displayname>
B
-Use the X-server display `displayname'.
-.TP
-.B \-\-session 
I<sessionId>
B
-Restore the application for the given `sessionId'.
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8\-bit
-display.
-.TP
-.B \-\-ncols 
I<count>
B
-Limits the number of colors allocated in the color cube on an 8\-bit
-display, if the application is using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit \-nograb, use \-dograb
-to override.
-.TP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.B \-\-fn, \-\-font 
I<fontname>
B
-Defines the application font.
-.TP
-.B \-\-bg, \-\-background 
I<color>
B
-Sets the default background color and an application palette (light
-and dark shades are calculated).
-.TP
-.B \-\-fg, \-\-foreground 
I<color>
B
-Sets the default foreground color.
-.TP
-.B \-\-btn, \-\-button 
I<color>
B
-Sets the default button color.
-.TP
-.B \-\-name 
I<name>
B
-Sets the application name.
-.TP
-.B \-\-title 
I<title>
B
-Sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on an 8-bit display.
-.TP
-.B \-\-inputstyle 
I<inputstyle>
B
-Sets XIM (X Input Method) input style. Possible values are
-
Ionthespot
P, 
Ioverthespot
P, 
Ioffthespot
P and 
Iroot
P.
-.TP
-.B \-\-im 
I<XIM server>
B
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.SH KDE OPTIONS
-.TP
-.B \-\-caption 
I<caption>
B
-Use `caption' as name in the titlebar.
-.TP
-.B \-\-icon 
I<icon>
B
-Use `icon' as the application icon.
-.TP
-.B \-\-config 
I<filename>
B
-Use alternative configuration file.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B \-\-style 
I<style>
B
-Sets the application GUI style.
-.TP
-.B \-\-geometry 
I<geometry>
B
-Sets the client geometry of the main widget.
diff --git a/debian/man/ktron.man b/debian/man/ktron.man
deleted file mode 100644
index 1105b1e..0000000
--- a/debian/man/ktron.man
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH KTRON 6
-.SH NAME
-ktron \- A race in hyperspace
-.SH SYNOPSIS
-.B ktron
-.I [Qt-options] [KDE-options] [\-\-snake]
-.TP
-.B kdesnake
-.SH DESCRIPTION
-The object of the game is to avoid running into walls, your own tail,
-and that of your opponent, while at the same time you have to try to
-get your opponent to run into them.
-
-KTron also includes kdesnake, a special mode of the game where you can play
-the classical snake action game. In snake you steer a snake which has to eat
-food. While eating, the snake grows. But once a player collides with the other
-snake or the wall, the game is lost. This becomes, of course, more and more
-difficult the longer the snakes grow.
-.SH OPTIONS
-.TP
-.B \-\-snake
-Start in KSnake mode.
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/ktron
-(either enter this URL into 
Bkonqueror
P, or run `khelpcenter
-help:/ktron').
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e945773
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_rename-to-ksnakeduel.diff
diff --git a/debian/patches/upstream_rename-to-ksnakeduel.diff b/debian/patches/upstream_rename-to-ksnakeduel.diff
new file mode 100644
index 0000000..ba63739
--- /dev/null
+++ b/debian/patches/upstream_rename-to-ksnakeduel.diff
@@ -0,0 +1,182 @@
+https://git.reviewboard.kde.org/r/121589/
+
+Index: ksnakeduel-14.12.0/CMakeLists.txt
+===================================================================
+--- ksnakeduel-14.12.0.orig/CMakeLists.txt
++++ ksnakeduel-14.12.0/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-project(ktron)
++project(ksnakeduel)
+ 
+ if(NOT COMPILING_KDEGAMES)
+ 	find_package(KDE4 REQUIRED)
+@@ -17,7 +17,7 @@ add_subdirectory(doc)
+ 
+ ########### next target ###############
+ 
+-set(ktron_SRCS
++set(ksnakeduel_SRCS
+ 	renderer.cpp
+ 	object.cpp
+ 	snakepart.cpp
+@@ -30,24 +30,24 @@ set(ktron_SRCS
+ 	ktron.cpp
+ 	main.cpp)
+ 
+-kde4_add_ui_files(ktron_SRCS general.ui)
++kde4_add_ui_files(ksnakeduel_SRCS general.ui)
+ 
+-kde4_add_kcfg_files(ktron_SRCS settings.kcfgc)
++kde4_add_kcfg_files(ksnakeduel_SRCS settings.kcfgc)
+ 
+-kde4_add_app_icon(ktron_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-ktron.png")
++kde4_add_app_icon(ksnakeduel_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-ksnakeduel.png")
+ 
+-kde4_add_executable(ktron ${ktron_SRCS})
++kde4_add_executable(ksnakeduel ${ksnakeduel_SRCS})
+ 
+-target_link_libraries(ktron kdegames kdegamesprivate ${KDE4_KDEUI_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS})
++target_link_libraries(ksnakeduel kdegames kdegamesprivate ${KDE4_KDEUI_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS})
+ 
+-install(TARGETS ktron ${INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS ksnakeduel ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ configure_file(kdesnake.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdesnake  @ONLY)
+ 
+ ########### install files ###############
+ 
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kdesnake DESTINATION ${BIN_INSTALL_DIR})
+-install(PROGRAMS  ktron.desktop kdesnake.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
++install(PROGRAMS  ksnakeduel.desktop kdesnake.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install(FILES  ktron.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+ install(FILES  ktronui.rc DESTINATION ${DATA_INSTALL_DIR}/ktron)
+ install(FILES  ktron.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
+Index: ksnakeduel-14.12.0/kdesnake.cmake
+===================================================================
+--- ksnakeduel-14.12.0.orig/kdesnake.cmake
++++ ksnakeduel-14.12.0/kdesnake.cmake
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-#  KTron: KSnake mode start script ( @KDE_VERSION_STRING@ )
++#  KDE Snake: KSnake mode start script ( @KDE_VERSION_STRING@ )
+ #
+ 
+-ktron --snake
++kdesnake --snake
+Index: ksnakeduel-14.12.0/ksnakeduel.desktop
+===================================================================
+--- /dev/null
++++ ksnakeduel-14.12.0/ksnakeduel.desktop
+@@ -0,0 +1,53 @@
++[Desktop Entry]
++Type=Application
++Exec=ktron -caption %c %i
++Icon=ktron
++X-DocPath=ktron/index.html
++Terminal=false
++Name=KSnakeDuel
++Name[bs]=KSnakeDuel
++Name[ca]=KSnakeDuel
++Name[ca at valencia]=KSnakeDuel
++Name[cs]=KSnakeDuel
++Name[da]=KSnakeDuel
++Name[de]=KSnakeDuel
++Name[el]=KSnakeDuel
++Name[en_GB]=KSnakeDuel
++Name[es]=KSnakeDuel
++Name[et]=KSnakeDuel
++Name[fi]=KSnakeDuel
++Name[fr]=KSnakeDuel
++Name[ga]=KSnakeDuel
++Name[gl]=KSnakeDuel
++Name[hu]=KSnakeDuel
++Name[it]=KSnakeDuel
++Name[kk]=KSnakeDuel
++Name[km]=KSpaceDuel
++Name[ko]=KSnakeDuel
++Name[lt]=KSpaceDuel
++Name[lv]=KSpaceDuel
++Name[mr]=के-स्नेक-ड्युएल
++Name[nb]=KSnakeDuel
++Name[nds]=KSnakeDuel
++Name[nl]=KSnakeDuel
++Name[pl]=KSnakeDuel
++Name[pt]=KSnakeDuel
++Name[pt_BR]=KSnakeDuel
++Name[ro]=KSnakeDuel
++Name[ru]=Дуэль KSnake
++Name[sk]=KSnakeDuel
++Name[sl]=KSnakeDuel
++Name[sr]=К‑змијски-двобој
++Name[sr at ijekavian]=К‑змијски-двобој
++Name[sr at ijekavianlatin]=K‑zmijski-dvoboj
++Name[sr at latin]=K‑zmijski-dvoboj
++Name[sv]=Ormspel
++Name[tr]=KSnakeDuel
++Name[ug]=KSnakeDuel
++Name[uk]=KSnakeDuel
++Name[x-test]=xxKSnakeDuelxx
++Name[zh_CN]=KSnakeDuel
++Name[zh_TW]=KSnakeDuel
++X-KDE-StartupNotify=true
++X-DCOP-ServiceType=Multi
++Categories=Qt;KDE;Game;ArcadeGame;
+Index: ksnakeduel-14.12.0/ktron.desktop
+===================================================================
+--- ksnakeduel-14.12.0.orig/ktron.desktop
++++ /dev/null
+@@ -1,53 +0,0 @@
+-[Desktop Entry]
+-Type=Application
+-Exec=ktron -caption %c %i
+-Icon=ktron
+-X-DocPath=ktron/index.html
+-Terminal=false
+-Name=KSnakeDuel
+-Name[bs]=KSnakeDuel
+-Name[ca]=KSnakeDuel
+-Name[ca at valencia]=KSnakeDuel
+-Name[cs]=KSnakeDuel
+-Name[da]=KSnakeDuel
+-Name[de]=KSnakeDuel
+-Name[el]=KSnakeDuel
+-Name[en_GB]=KSnakeDuel
+-Name[es]=KSnakeDuel
+-Name[et]=KSnakeDuel
+-Name[fi]=KSnakeDuel
+-Name[fr]=KSnakeDuel
+-Name[ga]=KSnakeDuel
+-Name[gl]=KSnakeDuel
+-Name[hu]=KSnakeDuel
+-Name[it]=KSnakeDuel
+-Name[kk]=KSnakeDuel
+-Name[km]=KSpaceDuel
+-Name[ko]=KSnakeDuel
+-Name[lt]=KSpaceDuel
+-Name[lv]=KSpaceDuel
+-Name[mr]=के-स्नेक-ड्युएल
+-Name[nb]=KSnakeDuel
+-Name[nds]=KSnakeDuel
+-Name[nl]=KSnakeDuel
+-Name[pl]=KSnakeDuel
+-Name[pt]=KSnakeDuel
+-Name[pt_BR]=KSnakeDuel
+-Name[ro]=KSnakeDuel
+-Name[ru]=Дуэль KSnake
+-Name[sk]=KSnakeDuel
+-Name[sl]=KSnakeDuel
+-Name[sr]=К‑змијски-двобој
+-Name[sr at ijekavian]=К‑змијски-двобој
+-Name[sr at ijekavianlatin]=K‑zmijski-dvoboj
+-Name[sr at latin]=K‑zmijski-dvoboj
+-Name[sv]=Ormspel
+-Name[tr]=KSnakeDuel
+-Name[ug]=KSnakeDuel
+-Name[uk]=KSnakeDuel
+-Name[x-test]=xxKSnakeDuelxx
+-Name[zh_CN]=KSnakeDuel
+-Name[zh_TW]=KSnakeDuel
+-X-KDE-StartupNotify=true
+-X-DCOP-ServiceType=Multi
+-Categories=Qt;KDE;Game;ArcadeGame;
diff --git a/debian/rules b/debian/rules
index 1a1dd13..af1bd9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,3 @@ override_dh_auto_configure:
 
 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
diff --git a/debian/watch b/debian/watch
index 4c2b340..91fb667 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://download.kde.org/stable/([\d.]+)/src/ksnakeduel-([\d.]+).tar.xz
+http://download.kde.org/stable/applications/([\d.]+)/src/ksnakeduel-([\d.]+).tar.xz
+http://download.kde.org/unstable/applications/([\d.]+)/src/ksnakeduel-([\d.]+).tar.xz

-- 
ksnakeduel packaging



More information about the pkg-kde-commits mailing list