Merge pull request #2 from smathot/master

Fix to allow Ubuntu packaging

Author: dschreij

debian/changelog

@@ -1,3 +1,9 @@
+datamerger (1.02-ubuntu2) raring; urgency=low
+
+  * Numerous bugfixes
+
+ -- Sebastiaan Mathot <s.mathot@cogsci.nl>  Wed, 16 Oct 2013 17:47:32 +0200
+
 datamerger (1.0-ubuntu5) precise; urgency=low
 
   * Initial release.

libdatamerger/datamerger_ui.py

@@ -38,7 +38,7 @@ def get_resource_loc(item):
 		basedir = sys._MEIPASS		
 		return os.path.join(basedir,"resources",item)
 	elif os.name == 'posix' and os.path.exists('/usr/share/datamerger/resources/'):
-		return '/usr/share/datamerger/resources/'
+		return os.path.join('/usr/share/datamerger/resources/', item)
 	else:
 		basedir = os.path.dirname(__file__)
 		return os.path.join(basedir,"../resources",item)