[Pkg-octave-commit] [SCM] dynare branch, master, updated. b78f627d1f9593d7b6b9c183aaf82ece738558ee

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 1f535d5ea70b4fbffaa72d86e8432450e9eef7a8
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue Jun 23 10:06:08 2009 +0200

    Removed bashisms-in-makefiles patch (incoporated upstream) + fixed clean rule in debian/rules accordingly

diff --git a/debian/changelog b/debian/changelog
index 6e8c7a3..0b81b0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dynare (4.0.4-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release:
+    + debian/patches/bashisms-in-makefiles:
+      - Dropped, incorporated upstream.
 
  -- Sébastien Villemot <sebastien.villemot at ens.fr>  Tue, 23 Jun 2009 09:52:56 +0200
 
diff --git a/debian/patches/bashisms-in-makefiles b/debian/patches/bashisms-in-makefiles
deleted file mode 100644
index 67224fd..0000000
--- a/debian/patches/bashisms-in-makefiles
+++ /dev/null
@@ -1,32 +0,0 @@
-Fixes bashishms in Makefiles
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -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
---- a/doc/macroprocessor/Makefile
-+++ b/doc/macroprocessor/Makefile
-@@ -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 *~
---- a/doc/preprocessor/Makefile
-+++ b/doc/preprocessor/Makefile
-@@ -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 *~
diff --git a/debian/patches/series b/debian/patches/series
index d76d1fd..b56588b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 extra-addpath
 fhs-compliance
-bashisms-in-makefiles
 table-name-clash
 rows-name-clash
 build-matlab
diff --git a/debian/rules b/debian/rules
index 7293852..b208ce9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,19 +18,15 @@ build-stamp:
 
 	touch build-stamp
 
-# Call unpatch after main cleanups (since patch fixes clean rules in Makefiles!)
-clean: clean1 unpatch
-	dh_clean
-
-clean1:
+clean: unpatch
 	dh_testdir
-	dh_testroot
 	make clean -C preprocessor
 	make clean -C doc
+	make clean -C tests
 	find mex/sources -name *.o | xargs rm -f
 	rm -f mex/octave/*.mex
 	rm -f matlab/dynare_m
-.PHONY: clean1
+	dh_clean
 
 binary-arch: build
 	dh binary-arch

-- 
dynare