[SCM] cecilia/master: New patch.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e18ad7a1b39e7fdb64da27d99a5a1db39807f3e3
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Thu Nov 28 19:34:32 2013 -0500

    New patch.

diff --git a/debian/patches/series b/debian/patches/series
index ee59f35..7af1cf5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-use-distutils-and-comply-with-deb-standards.diff
+use-distutils.diff
diff --git a/debian/patches/use-distutils-and-comply-with-deb-standards.diff b/debian/patches/use-distutils.diff
similarity index 83%
rename from debian/patches/use-distutils-and-comply-with-deb-standards.diff
rename to debian/patches/use-distutils.diff
index 45fa10c..2493d09 100644
--- a/debian/patches/use-distutils-and-comply-with-deb-standards.diff
+++ b/debian/patches/use-distutils.diff
@@ -1,48 +1,17 @@
-Description: Use distutils to comply with Debian standards
- I tried to patch it in a generic way, so I guess it'll be useful for upstream.
- Once accepted this patch goes away.
-Author: Tiago Bortoletto Vaz <tiago at debian.org>
-Last-Update: 2012-07-15
---- /dev/null
-+++ b/setup.py
-@@ -0,0 +1,20 @@
-+# -*- coding: utf-8 -*-
-+
-+import os
-+from distutils.core import setup
-+
-+setup(  name = "cecilia",
-+        author = "Jean Piche, Olivier Belanger, Jean-Michel Dumas",
-+        author_email = "belangeo at gmail.com",
-+        version = "0.5.7",
-+        description = "Sound synthesis and audio signal processing environment",
-+        url = "http://code.google.com/p/cecilia/",
-+        license = "GPLv3",
-+        package_dir = { 'cecilia': '' },
-+        packages = ['cecilia.Resources'],
-+        py_modules = ['cecilia.__init__'], #workaround to have Resources under cecilia dir
-+        scripts = ['Cecilia5.py'],
-+        package_data={
-+            'cecilia.Resources': ['modules/*/*', 'Cecilia5.icns', 'Cecilia5.ico', 'CeciliaFileIcon5.icns', 'CeciliaFileIcon5.ico', 'Cecilia_splash.png'],
-+        }
-+    )
---- /dev/null
-+++ b/__init__.py
-@@ -0,0 +1,2 @@
-+
-+
 --- a/Cecilia5.py
 +++ b/Cecilia5.py
-@@ -21,9 +21,9 @@
+@@ -21,10 +21,10 @@
  
  import wx
  import os, sys, random
 -from Resources.constants import *
 -from Resources import audio, CeciliaMainFrame
 -import Resources.CeciliaLib as CeciliaLib
+-from Resources.splash import CeciliaSplashScreen
 +from cecilia.Resources.constants import *
 +from cecilia.Resources import audio, CeciliaMainFrame
 +import cecilia.Resources.CeciliaLib as CeciliaLib
++from cecilia.Resources.splash import CeciliaSplashScreen
  
  def GetRoundBitmap( w, h, r ):
      maskColor = wx.Colour(0,0,0)
@@ -62,7 +31,30 @@ Last-Update: 2012-07-15
      RESOURCES_PATH = os.getcwd()
  else:
 -    RESOURCES_PATH = os.path.join(os.getcwd(), 'Resources')
-+    RESOURCES_PATH = cecilia.Resources.__path__[0]
++    RESOURCES_PATH = RESOURCES_PATH = cecilia.Resources.__path__[0]
  
  if not os.path.isdir(RESOURCES_PATH) and sys.platform == "win32":
      RESOURCES_PATH = os.path.join(os.getenv("ProgramFiles"), "Cecilia5", "Resources")
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,20 @@
++# -*- coding: utf-8 -*-
++
++import os
++from distutils.core import setup
++
++setup(  name = "cecilia",
++        author = "Jean Piche, Olivier Belanger, Jean-Michel Dumas",
++        author_email = "belangeo at gmail.com",
++        version = "0.5.7",
++        description = "Sound synthesis and audio signal processing environment",
++        url = "http://code.google.com/p/cecilia/",
++        license = "GPLv3",
++        package_dir = { 'cecilia': '' },
++        packages = ['cecilia.Resources'],
++        py_modules = ['cecilia.__init__'], #workaround to have Resources under cecilia dir
++        scripts = ['Cecilia5.py'],
++        package_data={
++            'cecilia.Resources': ['modules/*/*', 'Cecilia5.icns', 'Cecilia5.ico', 'CeciliaFileIcon5.icns', 'CeciliaFileIcon5.ico', 'Cecilia_splash.png'],
++        }
++    )

-- 
cecilia packaging