[Pkg-octave-commit] r2974 - dynare/trunk/debian/patches

[Sébastien Villemot]

Author: sebastien-guest
Date: 2009-04-24 15:02:49 +0000 (Fri, 24 Apr 2009)
New Revision: 2974

Modified:
   dynare/trunk/debian/patches/bashisms-in-makefiles
   dynare/trunk/debian/patches/extra-addpath
   dynare/trunk/debian/patches/fhs-compliance
   dynare/trunk/debian/patches/series
Log:
Add headers to patches

Modified: dynare/trunk/debian/patches/bashisms-in-makefiles
===================================================================
--- dynare/trunk/debian/patches/bashisms-in-makefiles	2009-04-24 14:57:28 UTC (rev 2973)
+++ dynare/trunk/debian/patches/bashisms-in-makefiles	2009-04-24 15:02:49 UTC (rev 2974)
@@ -1,6 +1,6 @@
-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
+Fixes bashishms in Makefiles
+--- a/doc/Makefile
++++ b/doc/Makefile
 @@ -19,10 +19,8 @@
  	dblatex manual.xml
  
@@ -14,18 +14,16 @@
  	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
+--- 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 *~
-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
+--- a/doc/preprocessor/Makefile
++++ b/doc/preprocessor/Makefile
 @@ -3,4 +3,4 @@
  	pdflatex preprocessor
  

Modified: dynare/trunk/debian/patches/extra-addpath
===================================================================
--- dynare/trunk/debian/patches/extra-addpath	2009-04-24 14:57:28 UTC (rev 2973)
+++ dynare/trunk/debian/patches/extra-addpath	2009-04-24 15:02:49 UTC (rev 2974)
@@ -1,3 +1,4 @@
+Add an extra addpath at the top of dynare.m so that the symlink in /usr/share/octave/site/api-???/m works
 --- a/matlab/dynare.m
 +++ b/matlab/dynare.m
 @@ -33,6 +33,8 @@

Modified: dynare/trunk/debian/patches/fhs-compliance
===================================================================
--- dynare/trunk/debian/patches/fhs-compliance	2009-04-24 14:57:28 UTC (rev 2973)
+++ dynare/trunk/debian/patches/fhs-compliance	2009-04-24 15:02:49 UTC (rev 2974)
@@ -1,7 +1,6 @@
-Index: dynare-4.0.3/matlab/dynare_config.m
-===================================================================
---- dynare-4.0.3.orig/matlab/dynare_config.m	2009-04-02 11:49:49.000000000 +0200
-+++ dynare-4.0.3/matlab/dynare_config.m	2009-04-02 11:49:54.000000000 +0200
+Hardcode paths in dynare_config.m, reflecting the FHS compliance of the package
+--- a/matlab/dynare_config.m
++++ b/matlab/dynare_config.m
 @@ -35,16 +35,17 @@
  if nargin
      addpath(path_to_dynare);

Modified: dynare/trunk/debian/patches/series
===================================================================
--- dynare/trunk/debian/patches/series	2009-04-24 14:57:28 UTC (rev 2973)
+++ dynare/trunk/debian/patches/series	2009-04-24 15:02:49 UTC (rev 2974)
@@ -1,5 +1,5 @@
-extra-addpath # Add an extra addpath at the top of dynare.m for making the $(MDIR) symlink work
-fhs-compliance # Modifies dynare_config.m to reflect FHS compliance of the package
+extra-addpath
+fhs-compliance
 bashisms-in-makefiles
 table-name-clash
 rows-name-clash