[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. 67480e88c0de1c23c53fe26f699fb9594c377705

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit e0eba38d38ef632aff2c5126fe50b8c58d0f74b1
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed Oct 5 16:56:22 2011 +0200

    debian/patches/{doc-cleanup,gcc-4.6}: remove, applied upstream

diff --git a/debian/patches/doc-cleanup b/debian/patches/doc-cleanup
deleted file mode 100644
index 183c5cd..0000000
--- a/debian/patches/doc-cleanup
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix problems with cleanup of documentation files
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -39,4 +39,4 @@
- 	$(PDFLATEX) dr
- 
- clean-local:
--	rm -f *~ *.pdf *.log *.aux *.out
-+	rm -f *~ *.pdf *.log *.aux *.out *.blg dr.bbl
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -884,7 +884,7 @@
- 	$(PDFLATEX) dr
- 
- clean-local:
--	rm -f *~ *.pdf *.log *.aux *.out
-+	rm -f *~ *.pdf *.log *.aux *.out *.blg dr.bbl
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/debian/patches/gcc-4.6 b/debian/patches/gcc-4.6
deleted file mode 100644
index ccbfcf4..0000000
--- a/debian/patches/gcc-4.6
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix compilation problems with GCC 4.6 (from upstream commit
-d93e36de3551da2ad51bf257f3bcd6ae7e65b5ce)--- a/mex/sources/dynblas.h
-+++ b/mex/sources/dynblas.h
-@@ -32,9 +32,9 @@
- /* Starting from version 7.8, MATLAB BLAS expects ptrdiff_t arguments for integers */
- #if defined(MATLAB_MEX_FILE) && MATLAB_VERSION >= 0x0708
- # ifdef __cplusplus
--#  include <cstdlib>
-+#  include <cstddef>
- # else
--#  include <stdlib.h>
-+#  include <stddef.h>
- # endif
- typedef ptrdiff_t blas_int;
- #else
---- a/mex/sources/dynlapack.h
-+++ b/mex/sources/dynlapack.h
-@@ -32,9 +32,9 @@
- /* Starting from version 7.8, MATLAB LAPACK expects ptrdiff_t arguments for integers */
- #if defined(MATLAB_MEX_FILE) && MATLAB_VERSION >= 0x0708
- # ifdef __cplusplus
--#  include <cstdlib>
-+#  include <cstddef>
- # else
--#  include <stdlib.h>
-+#  include <stddef.h>
- # endif
- typedef ptrdiff_t lapack_int;
- #else
diff --git a/debian/patches/series b/debian/patches/series
index 3a02d23..944e12e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 extra-addpath
 fhs-compliance
-doc-cleanup
-gcc-4.6

-- 
Debian packaging for dynare