[Pkg-octave-commit] [SCM] Debian packaging for octave-miscellaneous branch, master, updated. debian/1.0.11-3-11-g280a6fa

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit b105ec73bb335b1b6b71afe3627896716be6ed71
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Apr 2 15:12:45 2012 +0200

    debian/patches/no-flexml.patch: remove obsolete patch, flex no longer used
    
    Closes: #666294

diff --git a/debian/patches/no-flexml.patch b/debian/patches/no-flexml.patch
deleted file mode 100644
index 340f490..0000000
--- a/debian/patches/no-flexml.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 0e3373b..bc8537f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 special_matrix_lauchli
-no-flexml.patch

-- 
Debian packaging for octave-miscellaneous