[SCM] soundgrain/master: Fixing setup patch.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8624c90e70cb8e3642089132d868ffadf376ce60
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Sat Jul 14 11:11:41 2012 -0600

    Fixing setup patch.

diff --git a/debian/patches/use-distutils.patch b/debian/patches/use-distutils.patch
index dceb38c..8dd2fcc 100644
--- a/debian/patches/use-distutils.patch
+++ b/debian/patches/use-distutils.patch
@@ -1,10 +1,14 @@
 --- /dev/null
 +++ b/setup.py
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,32 @@
 +# -*- coding: utf-8 -*-
 +
++import os
 +from distutils.core import setup
 +
++#misc_files = [('soundgrain/Resources', ['Resources/new_soundgrain_file.sg', 'Resources/SoundGrainDocIcon.icns', 'Resources/SoundGrainDocIcon.ico', 'Resources/SoundGrain.icns', 'Resources/SoundGrain.ico', 'Resources/SoundGrainSplash.png'])]
++#misc_files += [file for file in os.listdir('Resources/images') if os.path.isfile(file)]
++
 +setup(  name = "soundgrain",
 +        author = "Olivier Belanger",
 +        author_email = "belangeo at gmail.com",
@@ -14,14 +18,86 @@
 +        license = "GPLv3",
 +        package_dir = { 'soundgrain': '' },
 +        packages = ['soundgrain.Resources'],
-+        py_modules = ['soundgrain.SoundGrain']
++        scripts = ['SoundGrain.py'],
++        package_data={
++            'soundgrain.Resources': ['images/*', 'new_soundgrain_file.sg', 'SoundGrainDocIcon.icns', 'SoundGrainDocIcon.ico', 'SoundGrain.icns', 'SoundGrain.ico', 'SoundGrainSplash.png'],
++        },
++#        package_data = {'soundgrain': ['Resources/images/*.png']}
 +#        install_path = 'soundgrain'
-+        entry_points = {
-+            'console_scripts': [
-+                'soundgrain = soundgrain.SoundGrain:main',
-+            ],
-+            #'gui_scripts': [
-+            #    'baz = my_package_gui.start_func',
-+            #]
-+        }
++#        entry_points = {
++#            'console_scripts': [
++#                'soundgrain = soundgrain.SoundGrain',
++#            ],
++#            'gui_scripts': [
++#                'sg = soundgrain.SoundGrain',
++#            ]
++#        }
 +    )
+--- a/SoundGrain.py
++++ b/SoundGrain.py
+@@ -25,14 +25,14 @@
+ import wx.richtext as rt
+ from types import ListType
+ 
+-from Resources.constants import *
+-from Resources.audio import *
+-from Resources.Modules import *
++from soundgrain.Resources.constants import *
++from soundgrain.Resources.audio import *
++from soundgrain.Resources.Modules import *
+ from pyolib._wxwidgets import ControlSlider, VuMeter, Grapher, BACKGROUND_COLOUR
+-from Resources.Trajectory import Trajectory
+-from Resources.FxBall import FxBall
+-from Resources.MidiSettings import MidiSettings
+-from Resources.splash import SoundGrainSplashScreen
++from soundgrain.Resources.Trajectory import Trajectory
++from soundgrain.Resources.FxBall import FxBall
++from soundgrain.Resources.MidiSettings import MidiSettings
++from soundgrain.Resources.splash import SoundGrainSplashScreen
+ 
+ SCREEN_SIZE = None
+ 
+--- a/Resources/MidiSettings.py
++++ b/Resources/MidiSettings.py
+@@ -20,8 +20,8 @@
+ 
+ import wx, sys
+ from pyolib._wxwidgets import ControlSlider
+-from constants import BACKGROUND_COLOUR, ensureNFD, toSysEncoding
+-from Resources.audio import checkForMidiDrivers
++from soundgrain.Resources.constants import BACKGROUND_COLOUR, ensureNFD, toSysEncoding
++from soundgrain.Resources.audio import checkForMidiDrivers
+ 
+ class MidiSettings(wx.Frame):
+     def __init__(self, parent, surface, sg_audio, miDriver):
+--- a/Resources/Trajectory.py
++++ b/Resources/Trajectory.py
+@@ -20,7 +20,7 @@
+ """
+ import wx
+ from math import sin, pi, sqrt, floor
+-from Resources.Biquad_Filter import BiquadLP
++from soundgrain.Resources.Biquad_Filter import BiquadLP
+ 
+ def chooseColour(i, numlines=24):
+     def clip(x):
+--- a/Resources/constants.py
++++ b/Resources/constants.py
+@@ -17,7 +17,7 @@
+ along with SoundGrain.  If not, see <http://www.gnu.org/licenses/>.
+ """
+ 
+-import os, sys, unicodedata
++import os, sys, unicodedata, soundgrain
+ from types import UnicodeType
+ 
+ reload(sys)
+@@ -38,7 +38,7 @@
+     spindex = currentw.index('/SoundGrain.app')
+     os.chdir(currentw[:spindex])
+ else:
+-    RESOURCES_PATH = os.path.join(os.getcwd(), 'Resources')
++    RESOURCES_PATH = soundgrain.Resources.__path__[0]
+ 
+ if not os.path.isdir(RESOURCES_PATH) and sys.platform == "win32":
+     RESOURCES_PATH = os.path.join(os.getenv("ProgramFiles"), "SoundGrain", "Resources")

-- 
soundgrain packaging