r2710 - packages/trunk/fretsonfire/debian
Matthew Johnson
mjj29-guest at alioth.debian.org
Thu May 24 11:36:47 UTC 2007
Author: mjj29-guest
Date: 2007-05-24 11:36:46 +0000 (Thu, 24 May 2007)
New Revision: 2710
Added:
packages/trunk/fretsonfire/debian/README.Debian-source
packages/trunk/fretsonfire/debian/fretsonfire-game.install
packages/trunk/fretsonfire/debian/fretsonfire.xpm
Removed:
packages/trunk/fretsonfire/debian/fretsonfire-game.lintian-override
Modified:
packages/trunk/fretsonfire/debian/changelog
packages/trunk/fretsonfire/debian/fretsonfire-game.dirs
packages/trunk/fretsonfire/debian/fretsonfire-game.menu
packages/trunk/fretsonfire/debian/rules
Log:
updates as suggested by romain
Added: packages/trunk/fretsonfire/debian/README.Debian-source
===================================================================
--- packages/trunk/fretsonfire/debian/README.Debian-source (rev 0)
+++ packages/trunk/fretsonfire/debian/README.Debian-source 2007-05-24 11:36:46 UTC (rev 2710)
@@ -0,0 +1,14 @@
+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 2007-05-24 10:18:03 UTC (rev 2709)
+++ packages/trunk/fretsonfire/debian/changelog 2007-05-24 11:36:46 UTC (rev 2710)
@@ -9,8 +9,11 @@
* Patch Svg.py no to try and initialise amanith
* Rename game package to fretsonfire-game
* Add fretsonfire metapackage
+ * Create xpm
+ * Move installation to .install
+ * Remove lintian-override
- -- Matthew Johnson <debian at matthew.ath.cx> Tue, 22 May 2007 00:05:54 +0100
+ -- Matthew Johnson <debian at matthew.ath.cx> Thu, 24 May 2007 12:34:19 +0100
fretsonfire (1.2.451-1) unstable; urgency=low
Modified: packages/trunk/fretsonfire/debian/fretsonfire-game.dirs
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.dirs 2007-05-24 10:18:03 UTC (rev 2709)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.dirs 2007-05-24 11:36:46 UTC (rev 2710)
@@ -1,4 +1,4 @@
usr/games
-usr/share/games/fretsonfire
+usr/share/games/fretsonfire/data
+usr/share/games/fretsonfire/game
usr/share/pixmaps
-usr/share/lintian/overrides
Added: packages/trunk/fretsonfire/debian/fretsonfire-game.install
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.install (rev 0)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.install 2007-05-24 11:36:46 UTC (rev 2710)
@@ -0,0 +1,15 @@
+# Data
+data/*.ini data/*.svg data/*.png data/*.ogg data/*.dae data/*.txt usr/share/games/fretsonfire/data
+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
+src/*py src/*pot usr/share/games/fretsonfire/game
+src/midi/*py usr/share/games/fretsonfire/game/midi
+
+# Wrapper and icons
+fretsonfire usr/games
+fretsonfire.png usr/share/pixmaps
+debian/fretsonfire.xpm usr/share/pixmaps
+
Deleted: packages/trunk/fretsonfire/debian/fretsonfire-game.lintian-override
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.lintian-override 2007-05-24 10:18:03 UTC (rev 2709)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.lintian-override 2007-05-24 11:36:46 UTC (rev 2710)
@@ -1,2 +0,0 @@
-# PNG seems to work these days, several other packages use it and the icon doesn't convert well to xpm
-fretsonfire: menu-icon-not-in-xpm-format
Modified: packages/trunk/fretsonfire/debian/fretsonfire-game.menu
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire-game.menu 2007-05-24 10:18:03 UTC (rev 2709)
+++ packages/trunk/fretsonfire/debian/fretsonfire-game.menu 2007-05-24 11:36:46 UTC (rev 2710)
@@ -4,4 +4,4 @@
title="Frets on Fire"\
longtitle="Rock out with your keyboard"\
command="/usr/games/fretsonfire"\
- icon="/usr/share/pixmaps/fretsonfire.png"
+ icon="/usr/share/pixmaps/fretsonfire.xpm"
Added: packages/trunk/fretsonfire/debian/fretsonfire.xpm
===================================================================
--- packages/trunk/fretsonfire/debian/fretsonfire.xpm (rev 0)
+++ packages/trunk/fretsonfire/debian/fretsonfire.xpm 2007-05-24 11:36:46 UTC (rev 2710)
@@ -0,0 +1,127 @@
+/* XPM */
+static char * fretsonfire_xpm[] = {
+"64 66 58 1",
+" c None",
+". c #FF1100",
+"+ c #FF1300",
+"@ c #FF2300",
+"# c #FF2900",
+"$ c #FF3000",
+"% c #FF2F00",
+"& c #FF3400",
+"* c #FF3B00",
+"= c #FF1C00",
+"- c #FF1500",
+"; c #FF3F00",
+"> c #FF1B00",
+", c #FF4300",
+"' c #FF4500",
+") c #FF2400",
+"! c #FF4A00",
+"~ c #FF4D00",
+"{ c #FF5100",
+"] c #FF5B00",
+"^ c #FF5300",
+"/ c #FF6200",
+"( c #FF5D00",
+"_ c #FF6400",
+": c #FF7700",
+"< c #FF6B00",
+"[ c #FF6F00",
+"} c #FF6C00",
+"| c #FF7F00",
+"1 c #FF8400",
+"2 c #FF8000",
+"3 c #FF8900",
+"4 c #FF8D00",
+"5 c #FF9000",
+"6 c #FFA100",
+"7 c #FF9A00",
+"8 c #FF9B00",
+"9 c #FFA300",
+"0 c #FF9500",
+"a c #FFAA00",
+"b c #FFB700",
+"c c #FFAC00",
+"d c #FFAF00",
+"e c #FFBF00",
+"f c #FFB800",
+"g c #FFCB00",
+"h c #FFD200",
+"i c #FFBE00",
+"j c #FFDF00",
+"k c #FFC500",
+"l c #FFE600",
+"m c #FFCA00",
+"n c #FFF100",
+"o c #FFE300",
+"p c #FFF300",
+"q c #FFD500",
+"r c #FFEB00",
+"s c #FFDA00",
+" .. ",
+" .... ",
+" ..... ",
+" ...... ",
+" . +...... ",
+" .. @#$% +.+...... ",
+" ... $&** =-...+... ",
+" +++++ ;;*;; ##@-++++++ ",
+" =--==>> ,;&$''* &&%#@@>>>=>- ",
+" )-@)#@=)% ;;&*;;'!~~!!',;&#)))@=@)@- ",
+" )=)%%%%#%%$&;;**$$~!;$$,''',;$%%#%%##%%@+ ",
+" $@#&*&&*&*&******;'****&*&*&&&&&&&$&&&$@ ",
+" @%;;;**;,;,,,,,,!~~!',,;,;;,**;*;****&= ",
+" $%;';&*;!!!!!{ ~,'';,',& ",
+" $&''*;!{{{{] ^{!!~!!$ ",
+" &;~~!]^]]]/ ^{{^^' ",
+" ,'^(/////_ :: ((]^! ",
+" ~{/<<<<<<[: /] ",
+" ^(}[[}:[|1 ",
+" ]}|:::|1 ",
+" / _:222|2 ",
+" ][2333324 ",
+" /[455541 6 ",
+" <177754 869 98 ",
+" ::86660089a bc8 ",
+" :79aa96aad efd ",
+" |4dddddac gefb ",
+" 3cbbbfa hhfff ",
+" 1ciiiic jkiieb ",
+" 5 3dkkkfd ljeekef ",
+" : 4dgmgff lnhmmmmi ",
+" 20 5dhhgff oplghghgf ",
+" 1943dqqhgfighqolrqqqhqgi ",
+" 3kb6mqqsshmmhqssssqsqsgf ",
+" 2fsqsssssssssssssssqqshf ",
+" |dqqqqssssssssssssqsssgb ",
+" 38qqqqqqshmkkghqsssqqqmb ",
+" 04mhhhqqqib hhqhhhhmd ",
+" 1fggggggc mgggggkd ",
+" |akkmkmka kkmmkkc ",
+" :7eeeeke9 iiifb9 ",
+" 11fiffib8 ddc6 ",
+" |adbbb90 ",
+" [7ccac07 ",
+" }399a94 ",
+" }|86883 ",
+" <:00001 34 ",
+" /:44453|21 ",
+" (|111111: ",
+" ]/:||||2|[ ",
+" ~/:[::::[< ",
+" & !_}}}[[[_ ",
+" *& !!/___<__( / ",
+" &;, ;!(((/((/{ (] ",
+" $,$~ *!^^^^^]^~ ]{^ ",
+" )$,$&*&!~~~~{~~'~ ~~~~ ",
+" @%;&#%*;,'''''';,,,,'' ",
+" >$*&$&$%#$;;,&&;&*;;;* ",
+" >)$$$$#)#$&&&%%$&&*&&& ",
+" -=))#%###%%%%###%%%%%% ",
+" +->>====@=@@@))#))#)) ",
+" ---->->-->>>>>>==== ",
+" ",
+" ",
+" ",
+" "};
Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules 2007-05-24 10:18:03 UTC (rev 2709)
+++ packages/trunk/fretsonfire/debian/rules 2007-05-24 11:36:46 UTC (rev 2710)
@@ -25,6 +25,11 @@
#$(MAKE) -f Makefile.unix dist USE_AMANITH=0
docbook-to-man debian/fretsonfire.sgml > fretsonfire.1
cd data; python ../src/svg2png.py
+ # 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
touch $@
clean:
@@ -40,7 +45,7 @@
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.1
+ rm -f fretsonfire.1 fretsonfire fretsonfire.png
rm -f data/{stage_audience1,stage_lights2,stage_light,stage_drums}.png
rm -f data/{stage_lights1,stage_speakers,stage_background,stage_audience2}.png
rm -f data/{stage_speaker_cones,loading,stage_bassdrum}.png
@@ -54,59 +59,22 @@
dh_installdirs
#python setup.py install --root=$(CURDIR)/debian/fretsonfire --no-compile --verbose
- # install data dir
- install -d $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data
- install -m644 data/*.ini data/*.svg data/*.png data/*.ogg data/*.dae data/*.txt $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data
-
# symlink fonts
ln -sf ../../../fonts/truetype/ttf-bitstream-vera/Vera.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/international.ttf
ln -sf ../../../fonts/truetype/ttf-mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/title.ttf
ln -sf ../../../fonts/truetype/ttf-mgopen/MgOpenCosmeticaRegular.ttf $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/default.ttf
-
- # install translations
- install -d $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/translations
- install -m644 data/translations/*.mo $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/translations
-
- # install mods
- install -d $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/mods/Chilly
- install -d $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/mods/LightGraphics
- install -m644 data/mods/Chilly/* $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/mods/Chilly
- install -m644 data/mods/LightGraphics/* $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/mods/LightGraphics
-
- # install tutorial
- install -d $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/songs/tutorial
- install -m644 data/songs/tutorial/* $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/data/songs/tutorial
-
- # install python files
- install -d $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game
- install -m644 src/*py $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game
- install -m644 src/*pot $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game
- install -d $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game/midi
- install -m644 src/midi/*py $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game/midi
-
- # install executable python
- install src/FretsOnFire.py $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game
- install src/TestAll.py $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game
- install src/svg2png.py $(CURDIR)/debian/fretsonfire-game/usr/share/games/fretsonfire/game
-
- # install wrapper
- install $(CURDIR)/debian/fretsonfire.sh $(CURDIR)/debian/fretsonfire-game/usr/games/fretsonfire
-
- # install icon
- install -m644 data/icon.png $(CURDIR)/debian/fretsonfire-game/usr/share/pixmaps/fretsonfire.png
-
- # install lintian
- install -m644 debian/fretsonfire-game.lintian-override $(CURDIR)/debian/fretsonfire-game/usr/share/lintian/overrides/fretsonfire
+ # other installation done with dh_install
+
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
-# dh_install
dh_installmenu
dh_installman -pfretsonfire-game fretsonfire.1
+ dh_install -pfretsonfire-game
dh_link
dh_strip
dh_compress
More information about the Pkg-games-commits
mailing list