[Python-modules-commits] r2693 - in /packages/python-pygraphviz/trunk/debian: changelog patches/2_pkg-config_backported_fix_r605.diff python-pygraphviz.lintian-overrides
kibi-guest at users.alioth.debian.org
kibi-guest at users.alioth.debian.org
Tue Jul 10 16:00:48 UTC 2007
Author: kibi-guest
Date: Tue Jul 10 16:00:48 2007
New Revision: 2693
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2693
Log:
Backport r605 to fix #423821, #425864. Delete the associated override
Added:
packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff
Modified:
packages/python-pygraphviz/trunk/debian/changelog
packages/python-pygraphviz/trunk/debian/python-pygraphviz.lintian-overrides
Modified: packages/python-pygraphviz/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/changelog?rev=2693&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/changelog (original)
+++ packages/python-pygraphviz/trunk/debian/changelog Tue Jul 10 16:00:48 2007
@@ -1,3 +1,15 @@
+python-pygraphviz (0.34-2) unstable; urgency=high
+
+ * Backported fix (debian/patches/2_pkg-config_backported_fix_r605.diff) from
+ r605 since 0.35 is late. Fixed FTBFS with graphviz 2.12, for which the
+ output of `pkg-config' changed (no more `-L...'), which pygraphviz didn't
+ support (Closes: #423821).
+ * Rebuild against graphviz 2.12 (Closes: #425864).
+ * Urgency set to `high' since 2 RC bugs are addressed.
+ * Deleted overrides about the rpath, since graphviz no longer uses it.
+
+ -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr> Tue, 10 Jul 2007 17:21:18 +0200
+
python-pygraphviz (0.34-1) unstable; urgency=low
* New upstream release, including:
Added: packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff?rev=2693&op=file
==============================================================================
--- packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff (added)
+++ packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff Tue Jul 10 16:00:48 2007
@@ -1,0 +1,180 @@
+--- pygraphviz/trunk/setup.py (revision 569)
++++ pygraphviz/trunk/setup.py (revision 605)
+@@ -21,42 +21,72 @@
+ print
+
++library_path=None
++include_path=None
+
+-libs=None
+-includes=None
+
+ # If the setup script couldn't find your graphviz installation you can
+ # specify it here by uncommenting these lines or providing your own:
+-# You must set both 'libs' and 'includes'
+-
+-#libs='/packages/lib/graphviz'
+-#includes='/packages/include/graphviz'
++# You must set both 'library_path' and 'include_path'
+
+ # UNIX, Linux
+-#libs='/usr/lib/graphviz'
+-#includes='/usr/include/graphviz'
++#library_path='/usr/lib/graphviz'
++#include_path='/usr/include/graphviz'
+
+ # UNIX, Linux alternate
+-#libs='/usr/local/lib/graphviz'
+-#includes='/usr/local/include/graphviz'
++#library_path='/usr/local/lib/graphviz'
++#include_path='/usr/local/include/graphviz'
+
+ # Mac OS X (Fink)
+-#libs='/sw/lib/graphviz'
+-#includes='/sw/include/graphviz'
++#library_path='/sw/lib/graphviz'
++#include_path='/sw/include/graphviz'
+
+ # Mac OS X (MacPorts)
+-#libs='/opt/local/lib/graphviz'
+-#includes='/opt/local/include/graphviz'
++#library_path='/opt/local/lib/graphviz'
++#include_path='/opt/local/include/graphviz'
+
+-if libs is None:
++
++def pkg_config():
++ # attempt to find graphviz installation with pkg-config
++ # should work with modern versions of graphviz
++ library_path=None
++ include_path=None
++ try:
++ output,err = \
++ S.Popen('pkg-config --libs-only-L libagraph',
++ shell=True, stdin=S.PIPE, stdout=S.PIPE,
++ close_fds=True).communicate()
++ if output:
++ library_path=output.strip()[2:]
++ output,err = \
++ S.Popen('pkg-config --cflags-only-I libagraph',
++ shell=True, stdin=S.PIPE, stdout=S.PIPE,
++ close_fds=True).communicate()
++ if output:
++ include_path=output.strip()[2:]
++ except:
++ print "Failed to find pkg-config"
++ return include_path,library_path
++
++def dotneato_config():
++ # find graphviz configuration with dotneato-config
++ # works with older versions of graphviz
++ library_path=None
++ include_path=None
++ try:
++ output = S.Popen(['dotneato-config','--ldflags','--cflags'],
++ stdout=S.PIPE).communicate()[0]
++ if output:
++ include_path,library_path=output.split()
++ library_path=library_path.strip()[2:]
++ include_path=include_path.strip()[2:]
++ except:
++ print "Failed to find dotneato-config"
++ return include_path,library_path
++
++
++
++if library_path is None and include_path is None:
+ try:
+ import subprocess as S
+- output,err = \
+- S.Popen('pkg-config --libs-only-L --cflags-only-I libagraph',
+- shell=True, stdin=S.PIPE, stdout=S.PIPE,
+- close_fds=True).communicate()
+- if output:
+- includes,libs=output.split()
+- libs=libs.strip()[2:]
+- includes=includes.strip()[2:]
+ except ImportError:
+ print """-- Missing subprocess package:
+@@ -64,41 +94,41 @@
+ http://effbot.org/downloads/#subprocess
+ or set the graphviz paths manually as described below."""
+- if libs is None or libs=='':
+- print "-- Failed to find pkg-config for libagraph"
+- print " Trying dotneato-config"
+- try:
+- output = S.Popen(['dotneato-config','--ldflags','--cflags'],
+- stdout=S.PIPE).communicate()[0]
+- if output:
+- includes,libs=output.split()
+- libs=libs.strip()[2:]
+- includes=includes.strip()[2:]
+- except:
+- print "-- Failed to find dotneato-config"
+
++if library_path is None and include_path is None:
++ print "Trying pkg-config"
++ include_path,library_path=pkg_config()
+
+-if libs is None or libs=='':
+- libs="/usr/lib/graphviz" # make a guess anyway
+- includes="/usr/includes/graphviz" # make a guess anyway
++if library_path is None and include_path is None:
++ print "Trying dotneato-config"
++ include_path,library_path=dotneato_config()
+
+-# sanity check
+-try:
+- agraphpath=includes+os.sep+'agraph.h'
+- fh=open(agraphpath,'r')
+-except:
+- print "-- Error: agraph.h include file not found at %s"%agraphpath
+- print " Incomplete graphviz installation (graphviz-dev missing?)"
++if library_path is None or include_path is None:
++ print
++ print """Your graphviz installation could not be found.
++
++Either the graphviz package is missing on incomplete (graphviz-dev missing?).
++
++If you think your installation is correct you will need to manually
++change the include_path and library_path variables in setup.py to
++point to the correct locations of your graphviz installation.
++
++The current setting of library_path and include_path is:"""
++ print "library_path=%s"%library_path
++ print "include_path=%s"%include_path
+ print
+- print """Your graphviz installation couldn't be found.
+-If you think your installation is correct you will
+-need to manually change the includes and libs variables in setup.py
+-to point to the correct locations of your graphviz installation.
++ raise OSError,"Error locating graphviz."
+
+-The current setting of libs and includes is:"""
+- print "libs=%s"%libs
+- print "includes=%s"%includes
+- print
+- raise "Error locating graphviz."
++print "library_path=%s"%library_path
++print "include_path=%s"%include_path
+
++if len(library_path)>0:
++ library_dirs=[library_path]
++else:
++ library_dirs=None
++
++if len(include_path)>0:
++ include_dirs=[include_path]
++else:
++ include_dirs=None
+
+ execfile(os.path.join('pygraphviz','release.py'))
+@@ -113,6 +143,6 @@
+ extension = [Extension("pygraphviz._graphviz",
+ ["pygraphviz/graphviz_wrap.c"],
+- include_dirs=[includes],
+- library_dirs=[libs],
++ include_dirs=include_dirs,
++ library_dirs=library_dirs,
+ libraries=["agraph","cdt"],
+ )]
Modified: packages/python-pygraphviz/trunk/debian/python-pygraphviz.lintian-overrides
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/python-pygraphviz.lintian-overrides?rev=2693&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/python-pygraphviz.lintian-overrides (original)
+++ packages/python-pygraphviz/trunk/debian/python-pygraphviz.lintian-overrides Tue Jul 10 16:00:48 2007
@@ -5,11 +5,3 @@
# ``python /path/to/tests/test.py''
python-pygraphviz: script-not-executable ./usr/share/python-support/python-pygraphviz/pygraphviz/tests/test.py
-
-
-
-# Since public libraries are stored in /usr/lib/graphviz without /etc/ld.so.conf
-# (see: #360968, #312533, #343476), I'm using a rpath at the moment.
-
-python-pygraphviz: binary-or-shlib-defines-rpath ./usr/lib/python-support/python-pygraphviz/python2.4/pygraphviz/_graphviz.so /usr/lib/graphviz
-python-pygraphviz: binary-or-shlib-defines-rpath ./usr/lib/python-support/python-pygraphviz/python2.5/pygraphviz/_graphviz.so /usr/lib/graphviz
More information about the Python-modules-commits
mailing list