[Pkg-octave-commit] [SCM] Debian packaging for octave-io branch, master, updated. debian/1.0.17-1-12-g8d04dfc

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit b6174256a05a9d2e554ee014f8db617dc522c484
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Apr 2 21:16:50 2012 +0200

    debian/patches/no-flexml.patch: new patch

diff --git a/debian/patches/no-flexml.patch b/debian/patches/no-flexml.patch
new file mode 100644
index 0000000..3f3bd41
--- /dev/null
+++ b/debian/patches/no-flexml.patch
@@ -0,0 +1,27 @@
+Description: Remove build rules related to FlexML
+ These rules should not be used (as explained in the comment), and on some
+ autobuilders they cause a failure.
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: not-needed
+Last-Update: 2012-04-02
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -14,18 +14,6 @@
+ #MKOCTFILE = mkoctfile -Wall
+ MKOCTFILE = mkoctfile
+ 
+-ifdef FLEXML
+-# flexml is a dead project.  It requires flex 2.5.4a-6  (flex-old on Debian).
+-# Further, we have modified the resulting xmltree_read.c by hand, changing
+-# all occurrences of yy to xml_ and YY to XML_. Some other changes have be
+-# mode so the ouput of flexml won't be as correct as the actual committed C
+-# file
+-xmltree_read.l: xmltree_read.act octave.dtd
+-	 $(FLEXML) -A -a $^
+-xmltree_read.c: xmltree_read.l
+-	$(FLEX) -B -Pxml_ -o$@ $<
+-endif
+-
+ xmltree.o: xmltree.c xmltree.h
+ 	$(MKOCTFILE) -c $<
+ 
diff --git a/debian/patches/series b/debian/patches/series
index caef8ff..566ec64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 configure-java-classpath.patch
+no-flexml.patch

-- 
Debian packaging for octave-io