[SCM] zyne/master: add setup patch.
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Sun May 31 20:20:33 UTC 2015
The following commit has been merged in the master branch:
commit 0ad92fb4299479d99954f684b371a6aa3efe574f
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Sun May 31 15:30:56 2015 -0400
add setup patch.
diff --git a/debian/patches/use-distutils.diff b/debian/patches/use-distutils.diff
index e69de29..fc2352d 100644
--- a/debian/patches/use-distutils.diff
+++ b/debian/patches/use-distutils.diff
@@ -0,0 +1,149 @@
+diff --git a/setup-empty.py b/setup.py
+index e69de29..aabb4f4 100644
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,19 @@
++import os
++from distutils.core import setup
++
++setup( name = "zyne",
++ author = "Olivier Belanger",
++ author_email = "belangeo at gmail.com",
++ version = "0.1.2",
++ description = "Modular synthesizer written in Python",
++ url = "http://code.google.com/p/zyne/",
++ license = "GPLv3",
++ package_dir = { 'zyne': '' },
++ packages = ['zyne.Resources'],
++ py_modules = ['zyne.__init__'], #workaround to have Resources under zyne dir
++ scripts = ['Zyne.py'],
++ package_data={
++ 'zyne.Resources': ['*'],
++ }
++ )
++
+diff --git a/Resources/audio.py b/Resources/audio.py
+index 85bf959..ac5c920 100644
+--- a/Resources/audio.py
++++ b/Resources/audio.py
+@@ -1,6 +1,6 @@
+ # encoding: utf-8
+ import random, os, time, math, codecs
+-import Resources.variables as vars
++import zyne.Resources.variables as vars
+ from types import ListType
+
+ if vars.vars["PYO_PRECISION"] == "single":
+diff --git a/Resources/panels.py b/Resources/panels.py
+index f153283..bcfbb95 100644
+--- a/Resources/panels.py
++++ b/Resources/panels.py
+@@ -1,10 +1,10 @@
+ # encoding: utf-8
+ import wx, os, math, copy, random, time
+ from wx.lib.stattext import GenStaticText
+-import Resources.variables as vars
+-from Resources.widgets import *
++import zyne.Resources.variables as vars
++from zyne.Resources.widgets import *
+ from pyolib._wxwidgets import VuMeter, BACKGROUND_COLOUR
+-from Resources.audio import *
++from zyne.Resources.audio import *
+ import wx.richtext as rt
+
+ MODULES = {
+diff --git a/Resources/preferences.py b/Resources/preferences.py
+index 05144ec..ea3a9a2 100644
+--- a/Resources/preferences.py
++++ b/Resources/preferences.py
+@@ -2,8 +2,8 @@
+ # encoding: utf-8
+
+ import wx, os, codecs
+-import Resources.variables as vars
+-from Resources.audio import get_output_devices, get_midi_input_devices
++import zyne.Resources.variables as vars
++from zyne.Resources.audio import get_output_devices, get_midi_input_devices
+
+ class PreferencesDialog(wx.Dialog):
+ def __init__(self):
+diff --git a/Resources/splash.py b/Resources/splash.py
+index 0c0545c..1725578 100644
+--- a/Resources/splash.py
++++ b/Resources/splash.py
+@@ -2,7 +2,7 @@
+ # encoding: utf-8
+
+ import wx, sys, os
+-import Resources.variables as vars
++import zyne.Resources.variables as vars
+
+ def GetRoundBitmap(w, h, r=10):
+ maskColour = wx.Colour(0,0,0)
+@@ -87,4 +87,4 @@ class ZyneSplashScreen(wx.Frame):
+ if __name__ == '__main__':
+ app = wx.PySimpleApp()
+ frame = ZyneSplashScreen(None, img="ZyneSplash.png")
+- app.MainLoop()
+\ No newline at end of file
++ app.MainLoop()
+diff --git a/Resources/variables.py b/Resources/variables.py
+index 1533987..26f3349 100644
+--- a/Resources/variables.py
++++ b/Resources/variables.py
+@@ -1,4 +1,4 @@
+-import os, sys, unicodedata, codecs
++import os, sys, unicodedata, codecs, zyne
+ from types import UnicodeType
+
+ reload(sys)
+@@ -18,7 +18,7 @@ if '/Zyne.app' in os.getcwd():
+ spindex = currentw.index('/Zyne.app')
+ os.chdir(currentw[:spindex])
+ else:
+- constants["RESOURCES_PATH"] = os.path.join(os.getcwd(), 'Resources')
++ constants["RESOURCES_PATH"] = zyne.Resources.__path__[0]
+
+ if not os.path.isdir(constants["RESOURCES_PATH"]) and constants["PLATFORM"] == "win32":
+ constants["RESOURCES_PATH"] = os.path.join(os.getenv("ProgramFiles"), "Zyne", "Resources")
+diff --git a/Resources/widgets.py b/Resources/widgets.py
+index 52cb673..c18cc7e 100644
+--- a/Resources/widgets.py
++++ b/Resources/widgets.py
+@@ -2,7 +2,7 @@
+ import wx, math, sys, copy
+ from wx.lib.embeddedimage import PyEmbeddedImage
+ from pyolib._wxwidgets import ControlSlider, BACKGROUND_COLOUR
+-import Resources.variables as vars
++import zyne.Resources.variables as vars
+
+ KNOB = PyEmbeddedImage(
+ "iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABHNCSVQICAgIfAhkiAAAAAlw"
+diff --git a/Zyne.py b/Zyne.py
+index 60aa1d2..97bfc0b 100644
+--- a/Zyne.py
++++ b/Zyne.py
+@@ -1,16 +1,16 @@
+-#!/usr/bin/env python
++#! /usr/bin/python
+ # encoding: utf-8
+ import wxversion
+ wxversion.select("2.8")
+
+ import wx, os, sys, urllib
+-import Resources.variables as vars
+-from Resources.panels import *
+-from Resources.preferences import PreferencesDialog
+-from Resources.splash import ZyneSplashScreen
++import zyne.Resources.variables as vars
++from zyne.Resources.panels import *
++from zyne.Resources.preferences import PreferencesDialog
++from zyne.Resources.splash import ZyneSplashScreen
+ import wx.richtext as rt
+-import Resources.audio as audio
+-import Resources.tutorial as tutorial
++import zyne.Resources.audio as audio
++import zyne.Resources.tutorial as tutorial
+ from pyo import *
+
+ class TutorialFrame(wx.Frame):
--
zyne packaging
More information about the pkg-multimedia-commits
mailing list