[med-svn] r9426 - in trunk/packages/f2j/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-01-24 22:33:19 +0000 (Tue, 24 Jan 2012)
New Revision: 9426

Modified:
   trunk/packages/f2j/trunk/debian/control
   trunk/packages/f2j/trunk/debian/docs
   trunk/packages/f2j/trunk/debian/patches/generate_doc
   trunk/packages/f2j/trunk/debian/rules
Log:
If we really want to rebuild PDF (IMHO ftpmaster only asks for the option to do so) we should do it correctly regarding Build-Depends and restoring original state after cleaning up.
TODO: use dh-autoreconf to build twice in a row; need to test the final use for our Build-Depends for beast-mcmc
Olivier, thanks for your initial work!



Modified: trunk/packages/f2j/trunk/debian/control
===================================================================
--- trunk/packages/f2j/trunk/debian/control	2012-01-24 22:31:52 UTC (rev 9425)
+++ trunk/packages/f2j/trunk/debian/control	2012-01-24 22:33:19 UTC (rev 9426)
@@ -4,7 +4,8 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Olivier Sallou <olivier.sallou at irisa.fr>,
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.0.0), default-jdk, bison, javahelper, texlive-binaries
+Build-Depends:  debhelper (>= 8), default-jdk, bison, javahelper,
+ texlive-latex-base, texlive-latex-extra, texlive-fonts-recommended
 Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/projects/f2j/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/f2j/trunk/

Modified: trunk/packages/f2j/trunk/debian/docs
===================================================================
--- trunk/packages/f2j/trunk/debian/docs	2012-01-24 22:31:52 UTC (rev 9425)
+++ trunk/packages/f2j/trunk/debian/docs	2012-01-24 22:33:19 UTC (rev 9426)
@@ -1 +1 @@
-f2j_ug.pdf
+doc/f2j_ug.pdf

Modified: trunk/packages/f2j/trunk/debian/patches/generate_doc
===================================================================
--- trunk/packages/f2j/trunk/debian/patches/generate_doc	2012-01-24 22:31:52 UTC (rev 9425)
+++ trunk/packages/f2j/trunk/debian/patches/generate_doc	2012-01-24 22:33:19 UTC (rev 9426)
@@ -1,21 +1,42 @@
 Subject: fix document generation
-Author: Olivier Sallou <olivier.sallou at irisa.fr>
+Author: Olivier Sallou <olivier.sallou at irisa.fr>,
+        Andreas Tille <tille at debian.org>
 Description: fix document generation makefile
+ * use pdflatex rather than ps2pdf
+ * make sure original pdf will be kept for restoring original source dir state
 Last-Updated: 24/01/2012
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -1,12 +1,12 @@
- LATEX=latex
+--- f2j-0.8.1.orig/doc/Makefile
++++ f2j-0.8.1/doc/Makefile
+@@ -1,24 +1,18 @@
+-LATEX=latex
++LATEX=pdflatex
  BIBTEX=bibtex
  
--SOURCES = f2j_ug.tex title.tex
-+#SOURCES = f2j_ug.tex title.tex
+ SOURCES = f2j_ug.tex title.tex
  
- f2j_ug.ps: f2j_ug.dvi
+-f2j_ug.ps: f2j_ug.dvi
+-
+-f2j_ug.dvi: $(SOURCES)
++all:
++	if [ ! -e f2j_ug.orig.pdf ] ; then if [ -e f2j_ug.pdf ] ; then mv f2j_ug.pdf f2j_ug.orig.pdf ; else echo "Original file f2j_ug.pdf is missing" ; fi ; fi
+ 	$(LATEX) f2j_ug.tex 
+-#	$(BIBTEX) f2j_ug
+-#	$(LATEX) f2j_ug.tex
+-#	$(LATEX) f2j_ug.tex
+-
+-f2j_ug.ps: f2j_ug.dvi
+-	dvips f2j_ug.dvi -o f2j_ug.ps
+-
+-f2j_ug.pdf: f2j_ug.ps
+-	ps2pdf f2j_ug.ps
++	# $(BIBTEX) f2j_ug
++	# $(LATEX) f2j_ug.tex
++	$(LATEX) f2j_ug.tex
  
- f2j_ug.dvi: $(SOURCES)
--	$(LATEX) f2j_ug.tex 
-+	$(LATEX) doc/f2j_ug.tex
- #	$(BIBTEX) f2j_ug
- #	$(LATEX) f2j_ug.tex
- #	$(LATEX) f2j_ug.tex
+ almost_clean:
+ 	rm -f f2j_ug.dvi f2j_ug.ps *.aux *.log *.out
+ 	
+ clean:
+-	rm -f f2j_ug.dvi f2j_ug.ps f2j_ug.pdf *.aux *.log *.out
++	rm -f f2j_ug.dvi f2j_ug.ps *.aux *.log *.out *.bbl *.blg
++	if [ -e f2j_ug.orig.pdf ] ; then mv f2j_ug.orig.pdf f2j_ug.pdf ; fi

Modified: trunk/packages/f2j/trunk/debian/rules
===================================================================
--- trunk/packages/f2j/trunk/debian/rules	2012-01-24 22:31:52 UTC (rev 9425)
+++ trunk/packages/f2j/trunk/debian/rules	2012-01-24 22:33:19 UTC (rev 9426)
@@ -13,10 +13,10 @@
 	jh_installlibs --package=libf2j-java util/f2jutil.jar
 
 
-override_dh_auto_configure:
-	dh_auto_configure
-	make -f doc/Makefile f2j_ug.pdf
+override_dh_auto_build:
+	dh_auto_build
+	cd doc; make
 
 override_dh_clean:
 	dh_clean
-	make -f doc/Makefile clean
+	cd doc; make clean