r15622 - in packages/trunk/fretsonfire/debian: . patches
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 13 16:16:11 UTC 2015
Author: apo-guest
Date: 2015-12-13 16:16:11 +0000 (Sun, 13 Dec 2015)
New Revision: 15622
Added:
packages/trunk/fretsonfire/debian/README.source
packages/trunk/fretsonfire/debian/patches/python-PIL-tobytes-error.patch
Removed:
packages/trunk/fretsonfire/debian/README.Debian-source
packages/trunk/fretsonfire/debian/translations/
Modified:
packages/trunk/fretsonfire/debian/README.Debian
packages/trunk/fretsonfire/debian/changelog
packages/trunk/fretsonfire/debian/compat
packages/trunk/fretsonfire/debian/control
packages/trunk/fretsonfire/debian/fretsonfire-game.desktop
packages/trunk/fretsonfire/debian/fretsonfire-game.docs
packages/trunk/fretsonfire/debian/fretsonfire-game.install
packages/trunk/fretsonfire/debian/patches/series
packages/trunk/fretsonfire/debian/rules
Log:
Release 1.3.110.dfsg2-2
Modified: packages/trunk/fretsonfire/debian/README.Debian
===================================================================
--- packages/trunk/fretsonfire/debian/README.Debian 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/README.Debian 2015-12-13 16:16:11 UTC (rev 15622)
@@ -7,14 +7,14 @@
To play Frets on Fire you will need working sound and an OpenGL-capable
graphics card. X must be configured with OpenGL.
-
+
There are also songs available in the fretsonfire-songs packages. Due to
licencing restrictions from the Finnish copyright association (Teosto), Debian
cannot ship the songs written by the authors of Frets on Fire. Therefore, the
Debian version of Frets on Fire has had the tracks replaced with free ones.
Much thanks goes to Carlos Viola Iborra for providing the songs in the
fretsonfire-songs-sectoid package under an open source licence.
-
+
The original tracks can still be downloaded from
http://fretsonfire.sourceforge.net and other tracks can be found on the
community website http://www.keyboardsonfire.net/. Downloaded tracks should be
Deleted: packages/trunk/fretsonfire/debian/README.Debian-source
===================================================================
--- packages/trunk/fretsonfire/debian/README.Debian-source 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/README.Debian-source 2015-12-13 16:16:11 UTC (rev 15622)
@@ -1,15 +0,0 @@
-The fretsonfire source package has to be rebuilt to deal with a few DFSG
-problems:
-
- 1. The songs supplied with the game are not DFSG (no separate redistribution
- or modification). These have been removed.
- 2. The fonts supplied are not Open. These have been removed. They are
- replaced by symlinks to other packages in debian/rules
-
-Other things which are done:
-
- - turn off the executable bit on files (probably uploaded from windows)
-
-The dfsg source can be obtained from debian/rules get-orig-source.
-
-Matt
Added: packages/trunk/fretsonfire/debian/README.source
===================================================================
--- packages/trunk/fretsonfire/debian/README.source (rev 0)
+++ packages/trunk/fretsonfire/debian/README.source 2015-12-13 16:16:11 UTC (rev 15622)
@@ -0,0 +1,15 @@
+The fretsonfire source package has to be rebuilt to deal with a few DFSG
+problems:
+
+ 1. The songs supplied with the game are not DFSG (no separate redistribution
+ or modification). These have been removed.
+ 2. The fonts supplied are not Open. These have been removed. They are
+ replaced by symlinks to other packages in debian/rules
+
+Other things which are done:
+
+ - turn off the executable bit on files (probably uploaded from windows)
+
+The dfsg source can be obtained from debian/rules get-orig-source.
+
+Matt
Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/changelog 2015-12-13 16:16:11 UTC (rev 15622)
@@ -1,3 +1,27 @@
+fretsonfire (1.3.110.dfsg2-2) unstable; urgency=medium
+
+ * Team upload.
+ * Use compat level 9 and require debhelper >= 9.
+ * wrap-and-sort -sa.
+ * Declare compliance with Debian Policy 3.9.6.
+ * Vcs-Browser: Use https.
+ * Remove Matthew Johnson from Uploaders because he is not active anymore.
+ (Closes: #762555)
+ * Remove David Martínez Martí from Uploaders because he is not active anymore.
+ * Add python-PIL-tobytes-error.patch and fix runtime error due to API changes
+ in Python PIL. Thanks to Samuele Battarra for the report. (Closes: #807250)
+ * debian/rules: Fix Lintian error
+ uses-deprecated-compression-for-data-tarball and use xz for compressing
+ the tarball.
+ * Switch from ttf-dejavu to fonts-dejavu.
+ * debian/rules: Replace deprecated dh_clean -k with dh_prep.
+ * fretsonfire-game.desktop: Add keywords and a comment in German.
+ * fretsonfire-game.docs: Remove debian/README.Debian line because
+ README.Debian will be installed automatically.
+ * Install 64x64 icon to hicolor icon directory.
+
+ -- Markus Koschany <apo at debian.org> Sun, 13 Dec 2015 16:30:45 +0100
+
fretsonfire (1.3.110.dfsg2-1) unstable; urgency=low
[ Evgeni Golov ]
Modified: packages/trunk/fretsonfire/debian/compat
===================================================================
--- packages/trunk/fretsonfire/debian/compat 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/compat 2015-12-13 16:16:11 UTC (rev 15622)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/fretsonfire/debian/control
===================================================================
--- packages/trunk/fretsonfire/debian/control 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/control 2015-12-13 16:16:11 UTC (rev 15622)
@@ -2,20 +2,26 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Matthew Johnson <mjj29 at debian.org>,
+Uploaders:
Miriam Ruiz <miriam at debian.org>,
- David Martínez Martí <deavidsedice at gmail.com>,
Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper
-Build-Depends-Indep: python, docbook-to-man
-Standards-Version: 3.9.5
+Build-Depends:
+ debhelper (>= 9)
+Build-Depends-Indep:
+ docbook-to-man,
+ python
+Standards-Version: 3.9.6
Homepage: http://fretsonfire.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/fretsonfire/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/fretsonfire/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/fretsonfire/
Package: fretsonfire
Architecture: all
-Depends: fretsonfire-game, fretsonfire-songs-sectoid, fretsonfire-songs-muldjord, ${misc:Depends}
+Depends:
+ fretsonfire-game,
+ fretsonfire-songs-muldjord,
+ fretsonfire-songs-sectoid,
+ ${misc:Depends}
Description: game of musical skill and fast fingers
A game of musical skill and fast fingers. The aim of the game is to play
guitar with the keyboard as accurately as possible.
@@ -30,13 +36,24 @@
Package: fretsonfire-game
Architecture: all
-Depends: python, python-pygame, python-opengl, python-imaging,
- python-ogg, python-pyvorbis, ttf-dejavu, fonts-mgopen,
- ${python:Depends}, ${misc:Depends}
-Recommends: fretsonfire-songs-sectoid, fretsonfire-songs-muldjord
-Suggests: vorbis-tools
+Depends:
+ fonts-mgopen,
+ python,
+ python-imaging,
+ python-ogg,
+ python-opengl,
+ python-pygame,
+ python-pyvorbis,
+ fonts-dejavu,
+ ${misc:Depends},
+ ${python:Depends}
+Recommends:
+ fretsonfire-songs-muldjord,
+ fretsonfire-songs-sectoid
+Suggests:
+ vorbis-tools
Description: game of musical skill and fast fingers - Game files
- A game of musical skill and fast fingers. The aim of the game is to
+ A game of musical skill and fast fingers. The aim of the game is to
play guitar with the keyboard as accurately as possible.
.
This is the package containing the game executable code. You will need
Modified: packages/trunk/fretsonfire/debian/fretsonfire-game.desktop
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.desktop 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.desktop 2015-12-13 16:16:11 UTC (rev 15622)
@@ -6,8 +6,10 @@
Comment[en_GB]=Rock out with your keyboard
Comment[es]=Toca la guitarra con tu teclado
Comment[gl]=Toca a guitarra co teclado
+Comment[de]=Rocke ab mit deiner Tastatur
Exec=fretsonfire
Icon=fretsonfire
Terminal=false
Type=Application
Categories=Game;ArcadeGame;
+Keywords=music;rock;keyboard;
Modified: packages/trunk/fretsonfire/debian/fretsonfire-game.docs
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.docs 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.docs 2015-12-13 16:16:11 UTC (rev 15622)
@@ -1,3 +1,2 @@
readme.txt
todo.txt
-debian/README.Debian
Modified: packages/trunk/fretsonfire/debian/fretsonfire-game.install
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.install 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.install 2015-12-13 16:16:11 UTC (rev 15622)
@@ -1,16 +1,14 @@
# Data
+# Source
+# Wrapper and icons
data/*.ini data/*.svg data/*.png data/*.ogg data/*.dae data/*.txt usr/share/games/fretsonfire/data
-translations/*.mo usr/share/games/fretsonfire/data/translations
data/mods/Chilly data/mods/LightGraphics usr/share/games/fretsonfire/data/mods
data/songs/tutorial usr/share/games/fretsonfire/data/songs
-
-# Source
+debian/fretsonfire-game.desktop usr/share/applications
+debian/pixmaps/48x48/fretsonfire.png usr/share/icons/hicolor/48x48/apps
+debian/pixmaps/64x64/fretsonfire.png usr/share/icons/hicolor/64x64/apps
+debian/pixmaps/fretsonfire.xpm usr/share/pixmaps
+fretsonfire usr/games
src/*py src/*pot usr/share/games/fretsonfire/game
src/midi/*py usr/share/games/fretsonfire/game/midi
-
-# Wrapper and icons
-fretsonfire usr/games
-debian/pixmaps/fretsonfire.xpm usr/share/pixmaps
-debian/pixmaps/48x48/fretsonfire.png usr/share/icons/hicolor/48x48/apps
-debian/pixmaps/64x64/fretsonfire.png usr/share/pixmaps
-debian/fretsonfire-game.desktop usr/share/applications
+translations/*.mo usr/share/games/fretsonfire/data/translations
Added: packages/trunk/fretsonfire/debian/patches/python-PIL-tobytes-error.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/python-PIL-tobytes-error.patch (rev 0)
+++ packages/trunk/fretsonfire/debian/patches/python-PIL-tobytes-error.patch 2015-12-13 16:16:11 UTC (rev 15622)
@@ -0,0 +1,51 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 13 Dec 2015 16:28:22 +0100
+Subject: python PIL tobytes error
+
+Fix runtime error due to API changes in Python PIL.
+
+Bug: https://bugs.debian.org/807250
+Forwarded: no
+---
+ src/Texture.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Texture.py b/src/Texture.py
+index 51509f5..9b3b6de 100644
+--- a/src/Texture.py
++++ b/src/Texture.py
+@@ -210,13 +210,13 @@ class Texture:
+ """Load the texture from a PIL image"""
+ image = image.transpose(Image.FLIP_TOP_BOTTOM)
+ if image.mode == "RGBA":
+- string = image.tostring('raw', 'RGBA', 0, -1)
++ string = image.tobytes('raw', 'RGBA', 0, -1)
+ self.loadRaw(image.size, string, GL_RGBA, 4)
+ elif image.mode == "RGB":
+- string = image.tostring('raw', 'RGB', 0, -1)
++ string = image.tobytes('raw', 'RGB', 0, -1)
+ self.loadRaw(image.size, string, GL_RGB, 3)
+ elif image.mode == "L":
+- string = image.tostring('raw', 'L', 0, -1)
++ string = image.tobytes('raw', 'L', 0, -1)
+ self.loadRaw(image.size, string, GL_LUMINANCE, 1)
+ else:
+ raise TextureException("Unsupported image mode '%s'" % image.mode)
+@@ -256,7 +256,7 @@ class Texture:
+ # appears to be using PIL to do the conversion.
+ string = pygame.image.tostring(surface, "RGB")
+ image = Image.fromstring("RGB", surface.get_size(), string).convert("L")
+- string = image.tostring('raw', 'L', 0, -1)
++ string = image.tobytes('raw', 'L', 0, -1)
+ self.loadRaw(surface.get_size(), string, GL_LUMINANCE, GL_INTENSITY8)
+ else:
+ if alphaChannel:
+@@ -275,7 +275,7 @@ class Texture:
+ # appears to be using PIL to do the conversion.
+ string = pygame.image.tostring(surface, "RGB")
+ image = Image.fromstring("RGB", surface.get_size(), string).convert("L")
+- string = image.tostring('raw', 'L', 0, -1)
++ string = image.tobytes('raw', 'L', 0, -1)
+ self.loadSubRaw(surface.get_size(), position, string, GL_INTENSITY8)
+ else:
+ if alphaChannel:
Modified: packages/trunk/fretsonfire/debian/patches/series
===================================================================
--- packages/trunk/fretsonfire/debian/patches/series 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/patches/series 2015-12-13 16:16:11 UTC (rev 15622)
@@ -5,3 +5,4 @@
fix_window_height_bug.patch
keep_sound_when_failed.patch
credits_music.patch
+python-PIL-tobytes-error.patch
Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules 2015-12-11 21:57:17 UTC (rev 15621)
+++ packages/trunk/fretsonfire/debian/rules 2015-12-13 16:16:11 UTC (rev 15622)
@@ -46,26 +46,26 @@
rm -rf translations
rm -rf `find . -name "*.pyc"`
rm -f fretsonfire.6 fretsonfire fretsonfire.png
- dh_clean
+ dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# symlink fonts
- ln -sf ../../../fonts/truetype/ttf-dejavu/DejaVuSans.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/international.ttf
+ ln -sf ../../../fonts/truetype/dejavu/DejaVuSans.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/international.ttf
ln -sf ../../../fonts/truetype/mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/title.ttf
ln -sf ../../../fonts/truetype/mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/default.ttf
- # other installation done with dh_install
+ # other installation done with dh_install
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs
dh_installdocs
dh_installmenu
dh_installman -pfretsonfire-game fretsonfire.6
@@ -79,7 +79,7 @@
dh_shlibdeps
dh_gencontrol
dh_md5sums
- dh_builddeb -- -Zbzip2
+ dh_builddeb
# Build architecture-dependent files here.
binary-arch: build install
@@ -119,7 +119,7 @@
msgmerge -o $$i $$i fretsonfire.pot ; \
done
-get-orig-source: ../FretsOnFire-$(ORIG_VERSION).tar.gz
+get-orig-source: ../FretsOnFire-$(ORIG_VERSION).tar.gz
# clean old builds;
rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "Frets on Fire-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg"
@@ -128,7 +128,7 @@
mkdir -p "fretsonfire-$(ORIG_VERSION).dfsg/data"
- # we want all the source
+ # we want all the source
cp -va "Frets on Fire-$(ORIG_VERSION)/doc" "Frets on Fire-$(ORIG_VERSION)/src" "fretsonfire-$(ORIG_VERSION).dfsg/"
cp -v "Frets on Fire-$(ORIG_VERSION)"/* "fretsonfire-$(ORIG_VERSION).dfsg/" || true
More information about the Pkg-games-commits
mailing list