|
|
48dccd1 |
diff -Nur driconf-0.9.1.orig/setup.cfg driconf-0.9.1/setup.cfg
|
|
|
48dccd1 |
--- driconf-0.9.1.orig/setup.cfg 2005-08-11 13:07:12.000000000 -0600
|
|
|
48dccd1 |
+++ driconf-0.9.1/setup.cfg 2006-12-16 14:33:17.000000000 -0700
|
|
|
48dccd1 |
@@ -1,3 +0,0 @@
|
|
|
48dccd1 |
-[install]
|
|
|
48dccd1 |
-prefix=/usr/local
|
|
|
48dccd1 |
-install-purelib=/usr/local/lib/driconf
|
|
|
48dccd1 |
diff -Nur driconf-0.9.1.orig/setup.py driconf-0.9.1/setup.py
|
|
|
48dccd1 |
--- driconf-0.9.1.orig/setup.py 2006-09-17 19:41:20.000000000 -0600
|
|
|
48dccd1 |
+++ driconf-0.9.1/setup.py 2006-12-16 14:33:32.000000000 -0700
|
|
|
48dccd1 |
@@ -19,57 +19,3 @@
|
|
|
48dccd1 |
"drilogo.jpg", "driconf-icon.png"])
|
|
|
48dccd1 |
] + translations)
|
|
|
48dccd1 |
|
|
|
48dccd1 |
-#
|
|
|
48dccd1 |
-# Search for obsolete files.
|
|
|
48dccd1 |
-#
|
|
|
48dccd1 |
-# driconf_xpm is gone for good, the other two python modules were moved to
|
|
|
48dccd1 |
-# <prefix>/lib/driconf/...
|
|
|
48dccd1 |
-#
|
|
|
48dccd1 |
-from os.path import isfile, isdir, join
|
|
|
48dccd1 |
-from distutils.sysconfig import get_python_lib
|
|
|
48dccd1 |
-obsoleteFiles = []
|
|
|
48dccd1 |
-for prefix in [None, "/usr/local"]:
|
|
|
48dccd1 |
- if not prefix:
|
|
|
48dccd1 |
- pyLibPath = get_python_lib()
|
|
|
48dccd1 |
- else:
|
|
|
48dccd1 |
- pyLibPath = get_python_lib(prefix=prefix)
|
|
|
48dccd1 |
- if not isdir (pyLibPath):
|
|
|
48dccd1 |
- continue
|
|
|
48dccd1 |
- for f in ["driconf_xpm.py", "driconf_xpm.pyc", "driconf_xpm.pyo",
|
|
|
48dccd1 |
- "driconf.py", "driconf.pyc", "driconf.pyo",
|
|
|
48dccd1 |
- "dri.py", "dri.pyc", "dri.pyo"]:
|
|
|
48dccd1 |
- path = join (pyLibPath, f)
|
|
|
48dccd1 |
- if isfile (path):
|
|
|
48dccd1 |
- obsoleteFiles.append (path)
|
|
|
48dccd1 |
-if obsoleteFiles:
|
|
|
48dccd1 |
- print "\n*** Obsolete files from previous DRIconf versions were found on " \
|
|
|
48dccd1 |
- "your system.\n*** Unless you tweaked setup.cfg you can probably " \
|
|
|
48dccd1 |
- "delete them:"
|
|
|
48dccd1 |
- for f in obsoleteFiles:
|
|
|
48dccd1 |
- print "***\t%s" % f
|
|
|
48dccd1 |
-
|
|
|
48dccd1 |
-#
|
|
|
48dccd1 |
-# Check if required packages are installed
|
|
|
48dccd1 |
-#
|
|
|
48dccd1 |
-errors = 0
|
|
|
48dccd1 |
-try:
|
|
|
48dccd1 |
- import pygtk
|
|
|
48dccd1 |
- pygtk.require ("2.0")
|
|
|
48dccd1 |
- import gtk
|
|
|
48dccd1 |
-except:
|
|
|
48dccd1 |
- print "\n*** Warning: importing GTK version 2 doesn't work."
|
|
|
48dccd1 |
- errors = 1
|
|
|
48dccd1 |
-else:
|
|
|
48dccd1 |
- if gtk.check_version(2, 4, 0):
|
|
|
48dccd1 |
- print "\n*** Warning: DRIconf requires GTK 2.4 or newer."
|
|
|
48dccd1 |
- errors = 1
|
|
|
48dccd1 |
-try:
|
|
|
48dccd1 |
- import xml.parsers.expat
|
|
|
48dccd1 |
-except:
|
|
|
48dccd1 |
- if not errors:
|
|
|
48dccd1 |
- print
|
|
|
48dccd1 |
- print "*** Warning: importing xml.parsers.expat doesn't work."
|
|
|
48dccd1 |
- errors = 1
|
|
|
48dccd1 |
-
|
|
|
48dccd1 |
-if errors:
|
|
|
48dccd1 |
- print "*** Warning: DRIconf will probably not work for the above reason(s)."
|