r15036 - in packages/trunk/fretsonfire/debian: . pixmaps pixmaps/48x48 pixmaps/64x64 source
Miriam Ruiz
miriam at moszumanska.debian.org
Fri Apr 18 23:37:12 UTC 2014
Author: miriam
Date: 2014-04-18 23:37:12 +0000 (Fri, 18 Apr 2014)
New Revision: 15036
Added:
packages/trunk/fretsonfire/debian/pixmaps/
packages/trunk/fretsonfire/debian/pixmaps/48x48/
packages/trunk/fretsonfire/debian/pixmaps/48x48/fretsonfire.png
packages/trunk/fretsonfire/debian/pixmaps/64x64/
packages/trunk/fretsonfire/debian/pixmaps/64x64/fretsonfire.png
packages/trunk/fretsonfire/debian/pixmaps/fretsonfire.xpm
packages/trunk/fretsonfire/debian/source/include-binaries
Removed:
packages/trunk/fretsonfire/debian/fretsonfire.xpm
Modified:
packages/trunk/fretsonfire/debian/changelog
packages/trunk/fretsonfire/debian/control
packages/trunk/fretsonfire/debian/fretsonfire-game.install
packages/trunk/fretsonfire/debian/fretsonfire.sh
packages/trunk/fretsonfire/debian/rules
Log:
Prepare release
Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog 2014-04-18 20:52:54 UTC (rev 15035)
+++ packages/trunk/fretsonfire/debian/changelog 2014-04-18 23:37:12 UTC (rev 15036)
@@ -1,9 +1,17 @@
-fretsonfire (1.3.110.dfsg-4) UNRELEASED; urgency=low
+fretsonfire (1.3.110.dfsg2-1) unstable; urgency=low
+ [ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:26 +0200
+ [ Miriam Ruiz ]
+ * Repackaged upstream source to remove data/PyOpenGL__init__.pyc
+ Closes: #744699
+ * Upgraded Standards-Version from 3.8.3 to 3.9.5
+ * Changed my email address to miriam at debian.org
+ * Removed dependency from pysupport
+ -- Miriam Ruiz <miriam at debian.org> Sat, 19 Apr 2014 00:39:48 +0200
+
fretsonfire (1.3.110.dfsg-3) unstable; urgency=low
* Team upload.
Modified: packages/trunk/fretsonfire/debian/control
===================================================================
--- packages/trunk/fretsonfire/debian/control 2014-04-18 20:52:54 UTC (rev 15035)
+++ packages/trunk/fretsonfire/debian/control 2014-04-18 23:37:12 UTC (rev 15036)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Matthew Johnson <mjj29 at debian.org>,
- Miriam Ruiz <little_miry at yahoo.es>,
+ Miriam Ruiz <miriam at debian.org>,
David Martínez Martí <deavidsedice at gmail.com>,
Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: python, python-support (>= 0.4), docbook-to-man
-Standards-Version: 3.8.3
+Build-Depends: debhelper
+Build-Depends-Indep: python, docbook-to-man
+Standards-Version: 3.9.5
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/
@@ -30,11 +30,9 @@
Package: fretsonfire-game
Architecture: all
-Depends: ${python:Depends},
- python-pygame, python-opengl, python-imaging,
- python-ogg, python-pyvorbis,
- ${misc:Depends},
- ttf-dejavu, fonts-mgopen
+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
Description: game of musical skill and fast fingers - Game files
Modified: packages/trunk/fretsonfire/debian/fretsonfire-game.install
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.install 2014-04-18 20:52:54 UTC (rev 15035)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.install 2014-04-18 23:37:12 UTC (rev 15036)
@@ -10,7 +10,7 @@
# Wrapper and icons
fretsonfire usr/games
-debian/fretsonfire.xpm usr/share/pixmaps
-fretsonfire.png usr/share/icons/hicolor/48x48/apps
-fretsonfire.png usr/share/pixmaps
+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
Modified: packages/trunk/fretsonfire/debian/fretsonfire.sh
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire.sh 2014-04-18 20:52:54 UTC (rev 15035)
+++ packages/trunk/fretsonfire/debian/fretsonfire.sh 2014-04-18 23:37:12 UTC (rev 15036)
@@ -1,4 +1,6 @@
#!/bin/sh --
+OLD_DIR="`pwd`"
cd /usr/share/games/fretsonfire/game/
./FretsOnFire.py "$@"
+cd "$OLD_DIR"
Deleted: packages/trunk/fretsonfire/debian/fretsonfire.xpm
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire.xpm 2014-04-18 20:52:54 UTC (rev 15035)
+++ packages/trunk/fretsonfire/debian/fretsonfire.xpm 2014-04-18 23:37:12 UTC (rev 15036)
@@ -1,171 +0,0 @@
-/* XPM */
-static char * fretsonfire_xpm[] = {
-"31 32 136 2",
-" c None",
-". c #FF1100",
-"+ c #FF2E00",
-"@ c #FF1200",
-"# c #FF1300",
-"$ c #FF1400",
-"% c #FF3800",
-"& c #FF3C00",
-"* c #FF2A00",
-"= c #FF1E00",
-"- c #FF1500",
-"; c #FF1F00",
-"> c #FF1D00",
-", c #FF2300",
-"' c #FF2400",
-") c #FF2C00",
-"! c #FF3E00",
-"~ c #FF3D00",
-"{ c #FF3B00",
-"] c #FF3F00",
-"^ c #FF4500",
-"/ c #FF4700",
-"( c #FF4400",
-"_ c #FF3A00",
-": c #FF2D00",
-"< c #FF2700",
-"[ c #FF2100",
-"} c #FF2200",
-"| c #FF1C00",
-"1 c #FF2800",
-"2 c #FF3500",
-"3 c #FF3400",
-"4 c #FF3900",
-"5 c #FF4200",
-"6 c #FF3700",
-"7 c #FF3300",
-"8 c #FF3200",
-"9 c #FF4900",
-"0 c #FF4B00",
-"a c #FF4800",
-"b c #FF4C00",
-"c c #FF4100",
-"d c #FF4300",
-"e c #FF4000",
-"f c #FF5400",
-"g c #FF5900",
-"h c #FF5D00",
-"i c #FF6500",
-"j c #FF5200",
-"k c #FF5800",
-"l c #FF6600",
-"m c #FF6A00",
-"n c #FF6C00",
-"o c #FF7200",
-"p c #FF5B00",
-"q c #FF6800",
-"r c #FF7100",
-"s c #FF7900",
-"t c #FF7B00",
-"u c #FF7F00",
-"v c #FF7000",
-"w c #FF8400",
-"x c #FF8800",
-"y c #FF8600",
-"z c #FF8F00",
-"A c #FF7A00",
-"B c #FF9200",
-"C c #FF9700",
-"D c #FF9600",
-"E c #FFA300",
-"F c #FFA500",
-"G c #FF9500",
-"H c #FFA800",
-"I c #FFA700",
-"J c #FFBE00",
-"K c #FFB200",
-"L c #FF9900",
-"M c #FFB600",
-"N c #FFB500",
-"O c #FFB100",
-"P c #FFD000",
-"Q c #FFC300",
-"R c #FFBA00",
-"S c #FF8700",
-"T c #FF9E00",
-"U c #FFC000",
-"V c #FFBF00",
-"W c #FFD500",
-"X c #FFC900",
-"Y c #FFC100",
-"Z c #FFCA00",
-"` c #FFE300",
-" . c #FFD900",
-".. c #FFD100",
-"+. c #FFC700",
-"@. c #FFD400",
-"#. c #FFD600",
-"$. c #FFD200",
-"%. c #FFDA00",
-"&. c #FFDC00",
-"*. c #FFD700",
-"=. c #FFAD00",
-"-. c #FFCF00",
-";. c #FF9F00",
-">. c #FFCE00",
-",. c #FF9100",
-"'. c #FFC200",
-"). c #FFBB00",
-"!. c #FFBD00",
-"~. c #FFB300",
-"{. c #FF8C00",
-"]. c #FFA200",
-"^. c #FFAC00",
-"/. c #FFA100",
-"(. c #FF8E00",
-"_. c #FFA600",
-":. c #FF9C00",
-"<. c #FF9000",
-"[. c #FF8000",
-"}. c #FF7800",
-"|. c #FF8500",
-"1. c #FF7D00",
-"2. c #FF5A00",
-"3. c #FF6F00",
-"4. c #FF7500",
-"5. c #FF7300",
-"6. c #FF6300",
-"7. c #FF6100",
-"8. c #FF5300",
-"9. c #FF4F00",
-"0. c #FF3600",
-"a. c #FF2B00",
-"b. c #FF3000",
-"c. c #FF3100",
-"d. c #FF1800",
-"e. c #FF1A00",
-" . . ",
-" . . . ",
-" . + @ . . . ",
-" # $ % & * = - $ # ",
-" ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | ",
-" 1 * 2 3 2 4 ~ & ! 5 & & ] & 6 7 7 8 8 [ ",
-" 7 ! ! ( 9 0 a a b / 5 c c c d d d ~ ",
-" e b f g h i j j j ( ",
-" k l m n o h p ",
-" q r s t u ",
-" v w x y z ",
-" A B C D E F ",
-" G H I I J K ",
-" L M N O P Q R ",
-" S T U V M W X Y ",
-" B H Z Z Q ` ...+. ",
-" I Q @.#.$. at .%.&. .*.X ",
-" =.W #.#...-. at .*.*.#.+. ",
-" ;.X >.X Q P >.>.Y ",
-" ,.M '.).K Y !.~. ",
-" {.].N ^./. ",
-" (._.:.<. ",
-" [.D z y ",
-" }.y |.1. ",
-" 2.3.4.4.5. ",
-" 4 ~ j 6.i 6.7. ",
-" 8 & e a 8.f 8.9. j ",
-" ) 0.3 4 ] ( 5 ] c d ",
-" [ ) : a.b.7 b.c.3 3 ",
-" d.e.| = ; [ } , , ",
-" ",
-" "};
Added: packages/trunk/fretsonfire/debian/pixmaps/48x48/fretsonfire.png
===================================================================
(Binary files differ)
Property changes on: packages/trunk/fretsonfire/debian/pixmaps/48x48/fretsonfire.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: packages/trunk/fretsonfire/debian/pixmaps/64x64/fretsonfire.png
===================================================================
(Binary files differ)
Property changes on: packages/trunk/fretsonfire/debian/pixmaps/64x64/fretsonfire.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: packages/trunk/fretsonfire/debian/pixmaps/fretsonfire.xpm (from rev 15035, packages/trunk/fretsonfire/debian/fretsonfire.xpm)
===================================================================
--- packages/trunk/fretsonfire/debian/pixmaps/fretsonfire.xpm (rev 0)
+++ packages/trunk/fretsonfire/debian/pixmaps/fretsonfire.xpm 2014-04-18 23:37:12 UTC (rev 15036)
@@ -0,0 +1,171 @@
+/* XPM */
+static char * fretsonfire_xpm[] = {
+"31 32 136 2",
+" c None",
+". c #FF1100",
+"+ c #FF2E00",
+"@ c #FF1200",
+"# c #FF1300",
+"$ c #FF1400",
+"% c #FF3800",
+"& c #FF3C00",
+"* c #FF2A00",
+"= c #FF1E00",
+"- c #FF1500",
+"; c #FF1F00",
+"> c #FF1D00",
+", c #FF2300",
+"' c #FF2400",
+") c #FF2C00",
+"! c #FF3E00",
+"~ c #FF3D00",
+"{ c #FF3B00",
+"] c #FF3F00",
+"^ c #FF4500",
+"/ c #FF4700",
+"( c #FF4400",
+"_ c #FF3A00",
+": c #FF2D00",
+"< c #FF2700",
+"[ c #FF2100",
+"} c #FF2200",
+"| c #FF1C00",
+"1 c #FF2800",
+"2 c #FF3500",
+"3 c #FF3400",
+"4 c #FF3900",
+"5 c #FF4200",
+"6 c #FF3700",
+"7 c #FF3300",
+"8 c #FF3200",
+"9 c #FF4900",
+"0 c #FF4B00",
+"a c #FF4800",
+"b c #FF4C00",
+"c c #FF4100",
+"d c #FF4300",
+"e c #FF4000",
+"f c #FF5400",
+"g c #FF5900",
+"h c #FF5D00",
+"i c #FF6500",
+"j c #FF5200",
+"k c #FF5800",
+"l c #FF6600",
+"m c #FF6A00",
+"n c #FF6C00",
+"o c #FF7200",
+"p c #FF5B00",
+"q c #FF6800",
+"r c #FF7100",
+"s c #FF7900",
+"t c #FF7B00",
+"u c #FF7F00",
+"v c #FF7000",
+"w c #FF8400",
+"x c #FF8800",
+"y c #FF8600",
+"z c #FF8F00",
+"A c #FF7A00",
+"B c #FF9200",
+"C c #FF9700",
+"D c #FF9600",
+"E c #FFA300",
+"F c #FFA500",
+"G c #FF9500",
+"H c #FFA800",
+"I c #FFA700",
+"J c #FFBE00",
+"K c #FFB200",
+"L c #FF9900",
+"M c #FFB600",
+"N c #FFB500",
+"O c #FFB100",
+"P c #FFD000",
+"Q c #FFC300",
+"R c #FFBA00",
+"S c #FF8700",
+"T c #FF9E00",
+"U c #FFC000",
+"V c #FFBF00",
+"W c #FFD500",
+"X c #FFC900",
+"Y c #FFC100",
+"Z c #FFCA00",
+"` c #FFE300",
+" . c #FFD900",
+".. c #FFD100",
+"+. c #FFC700",
+"@. c #FFD400",
+"#. c #FFD600",
+"$. c #FFD200",
+"%. c #FFDA00",
+"&. c #FFDC00",
+"*. c #FFD700",
+"=. c #FFAD00",
+"-. c #FFCF00",
+";. c #FF9F00",
+">. c #FFCE00",
+",. c #FF9100",
+"'. c #FFC200",
+"). c #FFBB00",
+"!. c #FFBD00",
+"~. c #FFB300",
+"{. c #FF8C00",
+"]. c #FFA200",
+"^. c #FFAC00",
+"/. c #FFA100",
+"(. c #FF8E00",
+"_. c #FFA600",
+":. c #FF9C00",
+"<. c #FF9000",
+"[. c #FF8000",
+"}. c #FF7800",
+"|. c #FF8500",
+"1. c #FF7D00",
+"2. c #FF5A00",
+"3. c #FF6F00",
+"4. c #FF7500",
+"5. c #FF7300",
+"6. c #FF6300",
+"7. c #FF6100",
+"8. c #FF5300",
+"9. c #FF4F00",
+"0. c #FF3600",
+"a. c #FF2B00",
+"b. c #FF3000",
+"c. c #FF3100",
+"d. c #FF1800",
+"e. c #FF1A00",
+" . . ",
+" . . . ",
+" . + @ . . . ",
+" # $ % & * = - $ # ",
+" ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | ",
+" 1 * 2 3 2 4 ~ & ! 5 & & ] & 6 7 7 8 8 [ ",
+" 7 ! ! ( 9 0 a a b / 5 c c c d d d ~ ",
+" e b f g h i j j j ( ",
+" k l m n o h p ",
+" q r s t u ",
+" v w x y z ",
+" A B C D E F ",
+" G H I I J K ",
+" L M N O P Q R ",
+" S T U V M W X Y ",
+" B H Z Z Q ` ...+. ",
+" I Q @.#.$. at .%.&. .*.X ",
+" =.W #.#...-. at .*.*.#.+. ",
+" ;.X >.X Q P >.>.Y ",
+" ,.M '.).K Y !.~. ",
+" {.].N ^./. ",
+" (._.:.<. ",
+" [.D z y ",
+" }.y |.1. ",
+" 2.3.4.4.5. ",
+" 4 ~ j 6.i 6.7. ",
+" 8 & e a 8.f 8.9. j ",
+" ) 0.3 4 ] ( 5 ] c d ",
+" [ ) : a.b.7 b.c.3 3 ",
+" d.e.| = ; [ } , , ",
+" ",
+" "};
Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules 2014-04-18 20:52:54 UTC (rev 15035)
+++ packages/trunk/fretsonfire/debian/rules 2014-04-18 23:37:12 UTC (rev 15036)
@@ -12,18 +12,23 @@
CFLAGS += -O2
endif
-build: build-stamp
+build-indep: build-stamp
+
+build-arch:
+
+build: build-indep build-arch
+
build-stamp:
dh_testdir
docbook-to-man debian/fretsonfire.sgml > fretsonfire.6
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
-
+
mkdir translations
cp data/translations/*.po translations/
cp data/translations/*.py translations/
@@ -31,7 +36,7 @@
cp debian/translations/* translations/ ; \
fi
cd translations && python update.py
-
+
touch $@
clean:
@@ -40,7 +45,7 @@
rm -f build-stamp configure-stamp
rm -rf translations
rm -rf `find . -name "*.pyc"`
- rm -f fretsonfire.6 fretsonfire
+ rm -f fretsonfire.6 fretsonfire fretsonfire.png
dh_clean
install: build
@@ -48,12 +53,12 @@
dh_testroot
dh_clean -k
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/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
# Build architecture-independent files here.
@@ -69,7 +74,7 @@
dh_strip
dh_compress
dh_fixperms
- dh_pysupport
+ #dh_python2
dh_installdeb
dh_shlibdeps
dh_gencontrol
@@ -93,21 +98,21 @@
cd fretsonfire-$(ORIG_VERSION).dfsg/src && \
xgettext -o ../data/translations/fretsonfire.pot \
`grep -r "_(\".*\")" * | awk -F: '{print $$1}' | sort --unique`
-
+
cat fretsonfire-$(ORIG_VERSION).dfsg/data/songs/tutorial/script.txt | \
awk '{ print NR "|" $$0 }' | grep " text " | sed 's/ text */|/g' | \
awk -F"|" '{ print "\n#: data/songs/tutorial/script.txt:" $$1 " \nmsgid \"" $$3 "\"\nmsgstr \"\""}' \
>> fretsonfire-$(ORIG_VERSION).dfsg/data/translations/fretsonfire.pot
-
+
msguniq -o fretsonfire-$(ORIG_VERSION).dfsg/data/translations/fretsonfire.pot \
fretsonfire-$(ORIG_VERSION).dfsg/data/translations/fretsonfire.pot
-
+
# get the source from the translation files (needs gettext)
cd fretsonfire-$(ORIG_VERSION).dfsg/data/translations && \
for i in *.mo; do \
msgunfmt $$i > `echo $$i | sed -e "s/.mo/.po/"` ; \
done
-
+
# merge the obtained the translation files with the template (needs gettext)
cd fretsonfire-$(ORIG_VERSION).dfsg/data/translations && \
for i in *.po; do \
@@ -117,16 +122,16 @@
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"
-
+
# extract source and data
tar xvzf "../FretsOnFire-$(ORIG_VERSION).tar.gz"
-
+
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 "Frets on Fire-$(ORIG_VERSION)/data"/* "fretsonfire-$(ORIG_VERSION).dfsg/data/" || true
rm -f "fretsonfire-$(ORIG_VERSION).dfsg/data"/*.ttf
@@ -134,15 +139,15 @@
cp -va "Frets on Fire-$(ORIG_VERSION)/data/translations" "fretsonfire-$(ORIG_VERSION).dfsg/data/"
mkdir -p "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
mv _translations/* "fretsonfire-$(ORIG_VERSION).dfsg/data/translations/"
rm -rf _translations
-
+
# turn off the execute bit on all the random files
find "fretsonfire-$(ORIG_VERSION).dfsg" -type f | xargs chmod -x
-
+
# build the tarball and clean up
tar cvfz "../fretsonfire_$(ORIG_VERSION).dfsg.orig.tar.gz" "fretsonfire-$(ORIG_VERSION).dfsg"
rm -rf "Frets on Fire-$(ORIG_VERSION)/" "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg"
Added: packages/trunk/fretsonfire/debian/source/include-binaries
===================================================================
--- packages/trunk/fretsonfire/debian/source/include-binaries (rev 0)
+++ packages/trunk/fretsonfire/debian/source/include-binaries 2014-04-18 23:37:12 UTC (rev 15036)
@@ -0,0 +1,2 @@
+debian/pixmaps/48x48/fretsonfire.png
+debian/pixmaps/64x64/fretsonfire.png
More information about the Pkg-games-commits
mailing list