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

[Sébastien Villemot]

Author: sebastien-guest
Date: 2009-03-28 22:05:43 +0000 (Sat, 28 Mar 2009)
New Revision: 2771

Added:
   dynare/trunk/debian/patches/bashisms-in-makefiles
   dynare/trunk/debian/patches/series
Removed:
   dynare/trunk/debian/patches/00list
   dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch
Modified:
   dynare/trunk/debian/control
   dynare/trunk/debian/rules
Log:
Use quilt instead of dpatch


Modified: dynare/trunk/debian/control
===================================================================
--- dynare/trunk/debian/control	2009-03-28 13:32:40 UTC (rev 2770)
+++ dynare/trunk/debian/control	2009-03-28 22:05:43 UTC (rev 2771)
@@ -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, dpatch
+ texlive-publishers, xsltproc, dblatex, latex-beamer, docbook-xsl, quilt
 Standards-Version: 3.8.1
 Homepage: http://www.dynare.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/dynare/trunk

Deleted: dynare/trunk/debian/patches/00list
===================================================================
--- dynare/trunk/debian/patches/00list	2009-03-28 13:32:40 UTC (rev 2770)
+++ dynare/trunk/debian/patches/00list	2009-03-28 22:05:43 UTC (rev 2771)
@@ -1 +0,0 @@
-bashisms-in-makefiles.dpatch

Copied: dynare/trunk/debian/patches/bashisms-in-makefiles (from rev 2768, dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch)
===================================================================
--- dynare/trunk/debian/patches/bashisms-in-makefiles	                        (rev 0)
+++ dynare/trunk/debian/patches/bashisms-in-makefiles	2009-03-28 22:05:43 UTC (rev 2771)
@@ -0,0 +1,34 @@
+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 *~

Deleted: dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch
===================================================================
--- dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch	2009-03-28 13:32:40 UTC (rev 2770)
+++ dynare/trunk/debian/patches/bashisms-in-makefiles.dpatch	2009-03-28 22:05:43 UTC (rev 2771)
@@ -1,41 +0,0 @@
-#! /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 *~

Copied: dynare/trunk/debian/patches/series (from rev 2768, dynare/trunk/debian/patches/00list)
===================================================================
--- dynare/trunk/debian/patches/series	                        (rev 0)
+++ dynare/trunk/debian/patches/series	2009-03-28 22:05:43 UTC (rev 2771)
@@ -0,0 +1 @@
+bashisms-in-makefiles

Modified: dynare/trunk/debian/rules
===================================================================
--- dynare/trunk/debian/rules	2009-03-28 13:32:40 UTC (rev 2770)
+++ dynare/trunk/debian/rules	2009-03-28 22:05:43 UTC (rev 2771)
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: patch
 	dh_testdir
 
 	# Building preprocessor