Cyril, On Wed, 2008-12-10 at 15:42 +0100, Cyril Brulebois wrote: > Stephan Suerken <absurd@debian.org> (10/12/2008): > > - graphviz: Needed for proper dot/png support for doxygen. > > If you have a patch stack for this one, I'd be interested in receiving I disabled libgv-python and libgv-php5 because they don't compile under etch; if you are referring to patches to make them work, I have none, unfortunately. However, for convenience I attached the patch to make the current testing version build under etch, omitting these packages, if that is any help. MfG, Stephan -- Stephan Sürken <absurd at debian.org>
diff -r -u debian-2.20.2-3/changelog graphviz-2.20.2/debian/changelog
--- debian-2.20.2-3/changelog 2008-12-10 14:07:12.000000000 +0100
+++ graphviz-2.20.2/debian/changelog 2008-12-10 14:46:34.000000000 +0100
@@ -1,3 +1,15 @@
+graphviz (2.20.2-3~ab40+0exp1) etch-ab-experimental; urgency=low
+
+ * Backport for etch
+ * control: etch: downgrade to tcl/tk 8.4 [etch].
+ * Build-dep: Downgrade to libgd2-noxpm-dev (>= 2.0.33) [etch].
+ * rules/control: Disable libgv-python && --enable-python25 configure
+ option [build problems].
+ * rules/control: Disable libgv-php5 [swig in etch].
+ * MINI_BUILDD: BACKPORT_MODE
+
+ -- Stephan Suerken <absurd@debian.org> Wed, 10 Dec 2008 14:46:34 +0100
+
graphviz (2.20.2-3) unstable; urgency=high
* Backport patch to fix a stack overflow in the graph parser, reported
diff -r -u debian-2.20.2-3/control graphviz-2.20.2/debian/control
--- debian-2.20.2-3/control 2008-12-10 14:07:12.000000000 +0100
+++ graphviz-2.20.2/debian/control 2008-12-10 14:13:16.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Cyril Brulebois <kibi@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, 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.4-dev, tcl8.4-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.33), 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
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/
@@ -80,26 +80,6 @@
.
This package contains the Perl bindings.
-Package: libgv-php5
-Architecture: any
-Section: interpreters
-Depends: ${shlibs:Depends}
-Description: Php5 bindings for graphviz
- Graphviz is a set of graph drawing tools. See the description of the graphviz
- package for a full description.
- .
- This package contains the Php5 bindings.
-
-Package: libgv-python
-Architecture: any
-Section: python
-Depends: ${shlibs:Depends}, ${python:Depends}
-Description: Python bindings for graphviz
- 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.
-
Package: libgv-ruby
Architecture: any
Section: interpreters
@@ -110,7 +90,6 @@
.
This package contains the Ruby (1.8) bindings.
-
Package: libgv-tcl
Architecture: any
Section: interpreters
@@ -120,7 +99,7 @@
Graphviz is a set of graph drawing tools. See the description of the graphviz
package for a full description.
.
- This package contains the Tcl (8.5) bindings.
+ This package contains the Tcl (8.4) bindings.
Package: libgraphviz4
Architecture: any
diff -r -u debian-2.20.2-3/rules graphviz-2.20.2/debian/rules
--- debian-2.20.2-3/rules 2008-12-10 14:07:12.000000000 +0100
+++ graphviz-2.20.2/debian/rules 2008-12-10 14:46:05.000000000 +0100
@@ -63,7 +63,6 @@
--enable-ocaml \
--enable-php \
--enable-python24 \
- --enable-python25 \
--enable-ruby \
--enable-tcl \
--disable-java \
@@ -161,15 +160,6 @@
mv $(CURDIR)/debian/libgraphviz$(SONAME)/usr/sbin/dot \
$(CURDIR)/debian/libgraphviz$(SONAME)/usr/sbin/libgraphviz$(SONAME)-config-update
- # Some additional work for libgv-php5
- install -d $(PHP_PACKAGE)/$(PHP_EXTENSION_DIR)
- mv $(PHP_PACKAGE)/usr/lib/graphviz/php/libgv_php.so \
- $(PHP_PACKAGE)/$(PHP_EXTENSION_DIR)/gv.so
- install -d $(PHP_PACKAGE)/usr/share/php/libgv-php5
- mv $(PHP_PACKAGE)/usr/lib/graphviz/php/gv.php \
- $(PHP_PACKAGE)/usr/share/php/libgv-php5
- rm -rf $(PHP_PACKAGE)/usr/lib/graphviz
-
# Some additional work for libgv-lua
# 1. Rename using the LUA_VERSION
mv $(LUA_PACKAGE)/usr/lib/graphviz/lua/libgv_lua.so \
@@ -191,20 +181,6 @@
# 3. Trash the (almost empty) directory (and its .la)
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
- rm -rf $(PYTHON_PACKAGE)/usr/lib/graphviz
-
# Debian-specific manpage
dh_installman -plibgraphviz$(SONAME) \
$(CURDIR)/debian/libgraphviz$(SONAME)-config-update.1
Attachment:
signature.asc
Description: This is a digitally signed message part