[whichwayisup] 21/34: New revision 0.7.9-3
Markus Koschany
apo at moszumanska.debian.org
Sat Jul 16 19:06:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository whichwayisup.
commit bbd9d42287cb8ce0c2ed172a72d3042745a24d78
Author: Markus Koschany <apo at gambaru.de>
Date: Tue May 28 18:36:11 2013 +0000
New revision 0.7.9-3
- Switch to source format 3.0 (quilt)
- compat level 9, debhelper >=9
- Update copyright to format 1.0
- Add missing Bitstream Vera license
- Fix all outstanding bugs.
- Add higher resolution whichwayisup png icon
- Use dh sequencer and build with python2.
- See also changelog
---
debian/README.source | 6 -
debian/{game.sh => bin/whichwayisup} | 3 +-
debian/changelog | 34 +++-
debian/compat | 2 +-
debian/control | 22 +-
debian/copyright | 221 ++++++++++++---------
debian/docs | 1 +
.../patches/check-for-joystick-axes-not-null.patch | 21 ++
debian/patches/font_path.patch | 16 +-
.../initialize-only-required-pygame-modules.patch | 23 +++
debian/patches/series | 2 +
debian/rules | 62 +-----
debian/source/format | 1 +
debian/source/include-binaries | 1 +
debian/watch | 9 +-
debian/whichwayisup.desktop | 2 +
debian/whichwayisup.install | 17 +-
debian/whichwayisup.links | 2 -
debian/whichwayisup.menu | 9 +-
debian/whichwayisup.png | Bin 0 -> 1664 bytes
20 files changed, 261 insertions(+), 193 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 7df3fd2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
diff --git a/debian/game.sh b/debian/bin/whichwayisup
old mode 100644
new mode 100755
similarity index 79%
rename from debian/game.sh
rename to debian/bin/whichwayisup
index 9386dfe..e52871e
--- a/debian/game.sh
+++ b/debian/bin/whichwayisup
@@ -1,4 +1,5 @@
-#!/bin/sh --
+#!/bin/sh
+set -e
cd /usr/share/games/whichwayisup/
exec python run_game.py "$@"
diff --git a/debian/changelog b/debian/changelog
index be2741b..e0b48b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,38 @@
-whichwayisup (0.7.9-3) UNRELEASED; urgency=low
+whichwayisup (0.7.9-3) unstable; urgency=low
+ [ Ansgar Burchhardt ]
* debian/game.sh: Use exec when calling python.
- -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 19 Jul 2010 16:01:08 +0900
+ [ Markus Koschany ]
+ * Add myself to Uploaders.
+ * Switch to source format 3.0 (quilt).
+ * Bump compat level to 9 and require debhelper >= 9.
+ * debian/control:
+ - Drop quilt dependency. Source format 3.0 uses quilt by default.
+ - Use canonical Vcs-URI.
+ - Bump Standards-Version to 3.9.4, no changes.
+ - Depend on fonts-dejavu-core instead of ttf-dejavu-core.
+ - Add python, python-pygame and python-ogg to Build-Depends-Indep.
+ - Replace python with ${python:Depends}.
+ * Move game.sh to bin/whichwayisup and install it to /usr/games directly.
+ Hence we can drop whichwayisup.links.
+ * Add longtitle to whichwayisup.menu
+ * Add keywords and comment in German to desktop file.
+ * Drop README.source.
+ * Simplify debian/rules by using dh sequencer and build with --python2.
+ * Add DEP-3 headers to all patches.
+ * Add initialize-only-required-pygame-modules.patch. (Closes: #432015)
+ * Add check-for-joystick-axes-not-null.patch.
+ - Under certain circumstances whichwayisup detected keyboards as joysticks.
+ This patch also checks whether the joystick has axes. This prevents the
+ game from failing to start. (Closes: #710162)
+ * Update debian/copyright to copyright format 1.0.
+ * Add Bitstream-Vera-Fonts license.
+ * Install documentation how to create new game levels. (creating_levels.txt)
+ * Install a higher resolution whichwayisup.png icon. (Closes: #471579)
+ * Update debian/watch and make the extension regex more flexible.
+
+ -- Markus Koschany <apo at gambaru.de> Tue, 28 May 2013 19:45:33 +0200
whichwayisup (0.7.9-2) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 7296c73..8a90c40 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,26 @@ Source: whichwayisup
Section: games
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Ansgar Burchardt <ansgar at 43-1.org>
-Build-Depends: debhelper (>= 5), quilt
-Standards-Version: 3.8.0
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/whichwayisup/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/whichwayisup/?op=log
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Ansgar Burchardt <ansgar at 43-1.org>,
+ Markus Koschany <apo at gambaru.de>
+Build-Depends: debhelper (>= 9)
+Build-Depends-Indep: python, python-ogg, python-pygame
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-games/packages/trunk/whichwayisup/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/whichwayisup/
Homepage: http://hectigo.net/puskutraktori/whichwayisup/
Package: whichwayisup
Architecture: all
-Depends: ttf-dejavu-core, python, python-pygame, python-ogg, ${misc:Depends}
+Depends:
+ fonts-dejavu-core,
+ python-ogg,
+ python-pygame,
+ ${misc:Depends},
+ ${python:Depends}
Description: 2D platform game with a slight rotational twist
Which Way Is Up, a traditional and challenging 2D platform game with a
slight rotational twist. Help a mysterious big-eared salaryman named Guy
find his keys in a labyrinth of dangers and bad dialogue.
-
diff --git a/debian/copyright b/debian/copyright
index a1923ac..354a1c3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,54 +1,48 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Thu, 31 May 2007 19:11:12 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Which Way Is Up
+Source: http://hectigo.net/puskutraktori/whichwayisup
-It was downloaded from http://hectigo.net/puskutraktori/whichwayisup/
+Files: *
+Copyright: 2007, Olli "Hectigo" Etuaho <admin at hectigo.net>
+License: GPL-2
-Upstream Author:
+Files: data/*
+Copyright: 2007, Olli "Hectigo" Etuaho <admin at hectigo.net>
+License: CC-BY
- Olli "Hectigo" Etuaho <admin at hectigo.net>
+Files: data/misc/Vera.ttf
+Copyright: 2003, Bitstream Inc
+License: Bitstream-Vera-Fonts-Copyright
-Copyright:
+Files: debian/*
+Copyright: 2007-2008, Miriam Ruiz <miriam at debian.org>
+ 2007-2008, Jon Dowland <jmtd at debian.org>
+ 2008, Evgeni Golov
+ 2008-2010, Ansgar Burchhardt <ansgar at debian.org>
+ 2013, Markus Koschany <apo at gambaru.de>
+License: GPL-2
- Copyright (c) 2007 Olli Etuaho
-
-License:
-
-All game code is licensed under the GPL 2.0
-( http://www.gnu.org/licenses/gpl2.html )
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2 as
- published by the Free Software Foundation.
-
- 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
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License
-version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-
-All game content, sounds and graphics are licensed
-under Creative Commons 3.0 Attribution license
-( http://creativecommons.org/licenses/by/3.0/ )
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
-BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
-CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
-IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
+License: 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: CC-BY
+ All game content, sounds and graphics are licensed
+ under Creative Commons 3.0 Attribution license
+ ( http://creativecommons.org/licenses/by/3.0/ )
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO
+ BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
+ CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
+ IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+ .
+ 1. Definitions
+ .
a. "Adaptation" means a work based upon the Work, or upon the Work and other
pre-existing works, such as a translation, adaptation, derivative work,
arrangement of music or other alterations of a literary or artistic work,
@@ -120,17 +114,17 @@ IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
fixation and reproducing fixations of the Work, including storage of a
protected performance or phonogram in digital form or other electronic
medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit,
-or restrict any uses free from copyright or rights arising from limitations or
-exceptions that are provided for in connection with the copyright protection
-under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor
-hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the
-duration of the applicable copyright) license to exercise the rights in the
-Work as stated below:
-
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit,
+ or restrict any uses free from copyright or rights arising from limitations or
+ exceptions that are provided for in connection with the copyright protection
+ under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License, Licensor
+ hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the
+ duration of the applicable copyright) license to exercise the rights in the
+ Work as stated below:
+ .
a. to Reproduce the Work, to incorporate the Work into one or more
Collections, and to Reproduce the Work as incorporated in the
Collections;
@@ -159,16 +153,16 @@ Work as stated below:
is a member of a collecting society that administers voluntary
licensing schemes, via that society, from any exercise by You of
the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or
-hereafter devised. The above rights include the right to make such
-modifications as are technically necessary to exercise the rights in other
-media and formats. Subject to Section 8(f), all rights not expressly granted by
-Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
+ .
+ The above rights may be exercised in all media and formats whether now known or
+ hereafter devised. The above rights include the right to make such
+ modifications as are technically necessary to exercise the rights in other
+ media and formats. Subject to Section 8(f), all rights not expressly granted by
+ Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly made
+ subject to and limited by the following restrictions:
+ .
a. You may Distribute or Publicly Perform the Work only under the terms of
this License. You must include a copy of, or the Uniform Resource
Identifier (URI) for, this License with every copy of the Work You
@@ -233,27 +227,27 @@ subject to and limited by the following restrictions:
fullest extent permitted by the applicable national law, to enable You to
reasonably exercise Your right under Section 3(b) of this License (right
to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
-THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
-CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
-WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A
-PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
-ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
-SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
-EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability.
-
-EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE
-LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL,
-PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE
-WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
+ THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
+ CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A
+ PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
+ SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
+ EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability.
+ .
+ EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE
+ LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL,
+ PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE
+ WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
a. This License and the rights granted hereunder will terminate
automatically upon any breach by You of the terms of this License.
Individuals or entities who have received Adaptations or Collections from
@@ -269,9 +263,9 @@ WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
withdraw this License (or any other license that has been, or is required
to be, granted under the terms of this License), and this License will
continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
+ .
+ 8. Miscellaneous
+ .
a. Each time You Distribute or Publicly Perform the Work or a Collection,
the Licensor offers to the recipient a license to the Work on the same
terms and conditions as the license granted to You under this License.
@@ -307,6 +301,47 @@ WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
the License; this License is not intended to restrict the license of any
rights under applicable law.
-
-The Debian packaging is Copyright (C) 2007, Miriam Ruiz <little_miry at yahoo.es>
-and is licensed under the GPL, see above.
+License: Bitstream-Vera-Fonts-Copyright
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+ a trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute the
+ Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright and trademark notices and this permission notice shall
+ be included in all copies of one or more of the Font Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in particular
+ the designs of glyphs or characters in the Fonts may be modified and
+ additional glyphs or characters may be added to the Fonts, only if the fonts
+ are renamed to names not containing either the words "Bitstream" or the word
+ "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream
+ Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but no
+ copy of one or more of the Font Software typefaces may be sold by itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+ FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+ FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font Software
+ without prior written authorization from the Gnome Foundation or Bitstream
+ Inc., respectively. For further information, contact: fonts at gnome dot
+ org.
diff --git a/debian/docs b/debian/docs
index 71dfd5b..c188028 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
README.txt
+data/levels/creating_levels.txt
diff --git a/debian/patches/check-for-joystick-axes-not-null.patch b/debian/patches/check-for-joystick-axes-not-null.patch
new file mode 100644
index 0000000..4cd59e3
--- /dev/null
+++ b/debian/patches/check-for-joystick-axes-not-null.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 28 May 2013 18:40:34 +0200
+Subject: check for joystick axes not null
+
+---
+ lib/game.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/game.py b/lib/game.py
+index f0afd84..30f86fd 100644
+--- a/lib/game.py
++++ b/lib/game.py
+@@ -138,7 +138,7 @@ def parse_inputs(joystick = None):
+ if keys[K_F10]:
+ inputs["SPECIAL"] = True
+
+- if joystick != None: # Parse joystick input
++ if joystick != None and joystick.get_numaxes() != 0: # Parse joystick input
+
+ axis0 = joystick.get_axis(0)
+
diff --git a/debian/patches/font_path.patch b/debian/patches/font_path.patch
index 908f101..a2cb6e1 100644
--- a/debian/patches/font_path.patch
+++ b/debian/patches/font_path.patch
@@ -1,6 +1,16 @@
---- whichwayisup-0.7.9.orig/lib/util.py
-+++ whichwayisup-0.7.9/lib/util.py
-@@ -29,7 +29,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Mon, 27 May 2013 23:37:46 +0200
+Subject: font_path
+
+---
+ lib/util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/util.py b/lib/util.py
+index 6989474..c81e758 100644
+--- a/lib/util.py
++++ b/lib/util.py
+@@ -29,7 +29,7 @@ class Score:
class Util:
pygame.font.init()
diff --git a/debian/patches/initialize-only-required-pygame-modules.patch b/debian/patches/initialize-only-required-pygame-modules.patch
new file mode 100644
index 0000000..5241f0f
--- /dev/null
+++ b/debian/patches/initialize-only-required-pygame-modules.patch
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 28 May 2013 18:21:54 +0200
+Subject: initialize only required pygame modules.
+
+---
+ lib/main.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/main.py b/lib/main.py
+index cfe9046..6a0376a 100644
+--- a/lib/main.py
++++ b/lib/main.py
+@@ -60,7 +60,9 @@ def main():
+
+ #Initializing pygame and screen
+
+- pygame.init()
++ pygame.joystick.init()
++ pygame.display.init()
++ pygame.mixer.init()
+ screen = pygame.display.set_mode((SCREEN_WIDTH,SCREEN_HEIGHT))
+ caption = "Which way is up?"
+ if (Variables.vdict["devmode"]):
diff --git a/debian/patches/series b/debian/patches/series
index 58b43a1..5c64826 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
font_path.patch
+initialize-only-required-pygame-modules.patch
+check-for-joystick-axes-not-null.patch
diff --git a/debian/rules b/debian/rules
index d55ec05..43c1a4e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,8 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
- touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- touch $@
+%:
+ dh $@ --with python2
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- chmod +x run_game.py
- chmod +x debian/game.sh
- dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
+override_dh_installchangelogs:
dh_installchangelogs changelog.txt
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..5d57cd3
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/whichwayisup.png
diff --git a/debian/watch b/debian/watch
index 7f8a35c..7bab5ed 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,10 +1,3 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
-# Examine a Webpage
-# <Webpage URL> <string match>
opts="uversionmangle=s/^b//;s/(\d)(\d)(\d)/$1.$2.$3/g" \
-http://hectigo.net/puskutraktori/whichwayisup/ whichwayisup_([^_]+)\.zip
+http://hectigo.net/puskutraktori/whichwayisup/ whichwayisup_([^_]+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
diff --git a/debian/whichwayisup.desktop b/debian/whichwayisup.desktop
index 1527060..ee4a671 100644
--- a/debian/whichwayisup.desktop
+++ b/debian/whichwayisup.desktop
@@ -3,7 +3,9 @@ Type=Application
Name=Which Way is Up
GenericName=whichwayisup
Comment=2D platform game with a slight rotational twist
+Comment[de]=2D-Jump'n'Run-Spiel mit einem leichten Rotationsdrall
Icon=whichwayisup
Exec=whichwayisup
Terminal=false
Categories=Game;ArcadeGame;
+Keywords=2D;game;arcade;platform;
diff --git a/debian/whichwayisup.install b/debian/whichwayisup.install
index 276c052..be3357e 100644
--- a/debian/whichwayisup.install
+++ b/debian/whichwayisup.install
@@ -1,8 +1,9 @@
-debian/game.sh usr/share/games/whichwayisup
-*.py usr/share/games/whichwayisup
-lib/*.py usr/share/games/whichwayisup/lib
-data/levels/* usr/share/games/whichwayisup/data/levels
-data/pictures/* usr/share/games/whichwayisup/data/pictures
-data/sounds/* usr/share/games/whichwayisup/data/sounds
-debian/*.xpm usr/share/pixmaps/
-debian/*.desktop usr/share/applications/
+*.py usr/share/games/whichwayisup
+data/levels/* usr/share/games/whichwayisup/data/levels
+data/pictures/* usr/share/games/whichwayisup/data/pictures
+data/sounds/* usr/share/games/whichwayisup/data/sounds
+debian/*.desktop usr/share/applications/
+debian/*.xpm usr/share/pixmaps/
+debian/*.png usr/share/pixmaps/
+debian/bin/whichwayisup usr/games
+lib usr/share/games/whichwayisup
diff --git a/debian/whichwayisup.links b/debian/whichwayisup.links
deleted file mode 100644
index 06b0e2e..0000000
--- a/debian/whichwayisup.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/games/whichwayisup/game.sh usr/games/whichwayisup
-
diff --git a/debian/whichwayisup.menu b/debian/whichwayisup.menu
index a32abbc..1892219 100644
--- a/debian/whichwayisup.menu
+++ b/debian/whichwayisup.menu
@@ -1,3 +1,6 @@
-?package(whichwayisup):needs="x11" section="Games/Action" \
- title="Which Way is Up" command="/usr/games/whichwayisup" \
- icon="/usr/share/pixmaps/whichwayisup.xpm"
+?package(whichwayisup):needs="x11" \
+ section="Games/Action" \
+ title="Which Way is Up" \
+ longtitle="whichwayisup - 2D platform game with a slight rotational twist" \
+ command="/usr/games/whichwayisup" \
+ icon="/usr/share/pixmaps/whichwayisup.xpm"
diff --git a/debian/whichwayisup.png b/debian/whichwayisup.png
new file mode 100644
index 0000000..5f45e3a
Binary files /dev/null and b/debian/whichwayisup.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/whichwayisup.git
More information about the Pkg-games-commits
mailing list