From 52ae4284b4b980aef79a9bf051b6dc966e8afe2f Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Fri, 29 Aug 2008 14:39:23 +0000
Subject: [PATCH] trying to get ubuntu to build

---
 debian/changelog | 21 +++++++++++++++++++++
 debian/rules     | 39 +++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13d48852b..3ccd73783 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+graphviz (2.21.0) hardy; 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
+   
+  * 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
+
 graphviz (2.18-1ubuntu2) intrepid; urgency=low
 
   * Build against the newer guile 1.8 instead of the older 1.6.
diff --git a/debian/rules b/debian/rules
index cc67c2c03..b0cacc4d6 100644
--- a/debian/rules
+++ b/debian/rules
@@ -52,21 +52,26 @@ configure-stamp:
 	--disable-static \
 	--with-pangocairo \
 	--with-x \
-	--without-gdk-pixbuf \
+	--with-gdk-pixbuf \
 	--without-gnomeui \
 	--without-gtk \
-	--without-ipsepcola \
-	--without-rsvg \
+	--with-ipsepcola \
+	--with-rsvg \
+	--with-devil \
+	--disable-sharp \
 	--enable-guile \
+	--disable-java \
+	--disable-io \
 	--enable-lua \
 	--enable-ocaml \
 	--enable-php \
-	--enable-python24 \
+	--disable-python \
+	--disable-python23 \
+	--disable-python24 \
 	--enable-python25 \
+	--disable-r \
 	--enable-ruby \
 	--enable-tcl \
-	--disable-java \
-	--disable-sharp \
 	LDFLAGS="-Wl,--as-needed"
 	touch configure-stamp
 
@@ -120,25 +125,15 @@ install: build
 	install -m 644 $(CURDIR)/debian/libgraphviz$(SONAME).lintian-overrides \
 		$(CURDIR)/debian/tmp/usr/share/lintian/overrides/libgraphviz$(SONAME)
 
-	# Rename manpages: s/.n$/.3/
-	for i in $(CURDIR)/debian/tmp/usr/share/man/mann/*.n ; do \
-		mv $$i $${i%%.n}.3; \
-	done
-
-	# Move manpages
-	install -d $(CURDIR)/debian/tmp/usr/share/man/man3
-	find $(CURDIR)/debian/tmp/usr/share/man/mann -name '*.3' \
-		-exec mv {} $(CURDIR)/debian/tmp/usr/share/man/man3 ';'
-
 	# Compute the dependencies of the -dev package
 	# NOTE: It is important to do that before splitting the files into
 	# their respective packages, otherwise the symlinks are broken
-	d-devlibdeps \
-		--override s/libpathplan$(SONAME)-dev// \
-		--override s/libgraph$(SONAME)-dev//    \
-		--override s/libcdt$(SONAME)-dev//      \
-		$(CURDIR)/debian/libgraphviz-dev.substvars \
-		$(CURDIR)/debian/tmp/usr/lib/*.so
+#	d-devlibdeps \
+#		--override s/libpathplan$(SONAME)-dev// \
+#		--override s/libgraph$(SONAME)-dev//    \
+#		--override s/libcdt$(SONAME)-dev//      \
+#		$(CURDIR)/debian/libgraphviz-dev.substvars \
+#		$(CURDIR)/debian/tmp/usr/lib/*.so
 
 	# Move from debian/tmp to the appropriate packages, rename one binary
 	dh_install --sourcedir=debian/tmp --list-missing
-- 
2.40.0