[Pkg-octave-commit] r2768 - in dynare/trunk/debian: . patches

[Sébastien Villemot]

Author: sebastien-guest
Date: 2009-03-28 10:33:40 +0000 (Sat, 28 Mar 2009)
New Revision: 2768

Added:
   dynare/trunk/debian/patches/
   dynare/trunk/debian/patches/00list
   dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch
Modified:
   dynare/trunk/debian/control
   dynare/trunk/debian/rules
Log:
Added patch which fixes bashisms in Makefiles


Modified: dynare/trunk/debian/control
===================================================================
--- dynare/trunk/debian/control	2009-03-28 08:45:30 UTC (rev 2767)
+++ dynare/trunk/debian/control	2009-03-28 10:33:40 UTC (rev 2768)
@@ -6,7 +6,7 @@
 Section: math
 Priority: optional
 Build-Depends: debhelper (>= 7), octave3.0-headers, flex, bison, texlive,
- texlive-publishers, xsltproc, dblatex, latex-beamer, docbook-xsl
+ texlive-publishers, xsltproc, dblatex, latex-beamer, docbook-xsl, dpatch
 Standards-Version: 3.8.1
 Homepage: http://www.dynare.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/dynare/trunk

Added: dynare/trunk/debian/patches/00list
===================================================================
--- dynare/trunk/debian/patches/00list	                        (rev 0)
+++ dynare/trunk/debian/patches/00list	2009-03-28 10:33:40 UTC (rev 2768)
@@ -0,0 +1 @@
+bashisms-in-makefiles.dpatch

Added: dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch
===================================================================
--- dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch	                        (rev 0)
+++ dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch	2009-03-28 10:33:40 UTC (rev 2768)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bashisms-in-makefiles.dpatch by Sébastien Villemot <sebastien.villemot at ens.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes bashims in documentation Makefiles
+
+ at DPATCH@
+diff -urNad dynare-4.0.3~/doc/Makefile dynare-4.0.3/doc/Makefile
+--- dynare-4.0.3~/doc/Makefile	2009-03-25 22:13:29.000000000 +0100
++++ dynare-4.0.3/doc/Makefile	2009-03-27 23:32:14.000000000 +0100
+@@ -19,10 +19,8 @@
+ 	dblatex manual.xml
+ 
+ clean:
+-	rm -f *~
+-	rm -f guide.{pdf,log,aux}
+-	rm -f bvar-a-la-sims.{pdf,log,aux}
+-	rm -rf manual.pdf manual-html
++	rm -f *~ *.pdf *.log *.aux
++	rm -rf manual-html
+ 	make -C preprocessor clean
+ 	make -C macroprocessor clean
+ 	make -C userguide clean
+diff -urNad dynare-4.0.3~/doc/macroprocessor/Makefile dynare-4.0.3/doc/macroprocessor/Makefile
+--- dynare-4.0.3~/doc/macroprocessor/Makefile	2009-03-25 22:13:21.000000000 +0100
++++ dynare-4.0.3/doc/macroprocessor/Makefile	2009-03-27 23:32:28.000000000 +0100
+@@ -3,4 +3,4 @@
+ 	pdflatex macroprocessor
+ 
+ clean:
+-	rm -f macroprocessor.{pdf,toc,aux,log,nav,snm,vrb,out} *~
++	rm -f macroprocessor.pdf *.toc *.aux *.log *.nav *.snm *.vrb *.out *~
+diff -urNad dynare-4.0.3~/doc/preprocessor/Makefile dynare-4.0.3/doc/preprocessor/Makefile
+--- dynare-4.0.3~/doc/preprocessor/Makefile	2009-03-25 22:13:24.000000000 +0100
++++ dynare-4.0.3/doc/preprocessor/Makefile	2009-03-27 23:32:21.000000000 +0100
+@@ -3,4 +3,4 @@
+ 	pdflatex preprocessor
+ 
+ clean:
+-	rm -f preprocessor.{pdf,toc,aux,log,nav,snm,vrb,out} *~
++	rm -f *.pdf *.toc *.aux *.log *.nav *.snm *.vrb *.out *~


Property changes on: dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: dynare/trunk/debian/rules
===================================================================
--- dynare/trunk/debian/rules	2009-03-28 08:45:30 UTC (rev 2767)
+++ dynare/trunk/debian/rules	2009-03-28 10:33:40 UTC (rev 2768)
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpatch/dpatch.make
+
 build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
 	dh_testdir
 
 	# Building preprocessor
@@ -15,7 +17,11 @@
 
 	touch build-stamp
 
-clean:
+# Call unpatch after main cleanups (since patch fixes clean rules in Makefiles!)
+clean: clean1 unpatch
+	dh_clean
+
+clean1:
 	dh_testdir
 	dh_testroot
 	make clean -C preprocessor
@@ -23,7 +29,7 @@
 	find mex/sources -name *.o | xargs rm -f
 	rm -f mex/octave/*.mex
 	rm -f matlab/dynare_m
-	dh_clean
+.PHONY: clean1
 
 binary-arch: build
 	dh binary-arch