r14046 - in packages/trunk/funnyboat/debian: . bin patches source
Markus Koschany
apo-guest at alioth.debian.org
Fri May 10 11:33:43 UTC 2013
Author: apo-guest
Date: 2013-05-10 11:33:43 +0000 (Fri, 10 May 2013)
New Revision: 14046
Added:
packages/trunk/funnyboat/debian/bin/
packages/trunk/funnyboat/debian/bin/funnyboat
packages/trunk/funnyboat/debian/docs
packages/trunk/funnyboat/debian/funnyboat.6
packages/trunk/funnyboat/debian/install
packages/trunk/funnyboat/debian/manpages
packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.patch
packages/trunk/funnyboat/debian/patches/fullscreen.patch
packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.patch
packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.patch
packages/trunk/funnyboat/debian/patches/sink-the-titanic.patch
packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.patch
packages/trunk/funnyboat/debian/source/
packages/trunk/funnyboat/debian/source/format
Removed:
packages/trunk/funnyboat/debian/funnyboat.sgml
packages/trunk/funnyboat/debian/funnyboat.sh
packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff
packages/trunk/funnyboat/debian/patches/fullscreen.diff
packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff
packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff
packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff
Modified:
packages/trunk/funnyboat/debian/changelog
packages/trunk/funnyboat/debian/compat
packages/trunk/funnyboat/debian/control
packages/trunk/funnyboat/debian/copyright
packages/trunk/funnyboat/debian/funnyboat.desktop
packages/trunk/funnyboat/debian/funnyboat.menu
packages/trunk/funnyboat/debian/patches/series
packages/trunk/funnyboat/debian/rules
packages/trunk/funnyboat/debian/watch
Log:
Unreleased update 1.5-9
See changelog.
New quilt format 3.0
compat 9
sink-the-titanic.patch
copyright format 1.0
Drop docbook-to-man build dependency.
Added: packages/trunk/funnyboat/debian/bin/funnyboat
===================================================================
--- packages/trunk/funnyboat/debian/bin/funnyboat (rev 0)
+++ packages/trunk/funnyboat/debian/bin/funnyboat 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/share/games/funnyboat
+exec python /usr/share/games/funnyboat/main.py "$@"
Property changes on: packages/trunk/funnyboat/debian/bin/funnyboat
___________________________________________________________________
Added: svn:executable
+ *
Modified: packages/trunk/funnyboat/debian/changelog
===================================================================
--- packages/trunk/funnyboat/debian/changelog 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/changelog 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,3 +1,37 @@
+funnyboat (1.5-9) UNRELEASED; urgency=low
+
+ * Team upload.
+
+ [ Gonéri Le Bouder ]
+ * Remove myself from Uploaders.
+
+ [ Markus Koschany ]
+ * Switch to package format 3.0 (quilt)
+ * Bump compat level to 9 and require debhelper >=9.
+ * debian/control:
+ - Bump Standards-Version to 3.9.4, no changes needed.
+ - Drop quilt build dependency because package format 3.0 uses quilt by
+ default.
+ - Drop docbook-to-man build dependency and convert funnyboat.sgml to
+ funnyboat.6 man page.
+ - Move python dependency to Build-Depends-Indep and add also python-pygame
+ and python-ogg.
+ - Update to use the canonical Vcs-URI.
+ - Fix lintian warning "short description starts with an article".
+ * Simplify debian/rules by using dh sequencer and build with --python2.
+ * Install documentation and man page via manpages and docs file.
+ * Improve watch file by making the extension regex more flexible.
+ * Add DEP3 headers to all patches.
+ * Use install file to install all required game files.
+ * Add keywords and a comment in German to funnyboat.desktop.
+ * Update debian/copyright to copyright format 1.0.
+ * Rename funnyboat.sh to funnyboat and move the wrapper script to the bin
+ subdirectory.
+ * Add sink-the-titanic.patch which makes it easier to sink the ship.
+ Thanks to Vivien for the report and patch. (Closes: #582234)
+
+ -- Markus Koschany <apo at gambaru.de> Thu, 09 May 2013 23:16:08 +0200
+
funnyboat (1.5-8) unstable; urgency=low
[ Gonéri Le Bouder ]
@@ -5,11 +39,11 @@
- add fullscreen.diff
* Fix crash if self.image.set_alpha arg is > int (Closes: #534596)
- add avoid_set_alpha_crash.diff
- * Standards Version: 3.8.2 no changes
+ * Standards Version: 3.8.2 no changes
* Clean up in debian/rules
[ Paul Wise ]
- * Do not call dh_desktop anymore
+ * Do not call dh_desktop anymore
-- Gonéri Le Bouder <goneri at rulezlan.org> Fri, 14 Aug 2009 22:26:59 +0200
Modified: packages/trunk/funnyboat/debian/compat
===================================================================
--- packages/trunk/funnyboat/debian/compat 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/compat 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/funnyboat/debian/control
===================================================================
--- packages/trunk/funnyboat/debian/control 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/control 2013-05-10 11:33:43 UTC (rev 14046)
@@ -2,18 +2,25 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), quilt, python
-Build-Depends-Indep: python-support (>= 0.6), docbook-to-man
-Standards-Version: 3.8.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funnyboat/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/funnyboat/?op=log
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends: debhelper (>= 9)
+Build-Depends-Indep: python, python-ogg, python-pygame
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/funnyboat/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/funnyboat/
Homepage: http://funnyboat.sf.net/
Package: funnyboat
Architecture: all
-Depends: ${python:Depends}, ttf-dejavu, python-pygame (>= 1.7), python-ogg, ${misc:Depends}
-Description: a side scrolling arcade shooter game on a steamboat
- Trip on the Funny Boat is side scrolling arcade shooter game on a
+Depends:
+ python-ogg,
+ python-pygame,
+ ttf-dejavu,
+ ${misc:Depends},
+ ${python:Depends}
+Description: side scrolling arcade shooter game on a steamboat
+ Trip on the Funny Boat is a side scrolling arcade shooter game on a
steamboat equipped with a cannon and the ability to jump. The player will
need to take advantage of waves to defeat the enemies and dodge hazards.
Modified: packages/trunk/funnyboat/debian/copyright
===================================================================
--- packages/trunk/funnyboat/debian/copyright 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/copyright 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,111 +1,119 @@
-This package was debianized for the Debian Games Team by
-Gonéri Le Bouder <goneri at rulezlan.org> n Wed, 27 Mar 2002 10:40:28 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Funnyboat
+Source: https://sourceforge.net/projects/funnyboat/
-It was downloaded from http://sourceforge.net/projects/funnyboat/
-Upstream Authors:
+Files: *
+Copyright: 2006, Olli "Hectigo" Etuaho <admin at hectigo.net>
+License: GPL-2
- Code, graphics and sound effects:
- Pekka "pekuja" Kujansuu <pekuja at iki.fi>
- Graphics and code:
- Olli "Hectigo" Etuaho <admin at hectigo.net>
- Music:
- Joona "JDruid" Karjalainen <jhkarja2 at cc.hut.fi>
+Files: *.png
+ *.ogg
+Copyright: 2006, Pekka "pekuja" Kujansuu <pekuja at iki.fi>
+ 2006, Olli "Hectigo" Etuaho <admin at hectigo.net>
+ 2006, Joona "JDruid" Karjalainen <jhkarja2 at cc.hut.fi>
+License: Expat
- New features and bugfixes in version 1.3:
- Konstantin Yegupov:
+Files: PixelPerfect.py
+Copyright: 2006, John Eriksson
+License: public-domain
+ The PixelPerfect collision detection library was created by John Eriksson in
+ 2006 and is under public domain. It can be found on mr. Eriksson's website at
+ http://arainyday.se/projects/python/PixelPerfect/ . (500 error on 2013-05-10)
+ "Both the PixelPerfect implementation and the example code is public domain."
-Copyright:
+Files: data/Vera.ttf
+Copyright: 2003, Bitstream Inc.
+License: Bitstream-Vera-Font-License
- Copyright (c) 2006-2007 Olli Etuaho, Joona Karjalainen, Pekka Kujansuu
+Files: debian/*
+Copyright: 2007-2009, Gonéri Le Bouder <goneri at rulezlan.org>
+ 2007-2009, Miriam Ruiz, Cyril Brulebois, Ansgar Burchardt, Jon
+ Dowland, Paul Wise, Marco Rodrigues
+ 2009, Barry deFreese <bdefreese at debian.org>
+ 2013, Markus Koschany <apo at gambaru.de>
+License: GPL-2
- Vera TrueType Fonts: Copyright (c) 2003 Bitstream, Inc
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License 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 can be found in `/usr/share/common-licenses/GPL-2'.
-License:
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- 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
+License: Bitstream-Vera-Font-License
+ Copyright (C) 2003 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.org>.
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-
-The graphics, sound effects and music are provided under the MIT License:
-
-Copyright (c) 2006-2007 Olli Etuaho, Joona Karjalainen, Pekka Kujansuu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Vera TrueType Fonts:
-
- Copyright (C) 2003 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.org>.
-
-
-The PixelPerfect collision detection library was created by John Eriksson in
-2006 and is under public domain. It can be found on mr. Eriksson's website at
-http://arainyday.se/projects/python/PixelPerfect/
-
-"Both the PixelPerfect implementation and the example code is public domain."
-
-
-The Debian packaging is licensed under the GPL, see above.
Added: packages/trunk/funnyboat/debian/docs
===================================================================
--- packages/trunk/funnyboat/debian/docs (rev 0)
+++ packages/trunk/funnyboat/debian/docs 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1 @@
+README.txt
Added: packages/trunk/funnyboat/debian/funnyboat.6
===================================================================
--- packages/trunk/funnyboat/debian/funnyboat.6 (rev 0)
+++ packages/trunk/funnyboat/debian/funnyboat.6 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,63 @@
+.TH "FUNNYBOAT" "6"
+.SH "NAME"
+funnyboat \- an arcade boat game
+.SH "SYNOPSIS"
+.PP
+\fBfunnyboat\fR
+[\fIOPTIONS\fR]
+.SH "DESCRIPTION"
+.PP
+This manual page documents briefly the
+\fBfunnyboat\fR command.
+.PP
+This manual page was written for the \fBDebian\fP distribution
+because the original program does not have a manual page.
+.PP
+\fBfunnyboat\fR launches the game.
+.SH "CONTROLS"
+.IP "\fBLeft cursor key / Joystick or gamepad left\fP " 10
+Move left
+
+.IP "\fBRight cursor key / Joystick or gamepad right\fP " 10
+Move right
+
+.IP "\fBUp cursor key / Joystick or gamepad button #1\fP " 10
+Jump
+
+.IP "\fBSpace bar / Joystick or gamepad button #2\fP " 10
+Shoot with cannon
+
+.IP "\fBS key / Joystick or gamepad button #6\fP " 10
+Save screenshot as sshot.tga
+
+.IP "\fBP key / Joystick or gamepad button #9\fP " 10
+Pause the game.
+
+.SH "OPTIONS"
+.IP "\fB-f\fP " 10
+Turn on the fullscreen mode.
+
+.IP "\fB-np\fP " 10
+Turn off the "particle effects".
+
+.IP "\fB-na\fP " 10
+Turn off the antialiasing.
+
+.IP "\fB-nm\fP " 10
+Turn off the music.
+
+.IP "\fB-ns\fP " 10
+Turn off the sound effects.
+
+.SH "AUTHOR"
+.PP
+This manual page was written by Goneri Le Bouder <goneri at rulezlan.org> for
+the \fBDebian\fP system (but may be used by others). Permission is
+granted to copy, distribute and/or modify this document under
+the terms of the GNU General Public License, Version 2 any
+later version published by the Free Software Foundation.
+
+.PP
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL-2.
+
Modified: packages/trunk/funnyboat/debian/funnyboat.desktop
===================================================================
--- packages/trunk/funnyboat/debian/funnyboat.desktop 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/funnyboat.desktop 2013-05-10 11:33:43 UTC (rev 14046)
@@ -7,5 +7,6 @@
Name=Funny Boat
Comment=a side scrolling arcade shooter game on a steamboat
Comment[fr_FR]=un étrange bateau a vapeur dans un jeu de tire amusant
+Comment[de]=ein seitwärts scrollender Arcade-Shooter auf einem Dampfschiff
Categories=Game;ArcadeGame;
-StartupNotify=true
+Keywords=boat;funny;arcade;shooter;water;game;
Modified: packages/trunk/funnyboat/debian/funnyboat.menu
===================================================================
--- packages/trunk/funnyboat/debian/funnyboat.menu 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/funnyboat.menu 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,5 +1,6 @@
-?package(funnyboat):needs="X11" section="Games/Action"\
- title="Funny Boat" command="/usr/games/funnyboat"\
- longtitle="Trip on the Funny Boat"\
+?package(funnyboat):needs="X11" \
+ section="Games/Action" \
+ title="Funny Boat" \
+ longtitle="Trip on the Funny Boat" \
+ command="/usr/games/funnyboat" \
icon="/usr/share/pixmaps/funnyboat.xpm"
-
Deleted: packages/trunk/funnyboat/debian/funnyboat.sgml
===================================================================
--- packages/trunk/funnyboat/debian/funnyboat.sgml 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/funnyboat.sgml 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,243 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-page: `docbook-to-man manpage.sgml > manpage.1'. You may view
-the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-less'. A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-docbook-to-man $< > $@
-
-
-The docbook-to-man binary is found in the docbook-to-man package.
-Please remember that if you create the nroff version in one of the
-debian/rules file targets (such as build), you will need to include
-docbook-to-man in your Build-Depends control field.
-
--->
-
-<!-- Fill in your name for FIRSTNAME and SURNAME. -->
-<!ENTITY dhfirstname "<firstname>Goneri</firstname>">
-<!ENTITY dhsurname "<surname>Le Bouder</surname>">
-<!-- Please adjust the date whenever revising the manpage. -->
-<!ENTITY dhdate "<date>January 22, 2007</date>">
-<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-allowed: see man(7), man(1). -->
-<!ENTITY dhsection "<manvolnum>6</manvolnum>">
-<!ENTITY dhemail "<email>goneri at rulezlan.org</email>">
-<!ENTITY dhusername "Goneri Le Bouder">
-<!ENTITY dhucpackage "<refentrytitle>FUNNYBOAT</refentrytitle>">
-<!ENTITY dhpackage "funnyboat">
-
-<!ENTITY debian "<productname>Debian</productname>">
-<!ENTITY gnu "<acronym>GNU</acronym>">
-<!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
-
-<!ENTITY url "http://funnyboat.sf.net/">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2007</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
-
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>an arcade boat game</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>&dhpackage;</command>
-
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para>This manual page documents briefly the
- <command>&dhpackage;</command> and program.</para>
-
- <para>This manual page was written for the &debian; distribution
- because the original program does not have a manual page.</para>
-
- <para><command>funnyboat</command> launches the game.</para>
-
- </refsect1>
-
-
- <refsect1>
- <title>CONTROLS</title>
- <variablelist>
-
- <varlistentry>
- <term><option>Left cursor key / Joystick or gamepad left</option>
- </term>
- <listitem>
- <para>
- Move left
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>Right cursor key / Joystick or gamepad right</option>
- </term>
- <listitem>
- <para>
- Move right
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>Up cursor key / Joystick or gamepad button #1</option>
- </term>
- <listitem>
- <para>
- Jump
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>Space bar / Joystick or gamepad button #2</option>
- </term>
- <listitem>
- <para>
- Shoot with cannon
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>S key / Joystick or gamepad button #6</option>
- </term>
- <listitem>
- <para>
- Save screenshot as sshot.tga
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>P key / Joystick or gamepad button #9</option>
- </term>
- <listitem>
- <para>
- Pause the game.
- </para>
- </listitem>
- </varlistentry>
-
- </variablelist>
- </refsect1>
-
- <refsect1>
- <title>OPTIONS</title>
- <variablelist>
-
- <varlistentry>
- <term><option>-f</option>
- </term>
- <listitem>
- <para>
- Turn on the fullscreen mode.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-np</option>
- </term>
- <listitem>
- <para>
- Turn off the "particle effects".
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-na</option>
- </term>
- <listitem>
- <para>
- Turn off the antialiasing.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-nm</option>
- </term>
- <listitem>
- <para>
- Turn off the music.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-ns</option>
- </term>
- <listitem>
- <para>
- Turn off the sound effects.
- </para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </refsect1>
-
- <refsect1>
- <title>AUTHOR</title>
-
- <para>This manual page was written by &dhusername; <&dhemail;> for
- the &debian; system (but may be used by others). Permission is
- granted to copy, distribute and/or modify this document under
- the terms of the &gnu; General Public License, Version 2 any
- later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
- </para>
-
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
Deleted: packages/trunk/funnyboat/debian/funnyboat.sh
===================================================================
--- packages/trunk/funnyboat/debian/funnyboat.sh 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/funnyboat.sh 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /usr/share/games/funnyboat
-exec python /usr/share/games/funnyboat/main.py "$@"
Added: packages/trunk/funnyboat/debian/install
===================================================================
--- packages/trunk/funnyboat/debian/install (rev 0)
+++ packages/trunk/funnyboat/debian/install 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,5 @@
+*.py usr/share/games/funnyboat
+data usr/share/games/funnyboat
+debian/bin/funnyboat usr/games
+debian/funnyboat.desktop usr/share/applications
+debian/funnyboat.xpm usr/share/pixmaps
Added: packages/trunk/funnyboat/debian/manpages
===================================================================
--- packages/trunk/funnyboat/debian/manpages (rev 0)
+++ packages/trunk/funnyboat/debian/manpages 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1 @@
+debian/funnyboat.6
Deleted: packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,16 +0,0 @@
-#534596
-If val is larger than 'int', image.set_alpha throw an exception. set_alpha
-argument is supposed to be < 256.
---- funnyboat-1.5.orig/particles.py
-+++ funnyboat-1.5/particles.py
-@@ -24,7 +24,9 @@
- pygame.draw.ellipse(self.image, self.colour, self.image.get_rect())
-
- if Variables.alpha:
-- self.image.set_alpha(self.life * 255 * self.opacity / self.initial_life)
-+ val = self.life * 255 * self.opacity / self.initial_life
-+ if val < 256:
-+ self.image.set_alpha(val)
-
- def update(self):
- self.rect.left += self.vect[0]
Added: packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.patch
===================================================================
--- packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.patch (rev 0)
+++ packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.patch 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,26 @@
+From: Goneri Le Bouder <goneri at rulezlan.org>
+Date: Fri, 10 May 2013 18:02:13 +0200
+Subject: avoid_set_alpha_crash
+
+Bug: #534596
+If val is larger than 'int', image.set_alpha throw an exception. set_alpha
+argument is supposed to be < 256.
+---
+ particles.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/particles.py b/particles.py
+index 22c6319..0cec708 100644
+--- a/particles.py
++++ b/particles.py
+@@ -24,7 +24,9 @@ class Particle (pygame.sprite.Sprite):
+ pygame.draw.ellipse(self.image, self.colour, self.image.get_rect())
+
+ if Variables.alpha:
+- self.image.set_alpha(self.life * 255 * self.opacity / self.initial_life)
++ val = self.life * 255 * self.opacity / self.initial_life
++ if val < 256:
++ self.image.set_alpha(val)
+
+ def update(self):
+ self.rect.left += self.vect[0]
Deleted: packages/trunk/funnyboat/debian/patches/fullscreen.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/fullscreen.diff 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/patches/fullscreen.diff 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,83 +0,0 @@
-Add fullscreen support
-Gonéri Le Bouder <goneri at rulezlan.org>
---- funnyboat-1.5.orig/locals.py
-+++ funnyboat-1.5/locals.py
-@@ -6,7 +6,6 @@
- MIN_FIRE_DELAY = 10
- SCREEN_WIDTH = 400#320
- SCREEN_HEIGHT = 300#240
--SCREEN_FULLSCREEN = 0
- FPS = 30
-
-
-@@ -17,3 +16,4 @@
- sound = True
- music = True
- name = "Funny Boater"
-+ fullscreen = True
---- funnyboat-1.5.orig/util.py
-+++ funnyboat-1.5/util.py
-@@ -62,6 +62,8 @@
- Variables.sound = str_to_bool(value)
- elif variable == "aa":
- Variables.aa = str_to_bool(value)
-+ elif variable == "fullscreen":
-+ Variables.fullscreen = str_to_bool(value)
-
- f.close()
-
-@@ -77,6 +79,7 @@
- print >> f, "name\t%s" % Variables.name
- print >> f, "sound\t%s" % Variables.sound
- print >> f, "aa\t%s" % Variables.aa
-+ print >> f, "fullscreen\t%s" % Variables.fullscreen
-
- f.close()
-
---- funnyboat-1.5.orig/options.py
-+++ funnyboat-1.5/options.py
-@@ -14,6 +14,7 @@
- SOUND = 2
- MUSIC = 3
- NAME = 4
-+ FULLSCREEN = 5
-
- def __init__(self, screen):
- self.screen = screen
-@@ -39,7 +40,8 @@
- "Antialiasing: " + (Variables.aa and "on" or "off"),
- "Sound effects: " + (Variables.sound and "on" or "off"),
- "Music: " + (Variables.music and "on" or "off"),
-- "Player Name: " + Variables.name)
-+ "Player Name: " + Variables.name,
-+ "Fullscreen: " + (Variables.fullscreen and "on" or "off"))
-
- def run(self):
- done = False
-@@ -138,6 +140,10 @@
- pygame.mixer.music.stop()
- except:
- pass
-+ elif self.selection == Options.FULLSCREEN:
-+ Variables.fullscreen = not Variables.fullscreen
-+ pygame.display.toggle_fullscreen()
-+
- self.refresh()
-
- def change_right(self):
---- funnyboat-1.5.orig/main.py
-+++ funnyboat-1.5/main.py
-@@ -53,10 +53,10 @@
- elif arg == "-ns":
- Variables.sound = False
- elif arg == "-f":
-- SCREEN_FULLSCREEN = True
-+ Variables.fullscreen = True
-
- scr_options = 0
-- if SCREEN_FULLSCREEN: scr_options += FULLSCREEN
-+ if Variables.fullscreen: scr_options += FULLSCREEN
- screen = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT),scr_options ,32)
-
- pygame.display.set_icon(util.load_image("kuvake"))
-
Added: packages/trunk/funnyboat/debian/patches/fullscreen.patch
===================================================================
--- packages/trunk/funnyboat/debian/patches/fullscreen.patch (rev 0)
+++ packages/trunk/funnyboat/debian/patches/fullscreen.patch 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,100 @@
+From: Goneri Le Bouder <goneri at rulezlan.org>
+Date: Fri, 10 May 2013 18:02:13 +0200
+Subject: fullscreen
+
+Add fullscreen support
+---
+ locals.py | 2 +-
+ main.py | 4 ++--
+ options.py | 8 +++++++-
+ util.py | 3 +++
+ 4 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/locals.py b/locals.py
+index a159721..74882ab 100644
+--- a/locals.py
++++ b/locals.py
+@@ -6,7 +6,6 @@ NEXTFRAME = USEREVENT + 1
+ MIN_FIRE_DELAY = 10
+ SCREEN_WIDTH = 400#320
+ SCREEN_HEIGHT = 300#240
+-SCREEN_FULLSCREEN = 0
+ FPS = 30
+
+
+@@ -17,3 +16,4 @@ class Variables:
+ sound = True
+ music = True
+ name = "Funny Boater"
++ fullscreen = True
+diff --git a/main.py b/main.py
+index f3a8bfa..b12472d 100644
+--- a/main.py
++++ b/main.py
+@@ -53,10 +53,10 @@ def main():
+ elif arg == "-ns":
+ Variables.sound = False
+ elif arg == "-f":
+- SCREEN_FULLSCREEN = True
++ Variables.fullscreen = True
+
+ scr_options = 0
+- if SCREEN_FULLSCREEN: scr_options += FULLSCREEN
++ if Variables.fullscreen: scr_options += FULLSCREEN
+ screen = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT),scr_options ,32)
+
+ pygame.display.set_icon(util.load_image("kuvake"))
+diff --git a/options.py b/options.py
+index c6cdc34..3b603fc 100644
+--- a/options.py
++++ b/options.py
+@@ -14,6 +14,7 @@ class Options:
+ SOUND = 2
+ MUSIC = 3
+ NAME = 4
++ FULLSCREEN = 5
+
+ def __init__(self, screen):
+ self.screen = screen
+@@ -39,7 +40,8 @@ class Options:
+ "Antialiasing: " + (Variables.aa and "on" or "off"),
+ "Sound effects: " + (Variables.sound and "on" or "off"),
+ "Music: " + (Variables.music and "on" or "off"),
+- "Player Name: " + Variables.name)
++ "Player Name: " + Variables.name,
++ "Fullscreen: " + (Variables.fullscreen and "on" or "off"))
+
+ def run(self):
+ done = False
+@@ -138,6 +140,10 @@ class Options:
+ pygame.mixer.music.stop()
+ except:
+ pass
++ elif self.selection == Options.FULLSCREEN:
++ Variables.fullscreen = not Variables.fullscreen
++ pygame.display.toggle_fullscreen()
++
+ self.refresh()
+
+ def change_right(self):
+diff --git a/util.py b/util.py
+index c012934..100b6d5 100644
+--- a/util.py
++++ b/util.py
+@@ -62,6 +62,8 @@ def load_config():
+ Variables.sound = str_to_bool(value)
+ elif variable == "aa":
+ Variables.aa = str_to_bool(value)
++ elif variable == "fullscreen":
++ Variables.fullscreen = str_to_bool(value)
+
+ f.close()
+
+@@ -77,6 +79,7 @@ def save_config():
+ print >> f, "name\t%s" % Variables.name
+ print >> f, "sound\t%s" % Variables.sound
+ print >> f, "aa\t%s" % Variables.aa
++ print >> f, "fullscreen\t%s" % Variables.fullscreen
+
+ f.close()
+
Deleted: packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.diff 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,11 +0,0 @@
---- a/main.py
-+++ b/main.py
-@@ -62,6 +62,8 @@
- pygame.display.set_icon(util.load_image("kuvake"))
- pygame.display.set_caption("Trip on the Funny Boat")
-
-+ pygame.mouse.set_visible(False)
-+
- init()
-
- joy = None
Added: packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.patch
===================================================================
--- packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.patch (rev 0)
+++ packages/trunk/funnyboat/debian/patches/funnyboat-cursor-patch.patch 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,21 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Fri, 10 May 2013 18:02:13 +0200
+Subject: funnyboat-cursor-patch
+
+---
+ main.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/main.py b/main.py
+index 32f6371..f3a8bfa 100644
+--- a/main.py
++++ b/main.py
+@@ -62,6 +62,8 @@ def main():
+ pygame.display.set_icon(util.load_image("kuvake"))
+ pygame.display.set_caption("Trip on the Funny Boat")
+
++ pygame.mouse.set_visible(False)
++
+ init()
+
+ joy = None
Deleted: packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,21 +0,0 @@
-Author: Gonéri Le Bouder <goneri at rulezlan.org>
-Index: game.py
-===================================================================
---- a/game.py
-+++ b/game.py
-@@ -245,10 +245,13 @@
-
- def take_screenshot(self):
- i = 1
-- filename = "sshot.tga"
-+ basedir = os.environ['HOME']
-+ if not basedir:
-+ basedir = '/home'
-+ filename = basedir + "/funnyboat-sshot.tga"
- while os.path.exists(filename):
- i += 1
-- filename = "sshot" + str(i) + ".tga"
-+ filename = filename + "/funnyboat-sshot" + str(i) + ".tga"
-
- pygame.image.save(self.screen, filename)
- print "Screenshot saved as " + filename
Added: packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.patch
===================================================================
--- packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.patch (rev 0)
+++ packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.patch 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,28 @@
+From: Goneri Le Bouder <goneri at rulezlan.org>
+Date: Fri, 10 May 2013 18:02:13 +0200
+Subject: save-sshot-in-homedir
+
+---
+ game.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/game.py b/game.py
+index 80dd12c..bcd30de 100644
+--- a/game.py
++++ b/game.py
+@@ -245,10 +245,13 @@ class Game:
+
+ def take_screenshot(self):
+ i = 1
+- filename = "sshot.tga"
++ basedir = os.environ['HOME']
++ if not basedir:
++ basedir = '/home'
++ filename = basedir + "/funnyboat-sshot.tga"
+ while os.path.exists(filename):
+ i += 1
+- filename = "sshot" + str(i) + ".tga"
++ filename = filename + "/funnyboat-sshot" + str(i) + ".tga"
+
+ pygame.image.save(self.screen, filename)
+ print "Screenshot saved as " + filename
Modified: packages/trunk/funnyboat/debian/patches/series
===================================================================
--- packages/trunk/funnyboat/debian/patches/series 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/patches/series 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,5 +1,6 @@
-save-sshot-in-homedir.diff
-use_debian_vera_ttf.diff
-funnyboat-cursor-patch.diff
-fullscreen.diff
-avoid_set_alpha_crash.diff
+save-sshot-in-homedir.patch
+use_debian_vera_ttf.patch
+funnyboat-cursor-patch.patch
+fullscreen.patch
+avoid_set_alpha_crash.patch
+sink-the-titanic.patch
Added: packages/trunk/funnyboat/debian/patches/sink-the-titanic.patch
===================================================================
--- packages/trunk/funnyboat/debian/patches/sink-the-titanic.patch (rev 0)
+++ packages/trunk/funnyboat/debian/patches/sink-the-titanic.patch 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 10 May 2013 18:50:43 +0200
+Subject: sink the titanic
+
+Bug: http://bugs.debian.org/582234
+---
+ titanic.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/titanic.py b/titanic.py
+index b8b25c0..47cd8c7 100644
+--- a/titanic.py
++++ b/titanic.py
+@@ -43,7 +43,7 @@ class Titanic(pygame.sprite.Sprite):
+ def damage(self, dec=1):
+ self.health -= dec
+
+- if self.health == 0:
++ if self.health <= 0:
+ self.die()
+
+ def update(self):
Deleted: packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff
===================================================================
--- packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,16 +0,0 @@
-Author: Gonéri Le Bouder <goneri at rulezlan.org>
-Index: util.py
-===================================================================
---- a/util.py
-+++ b/util.py
-@@ -9,8 +9,8 @@
-
- # The Cosmetica font seemed to be broken... had trouble rendering small text
- # with underscores (_) ... it's weird.
--smallfont = pygame.font.Font("data/Vera.ttf", 14)
--bigfont = pygame.font.Font("data/Vera.ttf", 24)
-+smallfont = pygame.font.Font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 14)
-+bigfont = pygame.font.Font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 24)
-
- def get_config_path():
- pathname = ""
Added: packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.patch
===================================================================
--- packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.patch (rev 0)
+++ packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.patch 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1,23 @@
+From: Goneri Le Bouder <goneri at rulezlan.org>
+Date: Fri, 10 May 2013 18:02:13 +0200
+Subject: use_debian_vera_ttf
+
+---
+ util.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util.py b/util.py
+index 37ef822..c012934 100644
+--- a/util.py
++++ b/util.py
+@@ -9,8 +9,8 @@ pygame.font.init()
+
+ # The Cosmetica font seemed to be broken... had trouble rendering small text
+ # with underscores (_) ... it's weird.
+-smallfont = pygame.font.Font("data/Vera.ttf", 14)
+-bigfont = pygame.font.Font("data/Vera.ttf", 24)
++smallfont = pygame.font.Font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 14)
++bigfont = pygame.font.Font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", 24)
+
+ def get_config_path():
+ pathname = ""
Modified: packages/trunk/funnyboat/debian/rules
===================================================================
--- packages/trunk/funnyboat/debian/rules 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/rules 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,60 +1,9 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-build:
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- docbook-to-man debian/funnyboat.sgml > debian/funnyboat.6
+%:
+ dh $@ --with python2
-clean:
- dh_testdir
- dh_testroot
-# python setup.py clean
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -rf build-stamp configure-stamp debian/funnyboat.6 .pc
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- mkdir -p debian/funnyboat/usr/share/games/funnyboat
- mkdir -p debian/funnyboat/usr/games
- mkdir -p debian/funnyboat/usr/share/applications
- cp debian/funnyboat.desktop debian/funnyboat/usr/share/applications/
- mkdir -p debian/funnyboat/usr/share/pixmaps
- cp debian/funnyboat.xpm debian/funnyboat/usr/share/pixmaps/
-
- cp -r data debian/funnyboat/usr/share/games/funnyboat
- rm debian/funnyboat/usr/share/games/funnyboat/data/Vera.ttf
- cp *.py debian/funnyboat/usr/share/games/funnyboat
- cp debian/funnyboat.sh debian/funnyboat/usr/games/funnyboat
-
-
-
-# Build architecture-independent files here.
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installdocs README.txt
- dh_pysupport
- dh_installman debian/funnyboat.6
- dh_installmenu
- dh_installchangelogs
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: clean build binary-indep binary-arch install
+override_dh_install:
+ dh_install
+ $(RM) -f $(CURDIR)/debian/funnyboat/usr/share/games/funnyboat/data/Vera.ttf
Added: packages/trunk/funnyboat/debian/source/format
===================================================================
--- packages/trunk/funnyboat/debian/source/format (rev 0)
+++ packages/trunk/funnyboat/debian/source/format 2013-05-10 11:33:43 UTC (rev 14046)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: packages/trunk/funnyboat/debian/watch
===================================================================
--- packages/trunk/funnyboat/debian/watch 2013-05-09 08:07:56 UTC (rev 14045)
+++ packages/trunk/funnyboat/debian/watch 2013-05-10 11:33:43 UTC (rev 14046)
@@ -1,8 +1,2 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
-# Find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/funnyboat/funnyboat-(.*)-src\.zip
+http://sf.net/funnyboat/funnyboat-(.*)-src\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
More information about the Pkg-games-commits
mailing list