Package: graphviz
Version: 2.20.2-3
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jaunty ubuntu-patch
Next Python2.6 will change the place where Python libs are installed (from
site-packages to dist-packages), so the packages needs to be adapted.
*** /tmp/tmpvzuFH_
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/control:
- Dropped build dependency on python2.4-dev
- Added build dependency on python2.6-dev (LP: #338553)
- Added XS-Python-Version: all
- Updated description of libgv-python to drop references to python2.4 and
python2.5
* debian/rules:
- Included python.mk
- Load PYTHON_VERSIONS with default version instead of all versions
- Enable generic python support in configure (parameter --enable-python)
call and disable python2.4 (--enable-python24) support
- Install the generic python support and 2.5 support instead of 2.4 and 2.5
We thought you might be interested in doing the same.
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500, 'jaunty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.27-11-generic (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
diff -u graphviz-2.20.2/debian/rules graphviz-2.20.2/debian/rules
--- graphviz-2.20.2/debian/rules
+++ graphviz-2.20.2/debian/rules
@@ -6,6 +6,7 @@
#export DH_VERBOSE=1
include /usr/share/quilt/quilt.make
+include /usr/share/python/python.mk
# Get build platform info
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -25,7 +26,7 @@
DEV_PACKAGE = $(CURDIR)/debian/libgraphviz-dev
-PYTHON_VERSIONS = $(shell pyversions -s)
+PYTHON_VERSIONS = $(shell pyversions -d)
PYTHON_PACKAGE = $(CURDIR)/debian/libgv-python
RUBY_VERSION = 1.8
@@ -62,7 +63,7 @@
--enable-lua \
--enable-ocaml \
--enable-php \
- --enable-python24 \
+ --enable-python \
--enable-python25 \
--enable-ruby \
--enable-tcl \
@@ -192,17 +193,18 @@
rm -rf $(OCAML_PACKAGE)/usr/lib/graphviz
# Some additional work for libgv-python
- # Note the sed call because of python{24,25} instead of python{2.4,2.5}
- # Note gv.py isn't really duplicated, it's just installed in a location
- # where python-support will find it. Both being identical, python-support
- # will just do the right thing.
- for i in $(PYTHON_VERSIONS); do \
- install -d $(PYTHON_PACKAGE)/usr/lib/$$i/site-packages ; \
- cp $(PYTHON_PACKAGE)/usr/lib/graphviz/python/gv.py \
- $(PYTHON_PACKAGE)/usr/lib/$$i/site-packages ; \
- mv $(PYTHON_PACKAGE)/usr/lib/graphviz/$$(echo $$i|sed -e 's/\.//')/*.so \
- $(PYTHON_PACKAGE)/usr/lib/$$i/site-packages ; \
- done
+ # for default python version
+ install -d $(PYTHON_PACKAGE)/usr/lib/$(PYTHON_VERSIONS)/$(call py_sitename_sh, $(PYTHON_VERSIONS)) ; \
+ cp $(PYTHON_PACKAGE)/usr/lib/graphviz/python/gv.py \
+ $(PYTHON_PACKAGE)/usr/lib/$(PYTHON_VERSIONS)/$(call py_sitename_sh, $(PYTHON_VERSIONS)) ; \
+ mv $(PYTHON_PACKAGE)/usr/lib/graphviz/python/*.so \
+ $(PYTHON_PACKAGE)/usr/lib/$(PYTHON_VERSIONS)/$(call py_sitename_sh, $(PYTHON_VERSIONS)) ; \
+ # for python2.5
+ install -d $(PYTHON_PACKAGE)/usr/lib/python2.5/$(call py_sitename_sh, $(PYTHON_VERSIONS)) ; \
+ cp $(PYTHON_PACKAGE)/usr/lib/graphviz/python/gv.py \
+ $(PYTHON_PACKAGE)/usr/lib/python2.5/$(call py_sitename_sh, $(PYTHON_VERSIONS)) ; \
+ mv $(PYTHON_PACKAGE)/usr/lib/graphviz/python25/*.so \
+ $(PYTHON_PACKAGE)/usr/lib/python2.5/$(call py_sitename_sh, $(PYTHON_VERSIONS)) ; \
rm -rf $(PYTHON_PACKAGE)/usr/lib/graphviz
# Debian-specific manpage
--- graphviz-2.20.2/debian/control
+++ graphviz-2.20.2/debian/control
@@ -4,10 +4,11 @@
Maintainer: Ubuntu Core Developers <ubuntu-devel-disc...@lists.ubuntu.com>
XSBC-Original-Maintainer: Cyril Brulebois <k...@debian.org>
Standards-Version: 3.8.0
-Build-Depends: tk8.5-dev, tcl8.5-dev, debhelper (>= 5), libfreetype6-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libxaw7-dev, bison, flex, autotools-dev, pdksh, libexpat1-dev, libfontconfig1-dev, libltdl7-dev, swig, libperl-dev, libgd2-noxpm-dev (>= 2.0.35), quilt (>= 0.40), groff-base, ghostscript, lua5.1, liblua5.1-0-dev, ruby, ruby1.8-dev, php5-dev, php5-cli, ocaml-nox, python2.4-dev, python2.5-dev, python-minimal, libcairo2-dev, libpango1.0-dev, guile-1.8-dev, d-shlibs, python-support, chrpath
+Build-Depends: tk8.5-dev, tcl8.5-dev, debhelper (>= 5), libfreetype6-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libxaw7-dev, bison, flex, autotools-dev, pdksh, libexpat1-dev, libfontconfig1-dev, libltdl7-dev, swig, libperl-dev, libgd2-noxpm-dev (>= 2.0.35), quilt (>= 0.40), groff-base, ghostscript, lua5.1, liblua5.1-0-dev, ruby, ruby1.8-dev, php5-dev, php5-cli, ocaml-nox, python2.5-dev, python2.6-dev, python-minimal, libcairo2-dev, libpango1.0-dev, guile-1.8-dev, d-shlibs, python-support, chrpath
Vcs-Git: git://git.debian.org/git/collab-maint/graphviz.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/graphviz.git
Homepage: http://www.graphviz.org/
+XS-Python-Version: all
Package: graphviz
Architecture: any
@@ -99,7 +100,7 @@
Graphviz is a set of graph drawing tools. See the description of the graphviz
package for a full description.
.
- This package contains the Python (2.4 and 2.5) bindings.
+ This package contains the Python bindings.
Package: libgv-ruby
Architecture: any
