Author: mjj29 Date: 2009-03-01 12:38:02 +0000 (Sun, 01 Mar 2009) New Revision: 8989
Removed: packages/trunk/fretsonfire/debian/patches/fix_glow_svg.patch packages/trunk/fretsonfire/debian/patches/stage.ini.patch packages/trunk/fretsonfire/debian/patches/svg.patch Modified: packages/trunk/fretsonfire/debian/changelog packages/trunk/fretsonfire/debian/patches/series packages/trunk/fretsonfire/debian/rules Log: first try at new upstream version. Have left stuff commented out in debian/rules until I check it works Modified: packages/trunk/fretsonfire/debian/changelog =================================================================== --- packages/trunk/fretsonfire/debian/changelog 2009-03-01 00:10:25 UTC (rev 8988) +++ packages/trunk/fretsonfire/debian/changelog 2009-03-01 12:38:02 UTC (rev 8989) @@ -1,4 +1,4 @@ -fretsonfire (1.2.512.dfsg-4) UNRELEASED; urgency=low +fretsonfire (1.3.110.dfsg-1) UNRELEASED; urgency=low [ Ansgar Burchardt ] * python-pyogg was renamed into python-ogg, update dependencies accordingly @@ -7,8 +7,15 @@ [ Peter De Wachter ] * Fixed watch file. - -- Miriam Ruiz <[email protected]> Thu, 24 Jul 2008 01:49:59 +0200 + [ Matthew Johnson ] + * New upstream release (Closes: #516992) + - Rewrote get-orig-source for new source format + - Removed png-generation from debian/rules since they are provided upstream + - Removed patches svg.patch, stage.ini.patch and fix_glow_svg.patch because + they are obsolete + -- Matthew Johnson <[email protected]> Sun, 01 Mar 2009 12:23:59 +0000 + fretsonfire (1.2.512.dfsg-3) unstable; urgency=low [ Miriam Ruiz ] Deleted: packages/trunk/fretsonfire/debian/patches/fix_glow_svg.patch =================================================================== --- packages/trunk/fretsonfire/debian/patches/fix_glow_svg.patch 2009-03-01 00:10:25 UTC (rev 8988) +++ packages/trunk/fretsonfire/debian/patches/fix_glow_svg.patch 2009-03-01 12:38:02 UTC (rev 8989) @@ -1,153 +0,0 @@ -# Copyright (C) 2008 David Martinez Marti <[email protected]> -# Licensed under the GPL, see /usr/share/common-licenses/GPL - -Index: fretsonfire-1.2.512.dfsg/data/glow.svg -=================================================================== ---- fretsonfire-1.2.512.dfsg.orig/data/glow.svg 2008-07-23 19:43:37.000000000 +0200 -+++ fretsonfire-1.2.512.dfsg/data/glow.svg 2008-07-23 19:43:57.000000000 +0200 -@@ -2,7 +2,7 @@ - <!-- Created with Inkscape (http://www.inkscape.org/) --> - <svg - xmlns:dc="http://purl.org/dc/elements/1.1/"; -- xmlns:cc="http://web.resource.org/cc/"; -+ xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; -@@ -13,11 +13,19 @@ - height="1052.3622047" - id="svg2862" - sodipodi:version="0.32" -- inkscape:version="0.44" -+ inkscape:version="0.46" - sodipodi:docbase="/home/skyostil/proj/keyboardhero/data" -- sodipodi:docname="glow.svg"> -+ sodipodi:docname="glow.svg" -+ inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs2864"> -+ <inkscape:perspective -+ sodipodi:type="inkscape:persp3d" -+ inkscape:vp_x="0 : 526.18109 : 1" -+ inkscape:vp_y="0 : 1000 : 0" -+ inkscape:vp_z="744.09448 : 526.18109 : 1" -+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1" -+ id="perspective26" /> - <linearGradient - id="linearGradient2806"> - <stop -@@ -118,15 +126,16 @@ - objecttolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" -- inkscape:zoom="1.4" -- inkscape:cx="147.80872" -- inkscape:cy="960.05643" -+ inkscape:zoom="7.9195959" -+ inkscape:cx="-3.2961407" -+ inkscape:cy="1013.9567" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1280" - inkscape:window-height="978" -- inkscape:window-x="1152" -- inkscape:window-y="25" /> -+ inkscape:window-x="311" -+ inkscape:window-y="27" -+ showgrid="false" /> - <metadata - id="metadata2867"> - <rdf:RDF> -@@ -143,12 +152,12 @@ - inkscape:groupmode="layer" - id="layer1"> - <rect -- style="opacity:1;color:black;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.00899982;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" -+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.00899982;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - id="rect2800" -- width="406.42856" -- height="334.28571" -- x="-244.28571" -- y="-166.92352" /> -+ width="128.77689" -+ height="122.72714" -+ x="-60.919769" -+ y="-60.956699" /> - <path - style="fill:url(#radialGradient2794);fill-opacity:1;stroke:none;stroke-width:7.8210001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M -60.691125,-61.125583 L 67.170448,-61.125583 L 67.170448,61.432968 L -60.691125,61.432968 L -60.691125,-61.125583 z " -Index: fretsonfire-1.2.512.dfsg/data/mods/LightGraphics/glow.svg -=================================================================== ---- fretsonfire-1.2.512.dfsg.orig/data/mods/LightGraphics/glow.svg 2008-07-23 19:43:37.000000000 +0200 -+++ fretsonfire-1.2.512.dfsg/data/mods/LightGraphics/glow.svg 2008-07-23 19:44:03.000000000 +0200 -@@ -2,7 +2,7 @@ - <!-- Created with Inkscape (http://www.inkscape.org/) --> - <svg - xmlns:dc="http://purl.org/dc/elements/1.1/"; -- xmlns:cc="http://web.resource.org/cc/"; -+ xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; -@@ -13,11 +13,19 @@ - height="1052.3622047" - id="svg2862" - sodipodi:version="0.32" -- inkscape:version="0.44" -+ inkscape:version="0.46" - sodipodi:docbase="/home/skyostil/proj/keyboardhero/data" -- sodipodi:docname="glow.svg"> -+ sodipodi:docname="glow.svg" -+ inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs2864"> -+ <inkscape:perspective -+ sodipodi:type="inkscape:persp3d" -+ inkscape:vp_x="0 : 526.18109 : 1" -+ inkscape:vp_y="0 : 1000 : 0" -+ inkscape:vp_z="744.09448 : 526.18109 : 1" -+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1" -+ id="perspective26" /> - <linearGradient - id="linearGradient2806"> - <stop -@@ -118,15 +126,16 @@ - objecttolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" -- inkscape:zoom="1.4" -- inkscape:cx="147.80872" -- inkscape:cy="960.05643" -+ inkscape:zoom="7.9195959" -+ inkscape:cx="-3.2961407" -+ inkscape:cy="1013.9567" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1280" - inkscape:window-height="978" -- inkscape:window-x="1152" -- inkscape:window-y="25" /> -+ inkscape:window-x="311" -+ inkscape:window-y="27" -+ showgrid="false" /> - <metadata - id="metadata2867"> - <rdf:RDF> -@@ -143,12 +152,12 @@ - inkscape:groupmode="layer" - id="layer1"> - <rect -- style="opacity:1;color:black;fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.00899982;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" -+ style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.00899982;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - id="rect2800" -- width="406.42856" -- height="334.28571" -- x="-244.28571" -- y="-166.92352" /> -+ width="128.77689" -+ height="122.72714" -+ x="-60.919769" -+ y="-60.956699" /> - <path - style="fill:url(#radialGradient2794);fill-opacity:1;stroke:none;stroke-width:7.8210001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M -60.691125,-61.125583 L 67.170448,-61.125583 L 67.170448,61.432968 L -60.691125,61.432968 L -60.691125,-61.125583 z " Modified: packages/trunk/fretsonfire/debian/patches/series =================================================================== --- packages/trunk/fretsonfire/debian/patches/series 2009-03-01 00:10:25 UTC (rev 8988) +++ packages/trunk/fretsonfire/debian/patches/series 2009-03-01 12:38:02 UTC (rev 8989) @@ -1,9 +1,6 @@ datapath.patch -svg.patch -stage.ini.patch typeerror.patch font-revert.patch fonts_lower_cpu.patch fix_window_height_bug.patch -fix_glow_svg.patch keep_sound_when_failed.patch Deleted: packages/trunk/fretsonfire/debian/patches/stage.ini.patch =================================================================== --- packages/trunk/fretsonfire/debian/patches/stage.ini.patch 2009-03-01 00:10:25 UTC (rev 8988) +++ packages/trunk/fretsonfire/debian/patches/stage.ini.patch 2009-03-01 12:38:02 UTC (rev 8989) @@ -1,61 +0,0 @@ -# Copyright (C) 2006 Matthew Johnson <[email protected]> -# Licensed under the GPL, see /usr/share/common-licenses/GPL - -Index: fretsonfire-1.2.512.dfsg/data/stage.ini -=================================================================== ---- fretsonfire-1.2.512.dfsg.orig/data/stage.ini 2007-12-01 10:48:16.000000000 +0000 -+++ fretsonfire-1.2.512.dfsg/data/stage.ini 2007-12-17 17:54:00.662704912 +0000 -@@ -112,7 +112,7 @@ - ypos = -0.75 - xscale = 3.0 - yscale = 3.0 --src_blending = one -+src_blending = src_alpha - dst_blending = one - foreground = 1 - -@@ -138,7 +138,7 @@ - xscale = 3.0 - yscale = 3.0 - angle = -12.0 --src_blending = one -+src_blending = src_alpha - dst_blending = one - foreground = 1 - -@@ -164,7 +164,7 @@ - xscale = 3.0 - yscale = 3.0 - angle = -16.0 --src_blending = one -+src_blending = src_alpha - dst_blending = one - foreground = 1 - -@@ -189,7 +189,7 @@ - ypos = -0.75 - xscale = 3.0 - yscale = 3.0 --src_blending = one -+src_blending = src_alpha - dst_blending = one - foreground = 1 - -@@ -215,7 +215,7 @@ - xscale = 3.0 - yscale = 3.0 - angle = 12.0 --src_blending = one -+src_blending = src_alpha - dst_blending = one - foreground = 1 - -@@ -241,7 +241,7 @@ - xscale = 3.0 - yscale = 3.0 - angle = 19.0 --src_blending = one -+src_blending = src_alpha - dst_blending = one - foreground = 1 - Deleted: packages/trunk/fretsonfire/debian/patches/svg.patch =================================================================== --- packages/trunk/fretsonfire/debian/patches/svg.patch 2009-03-01 00:10:25 UTC (rev 8988) +++ packages/trunk/fretsonfire/debian/patches/svg.patch 2009-03-01 12:38:02 UTC (rev 8989) @@ -1,27 +0,0 @@ -# Copyright (C) 2006 Matthew Johnson <[email protected]> -# Licensed under the GPL, see /usr/share/common-licenses/GPL - -Index: fretsonfire-1.2.451.dfsg/src/Svg.py -=================================================================== ---- fretsonfire-1.2.451.dfsg.orig/src/Svg.py 2007-03-18 21:05:55.000000000 +0000 -+++ fretsonfire-1.2.451.dfsg/src/Svg.py 2007-09-01 17:23:08.000000000 +0000 -@@ -237,7 +237,7 @@ - - class SvgTransform: - def __init__(self, baseTransform = None): -- self._gmatrix = amanith.GMatrix33() -+ #self._gmatrix = amanith.GMatrix33() - self.reset() - - if baseTransform: ---- fretsonfire-1.2.451.dfsg.orig/src/Svg.py 2007-12-01 13:10:35.897204554 +0000 -+++ fretsonfire-1.2.451.dfsg/src/Svg.py 2007-12-01 13:10:47.097347177 +0000 -@@ -539,7 +539,7 @@ - elif type(svgData) == str: - # Check whether we have a cached bitmap version - bitmapFile = svgData.replace(".svg", ".png") -- if svgData.endswith(".svg") and os.path.exists(bitmapFile) and 0: -+ if svgData.endswith(".svg") and os.path.exists(bitmapFile) and 1: - Log.debug("Loading cached bitmap '%s' instead of '%s'." % (bitmapFile, svgData)) - self.texture = Texture(bitmapFile) - else: Modified: packages/trunk/fretsonfire/debian/rules =================================================================== --- packages/trunk/fretsonfire/debian/rules 2009-03-01 00:10:25 UTC (rev 8988) +++ packages/trunk/fretsonfire/debian/rules 2009-03-01 12:38:02 UTC (rev 8989) @@ -24,16 +24,17 @@ #python setup.py build #$(MAKE) -f Makefile.unix dist USE_AMANITH=0 docbook-to-man debian/fretsonfire.sgml > fretsonfire.6 - cd data; python ../src/svg2png.py + # shouldn't need this, they are providing pngs upstream now + #cd data; python ../src/svg2png.py find data -name "*.svg" | sed -e "s/.svg$$/.png/" | while read l; do if ! test -f "$$l"; then echo "Missing $$l"; exit 1; fi; done - + # rename and mode these here so that dh_install can do it's magic cp debian/fretsonfire.sh fretsonfire chmod 755 fretsonfire cp data/icon.png fretsonfire.png chmod 755 src/FretsOnFire.py chmod 755 src/TestAll.py - chmod 755 src/svg2png.py +# chmod 755 src/svg2png.py mkdir translations cp data/translations/*.po translations/ @@ -52,15 +53,15 @@ rm -rf translations #-$(MAKE) -f Makefile.unix clean rm -rf `find . -name "*.pyc"` - cd data; rm -f 2x.png ball2.png flame2.png left.png right.png \ +# cd data; rm -f 2x.png ball2.png flame2.png left.png right.png \ 3x.png cassette.png glow.png logo.png star1.png 4x.png \ editor.png neck.png star2.png ball1.png flame1.png \ keyboard.png pose.png loading.png - cd data/mods/Chilly; rm -f *.png - cd data/mods/LightGraphics; rm -f *.png - cd data/songs/tutorial; rm -f keyboard.png esc.png pose.png - rm -f fretsonfire.6 fretsonfire fretsonfire.png - rm -f data/stage*.png +# cd data/mods/Chilly; rm -f *.png +# cd data/mods/LightGraphics; rm -f *.png +# cd data/songs/tutorial; rm -f keyboard.png esc.png pose.png + rm -f fretsonfire.6 fretsonfire# fretsonfire.png +# rm -f data/stage*.png $(MAKE) -f /usr/share/quilt/quilt.make unpatch dh_clean @@ -105,11 +106,11 @@ binary: binary-indep binary-arch ORIG_VERSION=$(shell dpkg-parsechangelog | sed -n '/^Version/s/[^:].*: \(.*\).dfsg-[^-]*$$/\1/p') +print-orig-version: + echo $(ORIG_VERSION) -../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz: - wget "http://downloads.sourceforge.net/fretsonfire/FretsOnFire-$(ORIG_VERSION)-linux.tar.gz?use_mirror=osdn" --directory-prefix=../ -../FretsOnFire-src-$(ORIG_VERSION).tar.gz: - wget "http://belnet.dl.sourceforge.net/sourceforge/fretsonfire/FretsOnFire-src-$(ORIG_VERSION).tar.gz" --directory-prefix=../ +../FretsOnFire-$(ORIG_VERSION).tar.gz: + wget http://www.mirrorservice.org/sites/download.sourceforge.net/pub/sourceforge/f/fr/fretsonfire/FretsOnFire-$(ORIG_VERSION).tar.gz --directory-prefix=../ extract_translation_source: # get the translation template (needs gettext) @@ -137,25 +138,26 @@ msgmerge -o $$i $$i fretsonfire.pot ; \ done -get-orig-source: ../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz ../FretsOnFire-src-$(ORIG_VERSION).tar.gz +get-orig-source: ../FretsOnFire-$(ORIG_VERSION).tar.gz # clean old builds; - rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg" + rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "Frets on Fire-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg" # extract source and data - tar xvfz "../FretsOnFire-src-$(ORIG_VERSION).tar.gz" - tar xvfz "../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz" + tar xvzf "../FretsOnFire-$(ORIG_VERSION).tar.gz" - # we want all the source - mv "FretsOnFire-src-$(ORIG_VERSION)" "fretsonfire-$(ORIG_VERSION).dfsg" mkdir -p "fretsonfire-$(ORIG_VERSION).dfsg/data" + # 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 + # copy the data, without the songs, but with the tutorial - cp -v "FretsOnFire/data"/* "fretsonfire-$(ORIG_VERSION).dfsg/data/" || true + cp -v "Frets on Fire-$(ORIG_VERSION)/data"/* "fretsonfire-$(ORIG_VERSION).dfsg/data/" || true rm -f "fretsonfire-$(ORIG_VERSION).dfsg/data"/*.ttf - cp -va "FretsOnFire/data/mods" "fretsonfire-$(ORIG_VERSION).dfsg/data/" - cp -va "FretsOnFire/data/translations" "fretsonfire-$(ORIG_VERSION).dfsg/data/" + cp -va "Frets on Fire-$(ORIG_VERSION)/data/mods" "fretsonfire-$(ORIG_VERSION).dfsg/data/" + cp -va "Frets on Fire-$(ORIG_VERSION)/data/translations" "fretsonfire-$(ORIG_VERSION).dfsg/data/" mkdir -p "fretsonfire-$(ORIG_VERSION).dfsg/data/songs" - cp -av "FretsOnFire/data/songs/tutorial" "fretsonfire-$(ORIG_VERSION).dfsg/data/songs/" + cp -av "Frets on Fire-$(ORIG_VERSION)/data/songs/tutorial" "fretsonfire-$(ORIG_VERSION).dfsg/data/songs/" # get translation sources (requires subversion) svn co https://fretsonfire.svn.sourceforge.net/svnroot/fretsonfire/trunk/data/translations _translations @@ -167,6 +169,6 @@ # build the tarball and clean up tar cvfz "../fretsonfire_$(ORIG_VERSION).dfsg.orig.tar.gz" "fretsonfire-$(ORIG_VERSION).dfsg" - rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg" + rm -rf "Frets on Fire-$(ORIG_VERSION)/" "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg" .PHONY: build clean binary-indep binary-arch binary install configure _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
