colorname (0.4+dfsg.1-2) 01-fix_paths.patch

From: David Paleino <dapal@debian.org>
Subject: fix path of color schemes
Forwarded: not-needed
 To be honest, this should be made configurable via setup.py :)

---
 colorname.py |   15 ++++++++-------
 setup.py     |    4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

--- colorname.orig/colorname.py
+++ colorname/colorname.py
@@ -59,7 +59,7 @@ except ImportError:
 ## config
 
 colorDefPattern = "colorname-*.txt"
-colorDefDir = "colorname-colors"
+colorDefDir = "/usr/share/colorname/"
 windowSize = (350, 600)
 
 class ColorVector(tuple):
@@ -486,13 +486,14 @@ def init():
 	
 	g = GUI()
 	
-	## load external color definitions
-	pkgdirRe = re.compile("packages$")
-	
-	colorLocations = []
-	for e in filter(pkgdirRe.search, sys.path):
-		colorLocations.append(os.path.join(e, colorDefDir))
+#	## load external color definitions
+#	pkgdirRe = re.compile("packages$")
 	
+	colorLocations = [colorDefDir]
+#	colorLocations = []
+#	for e in filter(pkgdirRe.search, sys.path):
+#		colorLocations.append(os.path.join(e, colorDefDir))
+
 	# files
 	files = []
 	for path in colorLocations:
--- colorname.orig/setup.py
+++ colorname/setup.py
@@ -11,7 +11,7 @@ import colorname
 
 if os.name == "posix":
 	for scheme in INSTALL_SCHEMES.values():
-		scheme['data'] = scheme['purelib'] 
+		scheme['data'] = scheme['purelib']
 
 setup(
 	name='colorname',
@@ -30,5 +30,5 @@ setup(
 		"Topic :: Utilities"
 	],
 	scripts=['colorname.py'],
-	data_files=[(colorname.colorDefDir, glob(os.path.join(colorname.colorDefDir, colorname.colorDefPattern)))]
+	data_files=[(colorname.colorDefDir, glob(os.path.join("colorname-colors", colorname.colorDefPattern)))]
 )