r2651 - packages/trunk/fretsonfire/debian

[Matthew Johnson]

Author: mjj29-guest
Date: 2007-05-11 14:13:39 +0000 (Fri, 11 May 2007)
New Revision: 2651

Modified:
   packages/trunk/fretsonfire/debian/README.Debian
   packages/trunk/fretsonfire/debian/changelog
   packages/trunk/fretsonfire/debian/control
   packages/trunk/fretsonfire/debian/rules
Log:
updates given fretsonfire-data-sectoid


Modified: packages/trunk/fretsonfire/debian/README.Debian
===================================================================
--- packages/trunk/fretsonfire/debian/README.Debian	2007-05-11 12:50:44 UTC (rev 2650)
+++ packages/trunk/fretsonfire/debian/README.Debian	2007-05-11 14:13:39 UTC (rev 2651)
@@ -1,7 +1,14 @@
 fretsonfire for Debian
 ----------------------
 
- The Debian version of Frets on Fire has had the tracks replaced with free 
- ones. The originals can still be downloaded from http://louhi.kempele.fi/~skyostil/uv/fretsonfire/
+ 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 for providing the songs in
+ the fretsonfire-data-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/
 
- -- Matthew Johnson <debian at matthew.ath.cx>  Fri,  2 Feb 2007 12:13:57 +0000
+ -- Matthew Johnson <debian at matthew.ath.cx>  Fri, 11 May 2007 15:08:03 +0100

Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog	2007-05-11 12:50:44 UTC (rev 2650)
+++ packages/trunk/fretsonfire/debian/changelog	2007-05-11 14:13:39 UTC (rev 2651)
@@ -3,8 +3,10 @@
   [ Matthew Johnson ]
   * DFSG version/tarball (in progress)
   * Add depends on python-pyogg, new version needs it
+  * Add depends on fretsonfire-data-sectoid
+  * rewrite get-orig-source to use makefile targets
 
- -- Matthew Johnson <debian at matthew.ath.cx>  Mon, 30 Apr 2007 16:40:16 +0100
+ -- Matthew Johnson <debian at matthew.ath.cx>  Fri, 11 May 2007 15:10:52 +0100
 
 fretsonfire (1.2.451-1) unstable; urgency=low
 

Modified: packages/trunk/fretsonfire/debian/control
===================================================================
--- packages/trunk/fretsonfire/debian/control	2007-05-11 12:50:44 UTC (rev 2650)
+++ packages/trunk/fretsonfire/debian/control	2007-05-11 14:13:39 UTC (rev 2651)
@@ -8,7 +8,7 @@
 
 Package: fretsonfire
 Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, python-pygame, python-opengl, python-numeric, python-imaging, python-pyogg, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${python:Depends}, python-pygame, python-opengl, python-numeric, python-imaging, python-pyogg, ${misc:Depends}, fretsonfire-data-sectoid
 Suggests: vorbis-tools
 Description: game of musical skill and fast fingers
  Frets on Fire is a game of musical skill and fast fingers. The aim of

Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules	2007-05-11 12:50:44 UTC (rev 2650)
+++ packages/trunk/fretsonfire/debian/rules	2007-05-11 14:13:39 UTC (rev 2651)
@@ -68,15 +68,9 @@
 	install -m644 data/mods/Chilly/* $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/mods/Chilly
 	install -m644 data/mods/LightGraphics/* $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/mods/LightGraphics
 	
-	# install songs - not dfsg free, commenting for the moment
+	# install tutorial
 	install -d $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/tutorial
-#  install -d $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/twibmpg
-#	install -d $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/defy
-#	install -d $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/bangbang
-#	install -m644 data/songs/defy/* $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/defy
 	install -m644 data/songs/tutorial/* $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/tutorial
-#	install -m644 data/songs/bangbang/* $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/bangbang
-#	install -m644 data/songs/twibmpg/* $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/data/songs/twibmpg
 	
 	# install python files
 	install -d $(CURDIR)/debian/fretsonfire/usr/share/games/fretsonfire/game
@@ -107,7 +101,6 @@
 	dh_installdocs
 #	dh_install
 	dh_installmenu
-#	dh_python
 	dh_installman fretsonfire.1
 	dh_link
 	dh_strip
@@ -125,17 +118,14 @@
 
 binary: binary-indep binary-arch
 
-ORIG_VERSION=1.2.451
+ORIG_VERSION=$(shell head -n1 debian/changelog  | sed 's/[a-zA-Z0-9-]* (\(.*\).dfsg-\([^-]\)*) .*/\1/')
 
-get-orig-source:
-	# download tarballs
-	test -e "../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz" || \
-		wget "http://downloads.sourceforge.net/fretsonfire/FretsOnFire-$(ORIG_VERSION)-linux.tar.gz?use_mirror=osdn" \
-			--directory-prefix=../
-	test -e "../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)-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=../
+
+get-orig-source: ../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz ../FretsOnFire-src-$(ORIG_VERSION).tar.gz
 	# clean old builds;
 	rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION).dfsg"