[SCM] cecilia/master: Include png in include-binaries.
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Fri Nov 29 01:46:19 UTC 2013
The following commit has been merged in the master branch:
commit 529cadb13d31b1662cd995b8dcfad846ce1303bd
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Thu Nov 28 19:39:06 2013 -0500
Include png in include-binaries.
diff --git a/Cecilia5.py b/Cecilia5.py
index dcca820..8e7013c 100755
--- a/Cecilia5.py
+++ b/Cecilia5.py
@@ -21,10 +21,10 @@ along with Cecilia 5. If not, see <http://www.gnu.org/licenses/>.
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)
diff --git a/Resources/constants.py b/Resources/constants.py
index 2d1205c..b598a05 100644
--- a/Resources/constants.py
+++ b/Resources/constants.py
@@ -18,7 +18,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 @@ ENCODING = sys.getfilesystemencoding()
if '/%s.app' % APP_NAME in os.getcwd():
RESOURCES_PATH = os.getcwd()
else:
- RESOURCES_PATH = os.path.join(os.getcwd(), 'Resources')
+ RESOURCES_PATH = RESOURCES_PATH = cecilia.Resources.__path__[0]
if not os.path.isdir(RESOURCES_PATH) and sys.platform == "win32":
RESOURCES_PATH = os.path.join(os.getenv("ProgramFiles"), "Cecilia5", "Resources")
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..ee56dd5
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/cecilia.png
--
cecilia packaging
More information about the pkg-multimedia-commits
mailing list