[SCM] python-pyo/master: Fix patch for new version.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2b1c20636b272aef3ea251fce182047d5c39a85a
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Sun Apr 13 00:28:02 2014 -0400

    Fix patch for new version.

diff --git a/debian/patches/01-Fix_E-Pyo_paths.diff b/debian/patches/01-Fix_E-Pyo_paths.diff
deleted file mode 100644
index b423674..0000000
--- a/debian/patches/01-Fix_E-Pyo_paths.diff
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/utils/E-Pyo.py
-+++ b/utils/E-Pyo.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
- # encoding: utf-8
- """
- E-Pyo is a simple text editor especially configured to edit pyo audio programs.
-@@ -146,7 +146,7 @@
- elif WIN_APP_BUNDLED:
-     EXAMPLE_PATH = os.path.join(os.getcwd(), "Resources", "examples")
- else:
--    EXAMPLE_PATH = os.path.join(os.getcwd(), "../examples")
-+    EXAMPLE_PATH = "/usr/share/doc/python-pyo/examples" 
- 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()
-@@ -163,9 +163,9 @@
-                 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))
- 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
-@@ -194,12 +194,12 @@
-         for file in files:
-             shutil.copy(os.path.join(os.getcwd(), "Resources", "styles", file), os.path.join(STYLES_PATH, file))
-     else:
--        files = [f for f in os.listdir(os.path.join(os.getcwd(), "styles")) if f[0] != "."]
-+        files = [f for f in os.listdir(os.path.join("/usr/lib/python-pyo", "styles")) if f[0] != "."]
-         for file in files:
--            shutil.copy(os.path.join(os.getcwd(), "styles", file), os.path.join(STYLES_PATH, file))
-+            shutil.copy(os.path.join("/usr/lib/python-pyo", "styles", file), os.path.join(STYLES_PATH, file))
- DEFAULT_STYLE = os.path.join(STYLES_PATH, "Default")
- if not os.path.isfile(os.path.join(STYLES_PATH, "Default")):
--    shutil.copy(os.path.join(os.getcwd(), "styles", "Default"), DEFAULT_STYLE)
-+    shutil.copy(os.path.join("/usr/lib/python-pyo", "styles", "Default"), DEFAULT_STYLE)
- if PREFERENCES.has_key("pref_style"):
-     PREF_STYLE = os.path.join(STYLES_PATH, PREFERENCES["pref_style"])
- else:
-@@ -213,7 +213,7 @@
-     with open(MARKERS_FILE, "w") as f:
-         f.write("=\n")
- 
--BACKGROUND_SERVER_DEFAULT_ARGS = 'sr=44100, nchnls=2, buffersize=256, duplex=1, audio="portaudio", jackname="pyo"'
-+BACKGROUND_SERVER_DEFAULT_ARGS = 'sr=44100, nchnls=2, buffersize=256, duplex=1, audio="jack", jackname="pyo"'
- BACKGROUND_SERVER_ARGS = PREFERENCES.get("background_server_args", BACKGROUND_SERVER_DEFAULT_ARGS)
- 
- ################## Utility Functions ##################
diff --git a/debian/patches/series b/debian/patches/series
index cf0f6a4..add74dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01-Fix_E-Pyo_paths.diff
+01-epyo_paths

-- 
python-pyo packaging