[Pkg-octave-commit] [SCM] Debian packaging for octave-image branch, experimental, updated. debian/1.0.15-1-18-g48082f5

[Sébastien Villemot]

The following commit has been merged in the experimental branch:
commit 70a319b07faa6539a0b6014266966ac4f60efa51
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Nov 12 14:46:24 2012 +0100

    use-dpkg-buildflags.patch: New patch

diff --git a/debian/patches/series b/debian/patches/series
index a984fc0..c4b82bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 autoload-yes.patch
 fftconv2-usage.patch
 use-imerode-and-imdilate.patch
+use-dpkg-buildflags.patch
diff --git a/debian/patches/use-dpkg-buildflags.patch b/debian/patches/use-dpkg-buildflags.patch
new file mode 100644
index 0000000..01729d7
--- /dev/null
+++ b/debian/patches/use-dpkg-buildflags.patch
@@ -0,0 +1,18 @@
+Description: Enforce dpkg build flags
+ The right build flags are stored in mkoctfile, so reuse them.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2012-11-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -8,7 +8,7 @@
+ 	$(MKOCTFILE) $<
+ 
+ bwlabeln.oct: bwlabeln.cc union-find.h++
+-	CXXFLAGS='-g -O2 -std=c++0x -Wall' $(MKOCTFILE) $<
++	CXXFLAGS='$(shell mkoctfile -p CXXFLAGS) -std=c++0x -Wall' $(MKOCTFILE) $<
+ 
+ clean:
+ 	rm -f *.o octave-core core *.oct *~

-- 
Debian packaging for octave-image