[Python-modules-commits] r2694 - in /packages/python-pygraphviz/trunk/debian: TODO changelog control patches/2_pkg-config_backported_fix_r605.diff
kibi-guest at users.alioth.debian.org
kibi-guest at users.alioth.debian.org
Tue Jul 10 16:49:08 UTC 2007
Author: kibi-guest
Date: Tue Jul 10 16:49:08 2007
New Revision: 2694
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2694
Log:
Achieve the graphviz 2.8 to 2.12 transition
Removed:
packages/python-pygraphviz/trunk/debian/TODO
Modified:
packages/python-pygraphviz/trunk/debian/changelog
packages/python-pygraphviz/trunk/debian/control
packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff
Modified: packages/python-pygraphviz/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/changelog?rev=2694&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/changelog (original)
+++ packages/python-pygraphviz/trunk/debian/changelog Tue Jul 10 16:49:08 2007
@@ -6,7 +6,12 @@
support (Closes: #423821).
* Rebuild against graphviz 2.12 (Closes: #425864).
* Urgency set to `high' since 2 RC bugs are addressed.
+ * Build-Depends on libgraphviz3-dev instead of graphviz-dev, and Depends on
+ graphviz (>= 2.12) since now it is no longer automatically added to the
+ Depends, and since commandline tools are used.
* Deleted overrides about the rpath, since graphviz no longer uses it.
+ * Deleted debian/TODO since this achieves the transition from graphviz 2.8
+ to 2.12.
-- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr> Tue, 10 Jul 2007 17:21:18 +0200
Modified: packages/python-pygraphviz/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/control?rev=2694&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/control (original)
+++ packages/python-pygraphviz/trunk/debian/control Tue Jul 10 16:49:08 2007
@@ -2,7 +2,7 @@
Section: python
Priority: optional
Maintainer: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-support (>= 0.5.3), python-all-dev (>= 2.3.5-11), graphviz-dev, python-setuptools, pkg-config
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-support (>= 0.5.3), python-all-dev (>= 2.3.5-11), libgraphviz3-dev, python-setuptools, pkg-config
Standards-Version: 3.7.2
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pygraphviz/trunk/
@@ -10,7 +10,7 @@
Package: python-pygraphviz
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, graphviz (>= 2.12)
Provides: ${python:Provides}
Description: Python interface to the Graphviz graph layout and visualization package
Pygraphviz is a Python interface to the Graphviz graph layout and
Modified: 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=2694&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff (original)
+++ packages/python-pygraphviz/trunk/debian/patches/2_pkg-config_backported_fix_r605.diff Tue Jul 10 16:49:08 2007
@@ -1,180 +1,203 @@
---- 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"],
- )]
+--- pygraphviz/tags/pygraphviz-0.34/setup.py 2007-07-10 18:42:19.000000000 +0200
++++ pygraphviz/trunk/setup.py 2007-07-10 18:42:17.000000000 +0200
+@@ -3,7 +3,7 @@
+ """
+ Setup script for pygraphviz.
+ """
+-# Copyright (C) 2006 by
++# Copyright (C) 2006,2007 by
+ # Aric Hagberg <hagberg at lanl.gov>
+ # Dan Schult <dschult at colgate.edu>
+ # Manos Renieris, http://www.cs.brown.edu/~er/
+@@ -20,86 +20,116 @@
+ print "To install, run 'python setup.py install'"
+ 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 ucommenting these lines or providing your own:
+-# You must set both 'libs' and 'includes'
++# specify it here by uncommenting these lines or providing your own:
++# You must set both 'library_path' and 'include_path'
+
+-#libs='/packages/lib/graphviz'
+-#includes='/packages/include/graphviz'
+-
+-# UNIX,Linux
+-#libs='/usr/lib/graphviz'
+-#includes='/usr/include/graphviz'
+-
+-# UNIX,Linux alternate
+-#libs='/usr/local/lib/graphviz'
+-#includes='/usr/local/include/graphviz'
++# UNIX, Linux
++#library_path='/usr/lib/graphviz'
++#include_path='/usr/include/graphviz'
++
++# UNIX, Linux alternate
++#library_path='/usr/local/lib/graphviz'
++#include_path='/usr/local/include/graphviz'
++
++# Mac OS X (Fink)
++#library_path='/sw/lib/graphviz'
++#include_path='/sw/include/graphviz'
++
++# Mac OS X (MacPorts)
++#library_path='/opt/local/lib/graphviz'
++#include_path='/opt/local/include/graphviz'
++
++
++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
+
+-# OSX,fink
+-#libs='/sw/lib/graphviz'
+-#includes='/sw/include/graphviz'
+
+-# OSX,darwin-ports?
+-#libs='/opt/local/graphviz'
+-#includes='/opt/local/include/graphviz'
+
+-if libs is None:
++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:
+ Install subprocess from
+ 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 libs is None or libs=='':
+- libs="/usr/lib/graphviz" # make a guess anyway
+- includes="/usr/includes/graphviz" # make a guess anyway
+-
+-# 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?)"
+- 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.
+-
+-The current settings of libs and includes is:"""
+- print "libs=%s"%libs
+- print "includes=%s"%includes
++
++if library_path is None and include_path is None:
++ print "Trying pkg-config"
++ include_path,library_path=pkg_config()
++
++if library_path is None and include_path is None:
++ print "Trying dotneato-config"
++ include_path,library_path=dotneato_config()
++
++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
+- raise "Error locating graphviz."
++ raise OSError,"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'))
+
+@@ -112,8 +142,8 @@
+ ]
+ 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"],
+ )]
+ package_data = {'': ['*.txt'],}
More information about the Python-modules-commits
mailing list