[Pkg-octave-commit] [SCM] Debian packaging for mwrap branch, master, updated. upstream/0.33-33-g217bf7f

[Nicolas Bourdaud]

The following commit has been merged in the master branch:
commit 9cfb67fd144399edf85960e2715a4e8d39397edd
Author: Nicolas Bourdaud <nicolas.bourdaud at gmail.com>
Date:   Mon May 28 16:19:00 2012 +0200

    Install examples
    
    Create examples-makefiles.patch in order to make examples Makefile useable
    outside of the source package. Don't install fem example since it depends on
    software not available in Debian.

diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..0f2a3b8
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1,6 @@
+example/README
+example/Makefile
+example/eventq
+example/eventq2
+example/foobar
+example/zlib
diff --git a/debian/patches/examples-makefiles.patch b/debian/patches/examples-makefiles.patch
new file mode 100644
index 0000000..74ba0d9
--- /dev/null
+++ b/debian/patches/examples-makefiles.patch
@@ -0,0 +1,71 @@
+Description: Make examples Makefile installable
+ This patch modifies the Makefile in examples in order to avoid them to rely
+ on the source package hierachy, thus making them usable in examples in the
+ binary package.
+Author: Nicolas Bourdaud <nicolas.bourdaud at gmail.com>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2012-05-28
+--- a/example/Makefile
++++ b/example/Makefile
+@@ -3,11 +3,9 @@
+ 	(cd eventq; make)
+ 	(cd eventq2; make)
+ 	(cd zlib; make)
+-	(cd fem; make)
+ 
+ clean:
+ 	(cd foobar; make clean)
+ 	(cd eventq; make clean)
+ 	(cd eventq2; make clean)
+ 	(cd zlib; make clean)
+-	(cd fem; make clean)
+--- a/example/eventq/Makefile
++++ b/example/eventq/Makefile
+@@ -1,5 +1,5 @@
+-include ../../make.inc
+-MW=../../mwrap
++MEX ?= mkoctfile --mex
++MW = mwrap
+ 
+ all: pmex cmex hmex
+ 
+--- a/example/eventq2/Makefile
++++ b/example/eventq2/Makefile
+@@ -1,5 +1,5 @@
+-include ../../make.inc
+-MW=../../mwrap
++MEX ?= mkoctfile --mex
++MW = mwrap
+ 
+ mex:
+ 	$(MW) -mex eventq2mex -c eventq2mex.cc -mb eventq2.mw
+--- a/example/foobar/Makefile
++++ b/example/foobar/Makefile
+@@ -1,5 +1,5 @@
+-include ../../make.inc
+-MW=../../mwrap
++MEX ?= mkoctfile --mex
++MW = mwrap
+ 
+ all:
+ 	$(MW) -mex fbmex -m foobar.m foobar.mw
+--- a/example/zlib/Makefile
++++ b/example/zlib/Makefile
+@@ -1,6 +1,6 @@
+ # See www.zlib.net
+-include ../../make.inc
+-MW=../../mwrap
++MEX ?= mkoctfile --mex
++MW = mwrap
+ 
+ gzmex:
+ 	$(MW) -mex gzmex -mb gzfile.mw
+--- /dev/null
++++ b/example/README
+@@ -0,0 +1,5 @@
++These examples require to have a mex compiler installed. It can be provided
++either by Octave (package liboctave-dev) or MATLAB.
++
++By default it will try to use the Octave compiler (mkoctfile --mex) but it
++can be redefined to another one by setting the environment variable MEX.
diff --git a/debian/patches/series b/debian/patches/series
index 7b57d6c..202d446 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-makefile.patch
 fix-build-error.patch
 fix-doc-build.patch
+examples-makefiles.patch

-- 
Debian packaging for mwrap