[Greater-commits] r174 - trunk/GREAT-ER-DB/trunk

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-06-09 11:26:30 +0200 (Thu, 09 Jun 2011)
New Revision: 174

Modified:
   trunk/GREAT-ER-DB/trunk/setup.py
Log:
Fix encoding and deprectated license variable name


Modified: trunk/GREAT-ER-DB/trunk/setup.py
===================================================================
--- trunk/GREAT-ER-DB/trunk/setup.py	2009-04-09 08:14:11 UTC (rev 173)
+++ trunk/GREAT-ER-DB/trunk/setup.py	2011-06-09 09:26:30 UTC (rev 174)
@@ -129,13 +129,6 @@
 
     def postgres_extension_from_file(self):
         dbapi_dir     = os.path.dirname(self.postgres_interface_file)
-	#
-        # postgres_home wird nicht mehr benutzt, da die Pfade direkt gesetzt werden
-	# und nicht über zum Beispiel postgres_incdirs = os.path.join(postgres_home,"...") 
-	#
-	# postgres_home = os.getenv("POSTGRES_HOME")
-        # if not postgres_home:
-        #    raise RuntimeError("Environment variable POSTGRES_HOME not defined")
 	if self.postgres_incl_path:
 		postgres_incdirs = [self.postgres_incl_path]
 	else:
@@ -149,9 +142,9 @@
 	        postgres_lib_dirs = ["/usr/lib/postgresql/lib"] 
 	
 	# self.run_command("ecpg "+self.postgres_interface_file)
-	
-	# ecpg ist die Bibliothek, die für Embedded SQL in C benötigt wird
-	# pq bietet in diesem Fall die Schnittstelle für die BLOB's
+
+    # ecpg is the library, used for Embedded SQL in C,
+    # pq offers the BLOB interface in this case
         postgres_libs = ["ecpg","pq"]
         return Extension("GreaterDB._dagreater_pg",
                          ["dagreater/_dagreater_pg.c",
@@ -252,7 +245,7 @@
       version = "cvs",
       description = "GREAT-ER",
       long_description = """GREAT-ER""",
-      licence = "GPL",
+      license = "GPL",
       author = "Intevation GmbH",
       author_email = "bh at intevation.de",
       url = "http://great-er.intevation.de/",