r2653 - in packages/trunk/fretsonfire/debian: . patches

[Matthew Johnson]

Author: mjj29-guest
Date: 2007-05-11 18:28:49 +0000 (Fri, 11 May 2007)
New Revision: 2653

Added:
   packages/trunk/fretsonfire/debian/patches/svg.patch
Removed:
   packages/trunk/fretsonfire/debian/patches/setup.patch
Modified:
   packages/trunk/fretsonfire/debian/changelog
   packages/trunk/fretsonfire/debian/patches/series
Log:
patches


Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog	2007-05-11 18:00:25 UTC (rev 2652)
+++ packages/trunk/fretsonfire/debian/changelog	2007-05-11 18:28:49 UTC (rev 2653)
@@ -6,8 +6,9 @@
   * Add depends on fretsonfire-data-sectoid
   * Rewrite get-orig-source to use makefile targets
   * Add depends on ttf-bitstream-vera and ttf-mgopen
+  * Patch Svg.py no to try and initialise amanith
 
- -- Matthew Johnson <debian at matthew.ath.cx>  Fri, 11 May 2007 19:01:11 +0100
+ -- Matthew Johnson <debian at matthew.ath.cx>  Fri, 11 May 2007 19:29:09 +0100
 
 fretsonfire (1.2.451-1) unstable; urgency=low
 

Modified: packages/trunk/fretsonfire/debian/patches/series
===================================================================
--- packages/trunk/fretsonfire/debian/patches/series	2007-05-11 18:00:25 UTC (rev 2652)
+++ packages/trunk/fretsonfire/debian/patches/series	2007-05-11 18:28:49 UTC (rev 2653)
@@ -1 +1,2 @@
 datapath.patch
+svg.patch

Deleted: packages/trunk/fretsonfire/debian/patches/setup.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/setup.patch	2007-05-11 18:00:25 UTC (rev 2652)
+++ packages/trunk/fretsonfire/debian/patches/setup.patch	2007-05-11 18:28:49 UTC (rev 2653)
@@ -1,40 +0,0 @@
---- fretsonfire-1.0.243.orig/src/setup.py
-+++ fretsonfire-1.0.243/src/setup.py
-@@ -146,16 +146,24 @@
-   ("data/songs/tutorial", songFiles("tutorial", ["esc.svg", "keyboard.svg", "script.txt", "pose.svg"])),
- ]
- 
--setup(version = Version.version(),
--      description = "Rockin' it Oldskool!",
--      name = "Frets on Fire",
--      url = "http://www.unrealvoodoo.org",
--      windows = [
--        {
--          "script":          "FretsOnFire.py",
--          "icon_resources":  [(1, "../data/icon.ico")]
--        }
--      ],
--      zipfile = "data/library.zip",
--      data_files = dataFiles,
--      options = options)
-+setupArgs = {
-+  'version' :      Version.version(),
-+  'description' : "Rockin' it Oldskool!",
-+  'name' :        "Frets on Fire",
-+  'url' :         "http://www.unrealvoodoo.org",
-+  'data_files' :  dataFiles,
-+  'options' :     options
-+}
-+
-+import os
-+
-+if os.name != "posix":
-+  setupArgs['windows'] = [
-+    {
-+      "script":          "FretsOnFire.py",
-+      "icon_resources":  [(1, "../data/icon.ico")]
-+    }
-+  ]                                                                    
-+  setupArgs['zipfile'] = "data/library.zip"
-+
-+setup(**setupArgs)

Added: packages/trunk/fretsonfire/debian/patches/svg.patch
===================================================================
--- packages/trunk/fretsonfire/debian/patches/svg.patch	2007-05-11 18:00:25 UTC (rev 2652)
+++ packages/trunk/fretsonfire/debian/patches/svg.patch	2007-05-11 18:28:49 UTC (rev 2653)
@@ -0,0 +1,11 @@
+--- a/src/Svg.py	2007-05-11 19:14:19.000000000 +0100
++++ b/src/Svg.py	2007-04-30 16:16:01.274633586 +0100
+@@ -237,7 +237,7 @@
+ 
+ class SvgTransform:
+   def __init__(self, baseTransform = None):
+-    self._gmatrix = amanith.GMatrix33()
++    #self._gmatrix = amanith.GMatrix33()
+     self.reset()
+     
+     if baseTransform: