[Pkg-octave-commit] [SCM] Debian packaging for octave-miscellaneous branch, master, updated. upstream/1.0.11-18-g885049b

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 9e1bc3571d1bc1a2deacfc54c8febeca7d58c093
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue Mar 20 21:02:39 2012 +0100

    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..340f490
--- /dev/null
+++ b/debian/patches/no-flexml.patch
@@ -0,0 +1,30 @@
+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. See for example:
+ https://buildd.debian.org/status/fetch.php?pkg=octave-miscellaneous&arch=s390x&ver=1.0.11-2&stamp=1331510586
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: not-needed
+Last-Update: 2012-03-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -28,18 +28,6 @@
+ xmltree.o: xmltree.c xmltree.h
+ 	$(MKOCTFILE) $(MISCDEFS) -c $<
+ 
+-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_read.o: xmltree_read.c xmltree_read.h
+ 	$(MKOCTFILE) $(MISCDEFS) -c $<
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6d53cf4..dc7f23c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 special_matrix_lauchli
 match-cell-array.patch
 waitbar-rename.patch
+no-flexml.patch

-- 
Debian packaging for octave-miscellaneous