[Ubuntu transition to 3.11.1] Specific changes on graphviz

Hello,

Same issue as my previous email, this time regarding graphviz. Ubuntu
applies following patch. Should it be integrated in Debian's version
of the package or keep separated in Ubuntu?

https://patches.ubuntu.com/g/graphviz/graphviz_2.20.2-3ubuntu3.patch

diff -pruN 2.20.2-3/debian/changelog 2.20.2-3ubuntu3/debian/changelog
--- 2.20.2-3/debian/changelog   2009-06-15 13:38:54.000000000 +0100
+++ 2.20.2-3ubuntu3/debian/changelog    2009-06-15 13:20:50.000000000 +0100
@@ -1,3 +1,40 @@
+graphviz (2.20.2-3ubuntu3) karmic; urgency=low
+
+  * No-change rebuild against current OCaml. (LP: #383574)
+
+ -- Martin Pitt <martin.pitt@xxxxxxxxxx>  Mon, 15 Jun 2009 11:16:14 +0200
+
+graphviz (2.20.2-3ubuntu2) jaunty; urgency=low
+
+  * 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
+
+ -- Fabrice Coutadeur <coutadeurf@xxxxxxxxx>  Thu, 26 Mar 2009 04:35:09 +0000
+
+graphviz (2.20.2-3ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian unstable; remaining Ubuntu changes:
+    - Build against guile 1.8 instead of 1.6. (forwarded to Debian #493974)
+    - Fix gs-common build dependency to ghostscript. (forwarded to
+      Debian #504569)
+    - Update build dep libltdl3-dev to libltdl7-dev. (forwarded to
+      Debian #504571)
+  * Build against lua 5.1 instead of 5.0. This drops this Debian delta and
+    moves Ubuntu towards the newer lua version, which we need to do at some
+    point anyway.
+
+ -- Martin Pitt <martin.pitt@xxxxxxxxxx>  Wed, 05 Nov 2008 09:54:54 +0100
+
 graphviz (2.20.2-3) unstable; urgency=high

   * Backport patch to fix a stack overflow in the graph parser, reported
diff -pruN 2.20.2-3/debian/control 2.20.2-3ubuntu3/debian/control
--- 2.20.2-3/debian/control     2009-06-15 13:38:54.000000000 +0100
+++ 2.20.2-3ubuntu3/debian/control      2009-06-15 13:20:50.000000000 +0100
@@ -1,12 +1,14 @@
 Source: graphviz
 Section: graphics
 Priority: optional
-Maintainer: Cyril Brulebois <kibi@xxxxxxxxxx>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@xxxxxxxxxxxxxxxx>
+XSBC-Original-Maintainer: Cyril Brulebois <kibi@xxxxxxxxxx>
 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, libltdl3-dev, swig, libperl-dev, libgd2-noxpm-dev
(>= 2.0.35), quilt (>= 0.40), groff-base, gs-common, 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.6-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
@@ -98,7 +100,7 @@ Description: Python bindings for graphvi
  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
diff -pruN 2.20.2-3/debian/rules 2.20.2-3ubuntu3/debian/rules
--- 2.20.2-3/debian/rules       2009-06-15 13:38:54.000000000 +0100
+++ 2.20.2-3ubuntu3/debian/rules        2009-06-15 13:20:50.000000000 +0100
@@ -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 @@ LUA_PACKAGE       = $(CURDIR)/debian/lib

 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 @@ configure-stamp:
        --enable-lua \
        --enable-ocaml \
        --enable-php \
-       --enable-python24 \
+       --enable-python \
        --enable-python25 \
        --enable-ruby \
        --enable-tcl \
@@ -192,17 +193,18 @@ install: build
        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


Yours,
david


-- 
To UNSUBSCRIBE, email to debian-ocaml-maint-REQUEST@xxxxxxxxxxxxxxxx
with a subject of "unsubscribe". Trouble? Contact listmaster@xxxxxxxxxxxxxxxx