r13062 - in packages/trunk/fretsonfire/debian: . patches
Paul Wise
pabs at alioth.debian.org
Sun Jan 1 05:20:43 UTC 2012
Author: pabs
Date: 2012-01-01 05:20:43 +0000 (Sun, 01 Jan 2012)
New Revision: 13062
Modified:
packages/trunk/fretsonfire/debian/changelog
packages/trunk/fretsonfire/debian/patches/credits_music.patch
packages/trunk/fretsonfire/debian/patches/datapath.patch
packages/trunk/fretsonfire/debian/patches/fix_window_height_bug.patch
packages/trunk/fretsonfire/debian/patches/font-revert.patch
packages/trunk/fretsonfire/debian/patches/fonts_lower_cpu.patch
packages/trunk/fretsonfire/debian/patches/keep_sound_when_failed.patch
packages/trunk/fretsonfire/debian/patches/typeerror.patch
Log:
Clean up the patches and add DEP-3 headers to them
Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/changelog 2012-01-01 05:20:43 UTC (rev 13062)
@@ -2,9 +2,6 @@
* Team upload.
- [ Gerfried Fuchs ]
- * Move quilt from B-D-Indep to B-D because of usage in clean target.
-
[ Paul Wise ]
* Fix hard-coded symlink to the mgopen font (Closes: #653657)
* Switch from ttf-mgopen to fonts-mgopen
@@ -14,6 +11,7 @@
* Add missing ${misc:Depends} to fretsonfire Depends
* Switch to dpkg-source v3 instead of manual patching using quilt
* Don't need python-dev in build-deps, switch to python
+ * Clean up the patches and add DEP-3 headers to them
[ Andrew Higginson ]
* Better description for package 'fretsonfire' describing gameplay,
Modified: packages/trunk/fretsonfire/debian/patches/credits_music.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/credits_music.patch 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/patches/credits_music.patch 2012-01-01 05:20:43 UTC (rev 13062)
@@ -1,11 +1,12 @@
-# This using sectoid/Feelings instead of defy as the song for the credits. I'd
-# like to ignore errors / disable music there, since we can't guarantee that
-# even Feelings will be available, but I can't figure out how to catch the
-# exception this bit of code is throwing.
-Index: fretsonfire-1.3.110.dfsg/src/Credits.py
-===================================================================
---- fretsonfire-1.3.110.dfsg.orig/src/Credits.py 2009-05-02 17:35:45.272567223 +0100
-+++ fretsonfire-1.3.110.dfsg/src/Credits.py 2009-05-02 19:05:44.064542527 +0100
+Author: Matthew Johnson <mjj29 at debian.org>
+Description: This using sectoid/Feelings instead of defy as the song for the credits. I'd
+ like to ignore errors / disable music there, since we can't guarantee that
+ even Feelings will be available, but I can't figure out how to catch the
+ exception this bit of code is throwing.
+Bug-Debian: http://bugs.debian.org/526399
+Last-Update: 2009-05-02
+--- a/src/Credits.py
++++ b/src/Credits.py
@@ -91,8 +91,8 @@
self.engine = engine
self.time = 0.0
Modified: packages/trunk/fretsonfire/debian/patches/datapath.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/datapath.patch 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/patches/datapath.patch 2012-01-01 05:20:43 UTC (rev 13062)
@@ -1,10 +1,9 @@
-# Copyright (C) 2006 Miriam Ruiz <little_miry at yahoo.es>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-
-Index: fretsonfire-1.2.451.dfsg/src/Version.py
-===================================================================
---- fretsonfire-1.2.451.dfsg.orig/src/Version.py 2007-04-14 10:31:38.000000000 +0000
-+++ fretsonfire-1.2.451.dfsg/src/Version.py 2007-09-01 17:23:07.000000000 +0000
+Author: Miriam Ruiz <little_miry at yahoo.es>
+License: GNU GPL, see /usr/share/common-licenses/GPL
+Description: Set the correct data path
+Last-Update: 2007-09-01
+--- a/src/Version.py
++++ b/src/Version.py
@@ -43,6 +43,6 @@
else:
dataPath = "data"
Modified: packages/trunk/fretsonfire/debian/patches/fix_window_height_bug.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/fix_window_height_bug.patch 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/patches/fix_window_height_bug.patch 2012-01-01 05:20:43 UTC (rev 13062)
@@ -1,10 +1,9 @@
-# Copyright (C) 2008 David Martinez Marti <deavidsedice at gmail.com>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-
-Index: fretsonfire-1.2.512.dfsg/src/View.py
-===================================================================
---- fretsonfire-1.2.512.dfsg.orig/src/View.py 2008-07-22 23:25:38.000000000 +0200
-+++ fretsonfire-1.2.512.dfsg/src/View.py 2008-07-22 23:26:19.000000000 +0200
+Author: David Martinez Marti <deavidsedice at gmail.com>
+License: GNU GPL, see /usr/share/common-licenses/GPL
+Description: fix a bug calculating window size when the orthogonal projection window is set.
+Last-Update: 2008-07-22
+--- a/src/View.py
++++ b/src/View.py
@@ -139,7 +139,7 @@
w = int ( viewport[2] - viewport[0] )
h = int ( viewport[3] - viewport[1] )
Modified: packages/trunk/fretsonfire/debian/patches/font-revert.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/font-revert.patch 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/patches/font-revert.patch 2012-01-01 05:20:43 UTC (rev 13062)
@@ -1,7 +1,8 @@
-Index: fretsonfire-1.2.451.dfsg/src/Font.py
-===================================================================
---- FretsOnFire-src-1.2.512/src/Font.py 2007-09-04 19:39:22.000000000 +0100
-+++ FretsOnFire-src-1.2.451/src/Font.py 2007-02-20 19:42:45.000000000 +0000
+Author: Matthew Johnson <mjj29 at debian.org>
+Description: revert Font.py changes to make text render
+Last-Update: 2007-09-04
+--- a/src/Font.py
++++ b/src/Font.py
@@ -21,26 +21,22 @@
#####################################################################
Modified: packages/trunk/fretsonfire/debian/patches/fonts_lower_cpu.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/fonts_lower_cpu.patch 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/patches/fonts_lower_cpu.patch 2012-01-01 05:20:43 UTC (rev 13062)
@@ -1,10 +1,10 @@
-# Copyright (C) 2008 David Martinez Marti <deavidsedice at gmail.com>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-
-Index: fretsonfire-1.2.512.dfsg/src/Font.py
-===================================================================
---- fretsonfire-1.2.512.dfsg.orig/src/Font.py 2008-07-22 23:03:34.000000000 +0200
-+++ fretsonfire-1.2.512.dfsg/src/Font.py 2008-07-22 23:11:15.000000000 +0200
+Author: David Martinez Marti <deavidsedice at gmail.com>
+License: GNU GPL, see /usr/share/common-licenses/GPL
+Description: Reduce CPU consumption with fonts
+Bug-Debian: http://bugs.debian.org/462624
+Last-Update: 2008-07-22
+--- a/src/Font.py
++++ b/src/Font.py
@@ -107,30 +107,42 @@
scale *= self.scale
glPushMatrix()
Modified: packages/trunk/fretsonfire/debian/patches/keep_sound_when_failed.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/keep_sound_when_failed.patch 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/patches/keep_sound_when_failed.patch 2012-01-01 05:20:43 UTC (rev 13062)
@@ -1,10 +1,9 @@
-# Copyright (C) 2008 David Martinez Marti <deavidsedice at gmail.com>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-
-Index: fretsonfire-1.2.512.dfsg/src/Song.py
-===================================================================
---- fretsonfire-1.2.512.dfsg.orig/src/Song.py 2008-07-23 20:19:03.000000000 +0200
-+++ fretsonfire-1.2.512.dfsg/src/Song.py 2008-07-23 20:20:14.000000000 +0200
+Author: David Martinez Marti <deavidsedice at gmail.com>
+License: GNU GPL, see /usr/share/common-licenses/GPL
+Description: Ensure that the sound does not disappear completely when you fail a note and there's no base soundtrack
+Last-Update: 2008-07-23
+--- a/src/Song.py
++++ b/src/Song.py
@@ -525,6 +525,8 @@
self.engine.audio.unpause()
Modified: packages/trunk/fretsonfire/debian/patches/typeerror.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/typeerror.patch 2012-01-01 05:02:39 UTC (rev 13061)
+++ packages/trunk/fretsonfire/debian/patches/typeerror.patch 2012-01-01 05:20:43 UTC (rev 13062)
@@ -1,11 +1,10 @@
-# Copyright (C) 2007 Andreas Henriksson <andreas at fatal.se>
-# Licensed under the GPL, see /usr/share/common-licenses/GPL
-# Fixes crashing on startup due to wrong types. See #437330
-
-Index: fretsonfire-1.2.512.dfsg/src/DummyAmanith.py
-===================================================================
---- fretsonfire-1.2.512.dfsg.orig/src/DummyAmanith.py 2007-09-03 17:06:50.000000000 +0000
-+++ fretsonfire-1.2.512.dfsg/src/DummyAmanith.py 2007-11-20 19:16:49.000000000 +0000
+Author: Andreas Henriksson <andreas at fatal.se>
+License: GNU GPL, see /usr/share/common-licenses/GPL
+Description: Fixes crashing on startup due to wrong types
+Bug-Debian: http://bugs.debian.org/437330
+Last-Update: 2007-11-20
+--- a/src/DummyAmanith.py
++++ b/src/DummyAmanith.py
@@ -42,7 +42,9 @@
pass
@@ -17,10 +16,8 @@
def SetProjection(self, left, right, bottom, top):
glMatrixMode(GL_PROJECTION)
-Index: fretsonfire-1.2.512.dfsg/src/GameEngine.py
-===================================================================
---- fretsonfire-1.2.512.dfsg.orig/src/GameEngine.py 2007-09-09 10:09:41.000000000 +0000
-+++ fretsonfire-1.2.512.dfsg/src/GameEngine.py 2007-11-20 19:16:33.000000000 +0000
+--- a/src/GameEngine.py
++++ b/src/GameEngine.py
@@ -165,7 +165,9 @@
geometry = (0, 0, w, h)
self.svg = SvgContext(geometry)
@@ -32,10 +29,8 @@
self.input = Input()
self.view = View(self, geometry)
-Index: fretsonfire-1.2.512.dfsg/src/View.py
-===================================================================
---- fretsonfire-1.2.512.dfsg.orig/src/View.py 2007-09-03 16:55:45.000000000 +0000
-+++ fretsonfire-1.2.512.dfsg/src/View.py 2007-11-20 19:14:45.000000000 +0000
+--- a/src/View.py
++++ b/src/View.py
@@ -136,10 +136,10 @@
viewport = glGetIntegerv(GL_VIEWPORT)
More information about the Pkg-games-commits
mailing list