[SCM] cecilia/master: Recovering files before patching...

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 349b8346463862a6f5acf3fcaf3797852401ebfb
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Thu Nov 28 19:40:47 2013 -0500

    Recovering files before patching...

diff --git a/Cecilia5.py b/Cecilia5.py
index 8e7013c..dcca820 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 cecilia.Resources.constants import *
-from cecilia.Resources import audio, CeciliaMainFrame
-import cecilia.Resources.CeciliaLib as CeciliaLib
-from cecilia.Resources.splash import CeciliaSplashScreen
+from Resources.constants import *
+from Resources import audio, CeciliaMainFrame
+import Resources.CeciliaLib as CeciliaLib
+from 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 b598a05..2d1205c 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, cecilia
+import os, sys
 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 = RESOURCES_PATH = cecilia.Resources.__path__[0]
+    RESOURCES_PATH = os.path.join(os.getcwd(), 'Resources')
 
 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/changelog b/debian/changelog
index a6f420f..7886a78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cecilia (5.0.9-1) UNRELEASED; urgency=low
+cecilia (5.0.9-1) unstable; urgency=low
 
   * New upstream release.
 

-- 
cecilia packaging