[tuxfootball] 02/02: Imported Debian patch 0.3.1-4

Markus Koschany apo-guest at moszumanska.debian.org
Fri Nov 20 22:56:54 UTC 2015 

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository tuxfootball.

commit 3f5cb76453da534dd54ff58a7cdbaedde184b883
Author: Markus Koschany <apo at debian.org>
Date:   Fri Nov 20 23:00:56 2015 +0100

    Imported Debian patch 0.3.1-4
---
 debian/changelog                   | 19 +++++++++++++++++++
 debian/compat                      |  2 +-
 debian/control                     | 34 +++++++++++++++++++---------------
 debian/copyright                   |  3 +--
 debian/desktop/tuxfootball.desktop | 10 ----------
 debian/install                     |  2 +-
 debian/patches/desktop-file.patch  | 24 ++++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       | 16 +++++++++-------
 debian/tuxfootball.6               |  4 ++--
 10 files changed, 77 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 764ca28..e233b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+tuxfootball (0.3.1-4) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Use compat level 9 and require debhelper >= 9.
+  * wrap-and-sort -sa.
+  * d/control: Change priority from extra to optional because
+    tuxfootball neither conflicts with other packages nor does it have a
+    special use case like debugging symbols.
+  * Maintain the package in a VCS to comply with the team policy.
+    (Closes: #726895)
+  * Build the package with autotools_dev. (Closes: #727991)
+  * Use upstream's desktop file and install tuxfootball icon
+    to hicolor directory. (Closes: #726894)
+  * desktop-file.patch: Change subcategory to SportsGame. Add keywords and
+    remove superfluous shebang.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 20 Nov 2015 23:00:56 +0100
+
 tuxfootball (0.3.1-3) unstable; urgency=low
 
   * Add a manpage. (Closes: #692939)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 139741e..9bec7e4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,28 @@
 Source: tuxfootball
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: TANIGUCHI Takaki <takaki at debian.org>
 Section: games
-Priority: extra
-Build-Depends: debhelper (>= 7.0.50~),
-               autotools-dev,
-	dpkg-dev (>= 1.16.1~),
-	intltool,
-	libsdl-image1.2-dev,
-	libsdl-mixer1.2-dev,
-	libsdl1.2-dev,
-	pkg-config
-Standards-Version: 3.9.3
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders:
+ TANIGUCHI Takaki <takaki at debian.org>
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ dpkg-dev (>= 1.16.1~),
+ intltool,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libsdl1.2-dev,
+ pkg-config
+Standards-Version: 3.9.6
 Homepage: http://tuxfootball.sourceforge.net/
+Vcs-Git: git://anonscm.debian.org/pkg-games/tuxfootball.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/tuxfootball.git
 
 Package: tuxfootball
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: great 2D soccer (sometimes called football) game
  It's bringing old style gameplay from DOS times back to the desktop with up
  to date graphics! Its gameplay is similar to old classics such as Amco's
@@ -30,4 +35,3 @@ Description: great 2D soccer (sometimes called football) game
  want the ball to bend towards. Pushing in the opposite direction to what
  you kicked the ball makes it raise into the air, pushing in the same
  direction as the ball makes it dip towards the ground.
-
diff --git a/debian/copyright b/debian/copyright
index 4f6929f..6c19aaf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,7 @@ Copyright: 2004 Lion Vollnhals
            2003 Matthias Braun
 License: GPL-2+
 
-Files: src/SFont.{c h}
+Files: src/SFont.*
 Copyright: 2003 Karl Bartel
 License: GPL-2+ or LGPL-2+
 
@@ -39,4 +39,3 @@ License: LGPL-2+
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
-
diff --git a/debian/desktop/tuxfootball.desktop b/debian/desktop/tuxfootball.desktop
deleted file mode 100644
index 947c43a..0000000
--- a/debian/desktop/tuxfootball.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Tuxfootball
-Comment=2D Football Game
-Exec=tuxfootball
-# Icon=grisbi.png
-Terminal=false
-Categories=Application;Game;
-
diff --git a/debian/install b/debian/install
index f6518dc..5b2f0e8 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-debian/desktop/* /usr/share/applications
+tuxfootball.desktop     usr/share/applications
diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
new file mode 100644
index 0000000..ca49278
--- /dev/null
+++ b/debian/patches/desktop-file.patch
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 20 Nov 2015 23:11:48 +0100
+Subject: desktop file
+
+---
+ tuxfootball.desktop.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tuxfootball.desktop.in b/tuxfootball.desktop.in
+index bad1a66..eab45fc 100644
+--- a/tuxfootball.desktop.in
++++ b/tuxfootball.desktop.in
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env xdg-open
+ [Desktop Entry]
+ Name=Tux Football
+ Comment=A fun arcade-style 2D football game, very reminsicent of Sensible Soccer and Kick Off
+@@ -7,4 +6,5 @@ Exec=tuxfootball
+ Terminal=false
+ Icon=tuxfootball
+ Type=Application
+-Categories=Game;ArcadeGame;
++Categories=Game;SportsGame;
++Keywords=soccer;football;sport;
diff --git a/debian/patches/series b/debian/patches/series
index 0ac249d..7f1a4f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_ftbfs_menu_h
+desktop-file.patch
diff --git a/debian/rules b/debian/rules
index 78cb8b1..e2bc1c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,17 +13,19 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@
+	dh $@ --with autotools_dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --prefix=/usr/share \
+	dh_auto_configure -- \
+		--prefix=/usr/share \
 		--datadir=/usr/share/games \
 		--bindir=/usr/games \
 		--docdir=/usr/share/doc
 
 override_dh_auto_install:
-	dh_auto_install -- desktopdir=/usr/share/applications \
-			icondir=/usr/share/icons
-	rm $(CURDIR)/debian/tuxfootball/usr/share/doc/tuxfootball/INSTALL
-	rm $(CURDIR)/debian/tuxfootball/usr/share/doc/tuxfootball/COPYING
-	rm $(CURDIR)/debian/tuxfootball/usr/share/doc/tuxfootball/ChangeLog
+	dh_auto_install -- \
+		desktopdir=/usr/share/applications \
+		icondir=/usr/share/icons/hicolor/128x128/apps
+	$(RM) $(CURDIR)/debian/tuxfootball/usr/share/doc/tuxfootball/INSTALL
+	$(RM) $(CURDIR)/debian/tuxfootball/usr/share/doc/tuxfootball/COPYING
+	$(RM) $(CURDIR)/debian/tuxfootball/usr/share/doc/tuxfootball/ChangeLog
diff --git a/debian/tuxfootball.6 b/debian/tuxfootball.6
index e3b3900..0881fe8 100644
--- a/debian/tuxfootball.6
+++ b/debian/tuxfootball.6
@@ -1,6 +1,6 @@
 .TH tuxfootball 6 "November 2012" "Tux Football" "Tux Football(6) manpage"
 .SH NAME
-tuxfootball \- great 2D soccer (sometimes called football) game 
+tuxfootball \- great 2D soccer (sometimes called football) game
 .SH SYNOPSIS
 .B tuxfootball
 [\fIOPTION...\fR]
@@ -8,7 +8,7 @@ tuxfootball \- great 2D soccer (sometimes called football) game
 .PP
 \fBTux Football\fP brings old style gameplay from DOS times back to the desktop
 with up to date graphics! Its gameplay is similar to old classics such as
-Amco's Kick Off and Sensible Software's Sensible Soccer. 
+Amco's Kick Off and Sensible Software's Sensible Soccer.
 
 The gameplay is designed to be quick, responsive and fun. You are always in
 control of the player closest to the ball. The ball is controlled via two

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tuxfootball.git

More information about the Pkg-games-commits mailing list