[SCM] cecilia/master: Fix patche for new upstream.
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Sat Aug 1 13:04:56 UTC 2015
The following commit has been merged in the master branch:
commit 167cf74dc312d22fc81cf999c222f27a7373c330
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Sat Aug 1 09:00:43 2015 -0400
Fix patche for new upstream.
diff --git a/debian/patches/use-distutils.diff b/debian/patches/use-distutils.diff
index 9999114..85d2f7a 100644
--- a/debian/patches/use-distutils.diff
+++ b/debian/patches/use-distutils.diff
@@ -1,32 +1,35 @@
--- a/Cecilia5.py
+++ b/Cecilia5.py
-@@ -21,10 +21,10 @@
-
+@@ -18,13 +18,13 @@
+ You should have received a copy of the GNU General Public License
+ along with Cecilia 5. If not, see <http://www.gnu.org/licenses/>.
+ """
+-from Resources.constants import *
++from cecilia.Resources.constants import *
+ from types import ListType
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)
+ class CeciliaApp(wx.App):
+ def __init__(self, *args, **kwargs):
--- a/Resources/constants.py
+++ b/Resources/constants.py
-@@ -18,7 +18,7 @@
+@@ -17,7 +17,7 @@
+ You should have received a copy of the GNU General Public License
along with Cecilia 5. If not, see <http://www.gnu.org/licenses/>.
"""
-
-import os, sys
+import os, sys, cecilia
- from images import *
reload(sys)
-@@ -39,7 +39,7 @@
+ sys.setdefaultencoding("utf-8")
+@@ -41,7 +41,7 @@
if '/%s.app' % APP_NAME in os.getcwd():
RESOURCES_PATH = os.getcwd()
else:
--
cecilia packaging
More information about the pkg-multimedia-commits
mailing list