Package: tulip
Version: 3.1.2-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu karmic ubuntu-patch

Hi,

I've written the attached patch to remove the depenency. It switches
the dependency to ttf-dejavu, and changes the symlinks to point to
its fonts instead.

There's a bonus couple of fixes here as well. The build repeatedly tries
to call epstopdf, so I added a Build-Depends on texlive-extra-utils. It
also downloads from the web when trying to access xsl, so I added a
patch to use the catalog from docbook-xsl instead.

Thanks,

James
diff -u tulip-3.1.2/debian/changelog tulip-3.1.2/debian/changelog
diff -u tulip-3.1.2/debian/control tulip-3.1.2/debian/control
--- tulip-3.1.2/debian/control
+++ tulip-3.1.2/debian/control
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-m...@lists.ubuntu.com>
 XSBC-Original-Maintainer: Yann Dirson <dir...@debian.org>
-Build-Depends: debhelper (>> 5), libqt4-dev, qt4-dev-tools, freeglut3-dev, docbook-to-man, libgl1-mesa-swx11-dev, sharutils, dh-buildinfo, libfreetype6-dev, libxml2-dev, libgle3-dev, libxml2-utils, graphviz, libjpeg62-dev, libpng12-dev, doxygen, libftgl-dev, libosmesa6-dev, libglew1.5-dev, libqt4-opengl-dev, dpatch
+Build-Depends: debhelper (>> 5), libqt4-dev, qt4-dev-tools, freeglut3-dev, docbook-to-man, libgl1-mesa-swx11-dev, sharutils, dh-buildinfo, libfreetype6-dev, libxml2-dev, libgle3-dev, libxml2-utils, graphviz, libjpeg62-dev, libpng12-dev, doxygen, libftgl-dev, libosmesa6-dev, libglew1.5-dev, libqt4-opengl-dev, dpatch, docbook-xsl, texlive-extra-utils
 Build-Depends-Indep: default-jre-headless
 Homepage: http://tulip-software.org/
 Standards-Version: 3.8.1
 
 Package: tulip
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-bitstream-vera
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu-core
 Suggests: tulip-doc
 Description: A system dedicated to the visualization of huge graphs
  Tulip is capable of managing graphs with up to 500,000 nodes and edges
diff -u tulip-3.1.2/debian/rules tulip-3.1.2/debian/rules
--- tulip-3.1.2/debian/rules
+++ tulip-3.1.2/debian/rules
@@ -86,8 +86,8 @@
 	fi
 
 	cd $(tmpdir)/usr/lib/tlp/bitmaps && \
-		ln -sf /usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf font.ttf && \
-		ln -sf /usr/share/fonts/truetype/ttf-bitstream-vera/VeraBd.ttf fontb.ttf
+		ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf font.ttf && \
+		ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf fontb.ttf
 
 	dh_movefiles
 
--- tulip-3.1.2.orig/debian/patches/11-use-docbook-xsl-catalog.dpatch
+++ tulip-3.1.2/debian/patches/11-use-docbook-xsl-catalog.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11-use-docbook-xsl-catalog.dpatch by  <james.wes...@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use the docbook-xsl catalog file so that saxon doesn't try and
+## DP: download files from the net at build time
+
+...@dpatch@
+diff -urNad tulip-3.1.2~/docs/doxygen/Makefile.am tulip-3.1.2/docs/doxygen/Makefile.am
+--- tulip-3.1.2~/docs/doxygen/Makefile.am	2009-08-18 10:42:21.000000000 +0100
++++ tulip-3.1.2/docs/doxygen/Makefile.am	2009-08-18 12:31:34.000000000 +0100
+@@ -100,6 +100,7 @@
+ 	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
+ 	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
+ 	-r org.apache.xml.resolver.tools.CatalogResolver \
++	-Dxml.catalog.files=/usr/share/xml/docbook/stylesheet/docbook-xsl/catalog.xml \
+ 	-o $@ tulip-plugins.tag  $(srcdir)/dox-profile.xsl
+ 
+ tulipPlugins.html: ../common/CatalogManager.properties dox-plugins.xsl tulip-plugins.tag
+@@ -108,6 +109,7 @@
+ 	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
+ 	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
+ 	-r org.apache.xml.resolver.tools.CatalogResolver \
++	-Dxml.catalog.files=/usr/share/xml/docbook/stylesheet/docbook-xsl/catalog.xml \
+ 	-o $@ tulip-plugins.tag  $(srcdir)/dox-plugins.xsl
+ 
+ allPlugins.html: ../common/CatalogManager.properties dox-html.xsl tulip-plugins.tag
+@@ -116,6 +118,7 @@
+ 	-x org.apache.xml.resolver.tools.ResolvingXMLReader \
+ 	-y org.apache.xml.resolver.tools.ResolvingXMLReader \
+ 	-r org.apache.xml.resolver.tools.CatalogResolver \
++	-Dxml.catalog.files=/usr/share/xml/docbook/stylesheet/docbook-xsl/catalog.xml \
+ 	-o $@ tulip-plugins.tag $(srcdir)/dox-html.xsl
+ 
+ clean:

Reply via email to