On Fri, Feb 19, 2010 at 11:57:36PM +0100, Rafael Laboissiere wrote:
> * Lucas Nussbaum <lu...@lucas-nussbaum.net> [2009-12-24 11:50]:
> 
> > Source: xmds-doc
> > Version: 0~svn.1884-2
> > Severity: serious
> > User: debian...@lists.debian.org
> > Usertags: qa-ftbfs-20091213 qa-ftbfs
> > Justification: FTBFS on amd64
> > 
> > Hi,
> > 
> > During a rebuild of all packages in sid, your package failed to build on
> > amd64.
> > 
> > Relevant part:
> > > make[1]: Entering directory 
> > > `/build/user-xmds-doc_0~svn.1884-2-amd64-G6zORG/xmds-doc-0~svn.1884/latex'
> > > /usr/bin/make --directory=figures
> > > make[2]: Entering directory 
> > > `/build/user-xmds-doc_0~svn.1884-2-amd64-G6zORG/xmds-doc-0~svn.1884/latex/figures'
> > > epstopdf advectionMatlabPlot.eps
> > > make[2]: epstopdf: Command not found
> > > make[2]: *** [advectionMatlabPlot.pdf] Error 127
> 
> This is caused by the fact that the epstopdf program was moved from the
> texlive-extra-utils into the texlive-font-utils in unstable.  Adding the
> later to Build-Depends-Indep should fix the present bug.
> 
> I am no more a DD, so if a good soul from the Debian Scientific Computing
> Team is lurking this bug report, please fix it.

Unfortunately it is not that simple, xmds_defs.tex needs patching, otherwise
the build fails like in #560759

I added a quilt patch, does the source version have to be updated as well? I
am not yet familiar with the new source formats. Who wants to be an
uploader of this package? And how do I push the changes back to git?

I have attached my diff, the package is building fine, but there are a lot
of "Non-PDF special ignored!" messages, I do not remember if that is to be
expected.

Christian
diff -urN xmds-doc-0~svn.1884/debian/changelog xmds-doc/debian/changelog
--- xmds-doc-0~svn.1884/debian/changelog	2010-02-23 23:49:33.000000000 +0100
+++ xmds-doc/debian/changelog	2010-02-23 23:36:11.000000000 +0100
@@ -1,3 +1,14 @@
+xmds-doc (0~svn.1884-3) unstable; urgency=low
+
+  [Christian T. Steigies]
+  * debian/control:
+    + Add texlive-font-utils to Build-Depends-Indep
+    (closes: #562316)
+    + Bump Standards-Version to 3.8.4 (no changes needed)
+  * Fix multiple definition of \ifpdf in xmds_defs.tex
+
+ -- Christian T. Steigies <c...@debian.org>  Tue, 23 Feb 2010 22:52:00 +0100
+
 xmds-doc (0~svn.1884-2) unstable; urgency=low
 
   [ Daniel Leidert ]
diff -urN xmds-doc-0~svn.1884/debian/control xmds-doc/debian/control
--- xmds-doc-0~svn.1884/debian/control	2010-02-23 23:49:33.000000000 +0100
+++ xmds-doc/debian/control	2010-02-23 23:35:14.000000000 +0100
@@ -2,11 +2,12 @@
 Section: doc
 Priority: extra
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-de...@lists.alioth.debian.org>
-Uploaders: Rafael Laboissiere <raf...@debian.org>
-Build-Depends: debhelper (>= 5), cdbs
+Uploaders: Christian T. Steigies <c...@debian.org>
+Build-Depends: debhelper (>= 5), cdbs, quilt
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra,
- texlive-extra-utils, texlive-fonts-recommended, ghostscript
-Standards-Version: 3.8.1
+ texlive-extra-utils, texlive-fonts-recommended, ghostscript,
+ texlive-font-utils
+Standards-Version: 3.8.4
 Homepage: http://xmds.sourceforge.net/
 Vcs-Git: git://alioth.debian.org/git/pkg-scicomp/xmds-doc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-scicomp/xmds-doc.git
diff -urN xmds-doc-0~svn.1884/debian/patches/ifpdf.patch xmds-doc/debian/patches/ifpdf.patch
--- xmds-doc-0~svn.1884/debian/patches/ifpdf.patch	1970-01-01 01:00:00.000000000 +0100
+++ xmds-doc/debian/patches/ifpdf.patch	2010-02-23 23:42:28.000000000 +0100
@@ -0,0 +1,40 @@
+Index: xmds-doc-0~svn.1884/latex/xmds_defs.tex
+===================================================================
+--- xmds-doc-0~svn.1884.orig/latex/xmds_defs.tex	2010-02-23 23:41:57.000000000 +0100
++++ xmds-doc-0~svn.1884/latex/xmds_defs.tex	2010-02-23 23:42:20.000000000 +0100
+@@ -33,23 +33,22 @@
+ %%%% helps latex2html *not* see the stuff inbetween
+ 
+ % this code hacked from that of R Chandrasekhar from UWA
+-\newif\ifpdf
++\newif\ifmakepdf
+ \ifx\pdfoutput\undefined
+ 	\pdffalse    % we are not running pdfLaTeX
+ \else
+ 	\pdfoutput=1 % we are running pdfLaTeX
+-	\pdftrue
+ \fi
+ 
+ % add the color package
+-\ifpdf
++\ifmakepdf
+ \usepackage[usenames,dvipsnames]{color}
+ \else
+ \usepackage[usenames,dvips]{color}
+ \fi
+ 
+ % add the hyperref package
+-\ifpdf
++\ifmakepdf
+ \usepackage[pdftex]{hyperref}
+ \else
+ \usepackage[hypertex]{hyperref}
+@@ -62,7 +61,7 @@
+ \usepackage{ccaption}
+ \usepackage{fancyhdr}   
+ 
+-\ifpdf
++\ifmakepdf
+ 	\DeclareGraphicsExtensions{.pdf}  % this command defined in graphicx
+ 	\pdfcompresslevel=9  % 0: no compression, 9: highest compression
+ 			     % or, set compress_level 9 in file pdftex.cfg
diff -urN xmds-doc-0~svn.1884/debian/patches/series xmds-doc/debian/patches/series
--- xmds-doc-0~svn.1884/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ xmds-doc/debian/patches/series	2010-02-23 23:43:10.000000000 +0100
@@ -0,0 +1 @@
+ifpdf.patch
diff -urN xmds-doc-0~svn.1884/debian/rules xmds-doc/debian/rules
--- xmds-doc-0~svn.1884/debian/rules	2010-02-23 23:49:33.000000000 +0100
+++ xmds-doc/debian/rules	2010-02-23 23:32:13.000000000 +0100
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_MAKE_CLEAN_TARGET = -C latex realclean
 DEB_MAKE_BUILD_TARGET = -C latex pdf

Reply via email to