r2602 - packages/trunk/fretsonfire/debian

[Miriam Ruiz]

Author: baby-guest
Date: 2007-04-28 14:40:26 +0000 (Sat, 28 Apr 2007)
New Revision: 2602

Modified:
   packages/trunk/fretsonfire/debian/control
   packages/trunk/fretsonfire/debian/copyright
   packages/trunk/fretsonfire/debian/rules
Log:
Updated get-orig-source and copyright notes.
Added homepage to description.



Modified: packages/trunk/fretsonfire/debian/control
===================================================================
--- packages/trunk/fretsonfire/debian/control	2007-04-27 19:32:37 UTC (rev 2601)
+++ packages/trunk/fretsonfire/debian/control	2007-04-28 14:40:26 UTC (rev 2602)
@@ -13,3 +13,5 @@
 Description: game of musical skill and fast fingers
  Frets on Fire is a game of musical skill and fast fingers. The aim of
  the game is to play guitar with the keyboard as accurately as possible.
+ .
+  Homepage: http://fretsonfire.sourceforge.net/

Modified: packages/trunk/fretsonfire/debian/copyright
===================================================================
--- packages/trunk/fretsonfire/debian/copyright	2007-04-27 19:32:37 UTC (rev 2601)
+++ packages/trunk/fretsonfire/debian/copyright	2007-04-28 14:40:26 UTC (rev 2602)
@@ -1,9 +1,12 @@
 This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
 Thu, 12 Oct 2006 21:05:58 +0200.
 
-It was downloaded from http://louhi.kempele.fi/~skyostil/uv/fretsonfire/
+It was downloaded from http://sourceforge.net/projects/fretsonfire/
 
-Upstream Author: "Sami Kyostila" <skyostil at kempele.fi>
+Upstream Authors:
+	"Sami Kyostila" <skyostil at kempele.fi>
+	"Joonas Kerttula" <jokerttu at paju.oulu.fi>
+	"Tommi Inkila" <tinkila at paju.oulu.fi>
 
 Copyright:
 
@@ -14,9 +17,15 @@
   * Font data/default.ttf copyright by 1001 Free Fonts.
   * Font data/international.ttf Bitstream Vera font license described below.
 
+Distribution, modification or commercial usage of the songs is not allowed.
 
-Program License:
+All data files, excluding the songs and the font files mentioned above but
+including the tutorial are licensed under the GNU General Public License 
+described below. Note that some source files derived from other sources might 
+have differing licenses.
 
+Program and data files (except the songs):
+
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
@@ -32,32 +41,9 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
 
-Data files:
-
-All data files, except the songs and the font files mentioned above,
-are licensed under the following license:
-
-                      Creative Commons Deed
-                          Attribution 2.5 
-
-You are free:
-
-  * to copy, distribute, display, and perform the work
-  * to make derivative works
-  * to make commercial use of the work
-
-Under the following conditions:
-  * Attribution. You must attribute the work in the manner specified
-    by the author or licensor. For any reuse or distribution, you must
-    make clear to others the license terms of this work.
-
-Any of these conditions can be waived if you get permission from the
-copyright holder.
-
-
 Songs:
 
 Distribution, modification or commercial usage of the songs is not allowed.
@@ -66,12 +52,13 @@
 Fonts:
 
 data/title.ttf:
+	copyright by Astigmatic One Eye
 
-
 data/default.ttf:
+	copyright by 1001 Free Fonts
 
-
 data/international.ttf:
+	Bitstream Vera font license
 
 
 Packaging:

Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules	2007-04-27 19:32:37 UTC (rev 2601)
+++ packages/trunk/fretsonfire/debian/rules	2007-04-28 14:40:26 UTC (rev 2602)
@@ -119,14 +119,18 @@
 
 binary: binary-indep binary-arch
 
-ORIG_VERSION=1.1.324
+ORIG_VERSION=1.2.451
 
 get-orig-source:
-	test -e "FretsOnFire-$(ORIG_VERSION)-linux.tar.gz" || wget "http://louhi.kempele.fi/~skyostil/uv/fretsonfire/dist/FretsOnFire-$(ORIG_VERSION)-linux.tar.gz"
-	test -e "FretsOnFire-src-$(ORIG_VERSION).tar.gz" || wget "http://louhi.kempele.fi/~skyostil/uv/fretsonfire/dist/FretsOnFire-src-$(ORIG_VERSION).tar.gz"
+	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=../
 	rm -rf "FretsOnFire-src-$(ORIG_VERSION)/" "FretsOnFire/" "fretsonfire-$(ORIG_VERSION)"
-	tar xvfz "FretsOnFire-src-$(ORIG_VERSION).tar.gz"
-	tar xvfz "FretsOnFire-$(ORIG_VERSION)-linux.tar.gz"
+	tar xvfz "../FretsOnFire-src-$(ORIG_VERSION).tar.gz"
+	tar xvfz "../FretsOnFire-$(ORIG_VERSION)-linux.tar.gz"
 	mv "FretsOnFire-src-$(ORIG_VERSION)" "fretsonfire-$(ORIG_VERSION)"
 	mv "FretsOnFire/data" "fretsonfire-$(ORIG_VERSION)"
 	find fretsonfire-$(ORIG_VERSION)/data -type f | xargs chmod -x