tags 528152 + patch pending
thanks

Dear maintainer,

I've prepared an NMU for tulip (versioned as 3.1.2-2.1) and uploaded it
to DELAYED/4, according to devref §5.11.1. The patch is those posted by
James Westby to this bug log some months ago, you can find it attached.

Cheers.

-- 
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
z...@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..|  .  |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime
diff -u tulip-3.1.2/docs/doxygen/Makefile.am tulip-3.1.2/docs/doxygen/Makefile.am
--- tulip-3.1.2/docs/doxygen/Makefile.am
+++ tulip-3.1.2/docs/doxygen/Makefile.am
@@ -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:
diff -u tulip-3.1.2/debian/changelog tulip-3.1.2/debian/changelog
--- tulip-3.1.2/debian/changelog
+++ tulip-3.1.2/debian/changelog
@@ -1,3 +1,14 @@
+tulip (3.1.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use ttf-dejavu instead of ttf-bitstream-vera (now gone), patch from
+    James Westby (Closes: #528152)
+  * Add build-dep on texlive-extra-utils for epstopdf
+  * Use local docbook-xsl catalog for saxon instead of relying on network
+    access, patch from James Westby
+
+ -- Stefano Zacchiroli <z...@debian.org>  Mon, 23 Nov 2009 17:26:36 +0100
+
 tulip (3.1.2-2) unstable; urgency=low
 
   * Fixed install target to cope with arch-dep-only builds (Closes:
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
@@ -2,14 +2,14 @@
 Section: graphics
 Priority: optional
 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
+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, 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
@@ -84,8 +84,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
 

Reply via email to