[SCM] python-pyo/master: Updating patches
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Fri Jan 30 04:34:09 UTC 2015
The following commit has been merged in the master branch:
commit 0654b2728075489142d1ea3562689eb2cb5f76c9
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Thu Jan 29 23:29:20 2015 -0500
Updating patches
diff --git a/debian/patches/01-epyo_paths b/debian/patches/ePyo_paths.patch
similarity index 85%
rename from debian/patches/01-epyo_paths
rename to debian/patches/ePyo_paths.patch
index be66d53..7572640 100644
--- a/debian/patches/01-epyo_paths
+++ b/debian/patches/ePyo_paths.patch
@@ -1,8 +1,8 @@
-Index: python-pyo-0.7/utils/E-Pyo.py
+Index: python-pyo/utils/E-Pyo.py
===================================================================
---- python-pyo-0.7.orig/utils/E-Pyo.py
-+++ python-pyo-0.7/utils/E-Pyo.py
-@@ -210,7 +210,7 @@
+--- python-pyo.orig/utils/E-Pyo.py
++++ python-pyo/utils/E-Pyo.py
+@@ -226,7 +226,7 @@ if OSX_APP_BUNDLED:
elif WIN_APP_BUNDLED:
EXAMPLE_PATH = os.path.join(os.getcwd(), "Resources", "examples")
else:
@@ -11,19 +11,16 @@ Index: python-pyo-0.7/utils/E-Pyo.py
EXAMPLE_FOLDERS = [folder.capitalize() for folder in os.listdir(EXAMPLE_PATH) if folder[0] != "." and folder not in ["snds", "fft"]]
EXAMPLE_FOLDERS.append("FFT")
EXAMPLE_FOLDERS.sort()
-@@ -227,9 +227,9 @@
+@@ -243,7 +243,7 @@ if not os.path.isdir(SNIPPETS_PATH):
for file in files:
shutil.copy(os.path.join(os.getcwd(), "Resources", "snippets", rep, file), os.path.join(SNIPPETS_PATH, rep))
else:
- files = [f for f in os.listdir(os.path.join(os.getcwd(), "snippets", rep)) if f[0] != "."]
+ files = [f for f in os.listdir(os.path.join("/usr/lib/python-pyo", "snippets", rep)) if f[0] != "."]
for file in files:
-- shutil.copy(os.path.join(os.getcwd(), "snippets", rep, file), os.path.join(SNIPPETS_PATH, rep))
-+ shutil.copy(os.path.join("/usr/lib/python-pyo", "snippets", rep, file), os.path.join(SNIPPETS_PATH, rep))
+ shutil.copy(os.path.join(os.getcwd(), "snippets", rep, file), os.path.join(SNIPPETS_PATH, rep))
SNIPPETS_CATEGORIES = [rep for rep in os.listdir(SNIPPETS_PATH) if os.path.isdir(os.path.join(SNIPPETS_PATH, rep))]
- SNIPPET_DEL_FILE_ID = 30
- SNIPPET_ADD_FOLDER_ID = 31
-@@ -258,12 +258,12 @@
+@@ -274,12 +274,12 @@ if not os.path.isdir(STYLES_PATH):
for file in files:
shutil.copy(os.path.join(os.getcwd(), "Resources", "styles", file), os.path.join(STYLES_PATH, file))
else:
@@ -39,7 +36,7 @@ Index: python-pyo-0.7/utils/E-Pyo.py
if PREFERENCES.has_key("pref_style"):
PREF_STYLE = os.path.join(ensureNFD(STYLES_PATH), PREFERENCES["pref_style"])
else:
-@@ -277,7 +277,7 @@
+@@ -293,7 +293,7 @@ if not os.path.isfile(MARKERS_FILE):
with open(MARKERS_FILE, "w") as f:
f.write("=\n")
diff --git a/debian/patches/series b/debian/patches/series
index cc963e0..6e789fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01-epyo_paths
-wxpython3.0.patch
+ePyo_paths.patch
+wx3.0.patch
diff --git a/debian/patches/wxpython3.0.patch b/debian/patches/wx3.0.patch
similarity index 60%
rename from debian/patches/wxpython3.0.patch
rename to debian/patches/wx3.0.patch
index 9c3e8c5..dc575e6 100644
--- a/debian/patches/wxpython3.0.patch
+++ b/debian/patches/wx3.0.patch
@@ -1,47 +1,29 @@
-Description: Update for wxPython 3.0
- These changes should remain compatible with wxPython 2.8.
-Forwarded: no
-Last-Update: 2014-09-12
-
-Index: python-pyo-0.7/pyolib/_widgets.py
+Index: python-pyo/pyolib/_widgets.py
===================================================================
---- python-pyo-0.7.orig/pyolib/_widgets.py
-+++ python-pyo-0.7/pyolib/_widgets.py
-@@ -29,10 +29,11 @@ except:
- WITH_PIL = False
+--- python-pyo.orig/pyolib/_widgets.py
++++ python-pyo/pyolib/_widgets.py
+@@ -29,12 +29,13 @@ except:
try:
-- import wxversion
-- if (wxversion.checkInstalled("2.8")):
-+ if 'wx' not in sys.modules:
-+ # Don't try to load if already loaded.
-+ import wxversion
- wxversion.ensureMinimal("2.8")
+ try:
+- import wxversion
+- if (wxversion.checkInstalled("2.8")):
++ if 'wx' not in sys.modules:
++ # Don't try to load if already loaded.
++ import wxversion
+ wxversion.ensureMinimal("2.8")
++ import wx
+ except:
+ pass
- import wx
-+ import wx
from _wxwidgets import *
PYO_USE_WX = True
except:
-Index: python-pyo-0.7/pyolib/_wxwidgets.py
+Index: python-pyo/utils/E-Pyo.py
===================================================================
---- python-pyo-0.7.orig/pyolib/_wxwidgets.py
-+++ python-pyo-0.7/pyolib/_wxwidgets.py
-@@ -143,8 +143,8 @@ def powOfTwoToInt(x):
- return POWOFTWO[x]
-
- def GetRoundBitmap( w, h, r ):
-- maskColor = wx.Color(0,0,0)
-- shownColor = wx.Color(5,5,5)
-+ maskColor = wx.Colour(0,0,0)
-+ shownColor = wx.Colour(5,5,5)
- b = wx.EmptyBitmap(w,h)
- dc = wx.MemoryDC(b)
- dc.SetBrush(wx.Brush(maskColor))
-Index: python-pyo-0.7/utils/E-Pyo.py
-===================================================================
---- python-pyo-0.7.orig/utils/E-Pyo.py
-+++ python-pyo-0.7/utils/E-Pyo.py
-@@ -2250,7 +2250,7 @@ class MainFrame(wx.Frame):
+--- python-pyo.orig/utils/E-Pyo.py
++++ python-pyo/utils/E-Pyo.py
+@@ -2337,7 +2337,7 @@ class MainFrame(wx.Frame):
def saveListPaste(self, evt):
if self.pastingList != []:
dlg = wx.FileDialog(self, message="Save file as ...",
@@ -50,7 +32,7 @@ Index: python-pyo-0.7/utils/E-Pyo.py
if dlg.ShowModal() == wx.ID_OK:
path = ensureNFD(dlg.GetPath())
with open(path, "w") as f:
-@@ -2258,7 +2258,7 @@ class MainFrame(wx.Frame):
+@@ -2345,7 +2345,7 @@ class MainFrame(wx.Frame):
def loadListPaste(self, evt):
dlg = wx.FileDialog(self, message="Choose a file",
@@ -59,7 +41,7 @@ Index: python-pyo-0.7/utils/E-Pyo.py
if dlg.ShowModal() == wx.ID_OK:
path = dlg.GetPath()
self.pastingList = []
-@@ -2520,7 +2520,7 @@ class MainFrame(wx.Frame):
+@@ -2605,7 +2605,7 @@ class MainFrame(wx.Frame):
def insertPath(self, evt):
dlg = wx.FileDialog(self, message="Choose a file",
defaultDir=PREFERENCES.get("insert_path", os.path.expanduser("~")),
@@ -68,7 +50,7 @@ Index: python-pyo-0.7/utils/E-Pyo.py
if dlg.ShowModal() == wx.ID_OK:
paths = dlg.GetPaths()
if len(paths) == 1:
-@@ -2710,7 +2710,7 @@ class MainFrame(wx.Frame):
+@@ -2795,7 +2795,7 @@ class MainFrame(wx.Frame):
def open(self, event, encoding=None):
dlg = wx.FileDialog(self, message="Choose a file",
defaultDir=PREFERENCES.get("open_file_path", os.path.expanduser("~")),
@@ -77,7 +59,7 @@ Index: python-pyo-0.7/utils/E-Pyo.py
if dlg.ShowModal() == wx.ID_OK:
paths = dlg.GetPaths()
for path in paths:
-@@ -2775,7 +2775,7 @@ class MainFrame(wx.Frame):
+@@ -2860,7 +2860,7 @@ class MainFrame(wx.Frame):
deffile = os.path.split(self.panel.editor.path)[1]
dlg = wx.FileDialog(self, message="Save file as ...",
defaultDir=PREFERENCES.get("save_file_path", os.path.expanduser("~")),
@@ -86,16 +68,7 @@ Index: python-pyo-0.7/utils/E-Pyo.py
dlg.SetFilterIndex(0)
if dlg.ShowModal() == wx.ID_OK:
path = ensureNFD(dlg.GetPath())
-@@ -3594,7 +3594,7 @@ class Editor(stc.StyledTextCtrl):
- dlg.Destroy()
- if not self.path or "Untitled-" in self.path:
- dlg2 = wx.FileDialog(None, message="Save file as ... (the file will be closed even if you pressed Cancel!)", defaultDir=os.getcwd(),
-- defaultFile="", style=wx.SAVE|wx.FD_OVERWRITE_PROMPT)
-+ defaultFile="", style=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
- dlg2.SetFilterIndex(0)
- if dlg2.ShowModal() == wx.ID_OK:
- path = dlg2.GetPath()
-@@ -3618,7 +3618,7 @@ class Editor(stc.StyledTextCtrl):
+@@ -3750,7 +3750,7 @@ class Editor(stc.StyledTextCtrl):
dlg.Destroy()
if not self.path or "Untitled-" in self.path:
dlg2 = wx.FileDialog(None, message="Save file as ...", defaultDir=os.getcwd(),
@@ -104,7 +77,7 @@ Index: python-pyo-0.7/utils/E-Pyo.py
dlg2.SetFilterIndex(0)
if dlg2.ShowModal() == wx.ID_OK:
path = dlg2.GetPath()
-@@ -3649,7 +3649,7 @@ class Editor(stc.StyledTextCtrl):
+@@ -3781,7 +3781,7 @@ class Editor(stc.StyledTextCtrl):
dlg.Destroy()
if not self.path or "Untitled-" in self.path:
dlg2 = wx.FileDialog(None, message="Save file as ...", defaultDir=os.getcwd(),
@@ -113,11 +86,11 @@ Index: python-pyo-0.7/utils/E-Pyo.py
dlg2.SetFilterIndex(0)
if dlg2.ShowModal() == wx.ID_OK:
-Index: python-pyo-0.7/utils/PyoDoc.py
+Index: python-pyo/utils/PyoDoc.py
===================================================================
---- python-pyo-0.7.orig/utils/PyoDoc.py
-+++ python-pyo-0.7/utils/PyoDoc.py
-@@ -1121,7 +1121,7 @@ def toSysEncoding(unistr):
+--- python-pyo.orig/utils/PyoDoc.py
++++ python-pyo/utils/PyoDoc.py
+@@ -1122,7 +1122,7 @@ def toSysEncoding(unistr):
if __name__ == "__main__":
DOC_AS_SINGLE_APP = True
--
python-pyo packaging
More information about the pkg-multimedia-commits
mailing list