ubuntu fixes

diff --git a/debian/changelog b/debian/changelog
index 3ccd73783a1fda703a6cb1d500d40a6313f56a2b..e9f0cbcd6e53ab3d656c8b9e0ed7b44a5d54f940 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,23 @@
-graphviz (2.21.0) hardy; urgency=low
+graphviz (2.21.0-1) intrepid; urgency=low
 
   * Adapted for upstream nightly builds by applying graphviz_2.18-1ubuntu2.diff.gz
     to CVS sources and adding the debian/ subtree to CVS.
 
   * Removed all debian/patches/[0123]* and emptied debian/patches/series
     since upstream should never need patches.
-       - 0_tcl_manpages_section : applied upstream
-       - 0_autoreconf_run : not needed
-       - 1_disable_lumping_all_include_directories : applied upstream
-       - 0_libtool_linking_reorder_workaround : not needed - previously disabled
-       - 0_bindings_documentation : applied upstream
-       - 0_versioned_plugin_config_file : applied upstream
+       - 0_tcl_manpages_section - applied upstream
+       - 0_autoreconf_run - not needed
+       - 1_disable_lumping_all_include_directories - applied upstream
+       - 0_libtool_linking_reorder_workaround - not needed - previously disabled
+       - 0_bindings_documentation - applied upstream
+       - 0_versioned_plugin_config_file - applied upstream
    
   * Enabled "--with-rsvg" to provide support for node images in svg format.
   * Enabled "--with-devil" to provide support for additional output formats.
   * Enabled "--with-gdk-pixbuf" to provide support for additional output formats.
   * Enabled "--with-ipsepcola" (was only disabled because of concern about C++ portability)
 
- -- John Ellson <ellson@research.att.com> Fri, 29 Aug 2008 09:55:33 -0400
+ -- John Ellson <ellson@research.att.com>  Fri, 29 Aug 2008 09:55:33 -0400
 
 graphviz (2.18-1ubuntu2) intrepid; urgency=low
 

diff --git a/debian/control.in b/debian/control.in
index 17e2407fecdfc85dd7d95ffa5cd8fb47dc043c50..d24009a0e9d6cc8eb0d7e312e761638f81a4caa0 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,6 @@ Source: graphviz
 Section: graphics
 Priority: optional
 Maintainer: John Ellson <ellson@graphviz.org>
-XSBC-Original-Maintainer: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
 Standards-Version: @VERSION@
 Build-Depends: 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, ghostscript, liblualib50-dev, ruby, ruby1.8-dev, php5-dev, php5-cli, ocaml-nox, python-dev, python-minimal, libcairo2-dev, libpango1.0-dev, guile-1.8-dev, d-shlibs, python-support, librsvg2-dev, libgdk-pixbuf-dev, libdevil-dev
 Homepage: http://www.graphviz.org/

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 7c13f1381ca60e85d2bc93ae73a44332fe326b11..28558e1533d0021526d935f35818da12ecebb25e 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -54,7 +54,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \
        $(top_builddir)/lib/cdt/libcdt.la \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
-       @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
+       @GTS_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
 
 #For use without plugins.
 #  so it needs to be linked with a preset table of builtins, e.g. dot_builtins.c,