Remove not-native-no-aspp.dpatch

See upstream bug #4375

diff --git a/debian/changelog b/debian/changelog
index ad0f3557835863faeff3872d583e151da58b59e6..9239f7d34163f5da2fbfffaf0db313a3e6fdafd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
   [ Stephane Glondu ]
   * New upstream beta release:
     - camlrun_shared.dpatch removed (integrated upstream)
+    - not-native-no-aspp.dpatch removed (thanks to upstream bugfix)
     - all other patches updated
     - manpages.dpatch and ocamldoc.dpatch added
   * Switching packaging to git (from svn)
@@ -21,7 +22,7 @@ ocaml (3.11.0~beta1-1) UNRELEASED; urgency=low
     - ocaml-md5sums (therefore also disable its usage at the end of the
       build process)
 
- -- Stephane Glondu <steph@glondu.net>  Mon, 27 Oct 2008 19:36:23 +0100
+ -- Stephane Glondu <steph@glondu.net>  Sun, 02 Nov 2008 12:56:34 +0100
 
 ocaml (3.10.2-3) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 3be95a81df5358d221de37bcee9ae9a1d7e1f5e7..fcf35f8e4861923c7a6b696f41bfc024e5c05a1e 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -9,4 +9,3 @@ no_rpath.dpatch
 stdlib_man_section.dpatch
 install_scripts_config.dpatch
 install_ocamlbuild.dpatch
-not-native-no-aspp

diff --git a/debian/patches/not-native-no-aspp.dpatch b/debian/patches/not-native-no-aspp.dpatch
deleted file mode 100755 (executable)
index f2d8537..0000000
--- a/debian/patches/not-native-no-aspp.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## not-native-no-aspp.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad ocaml~/build/mkmyocamlbuild_config.sh ocaml/build/mkmyocamlbuild_config.sh
---- ocaml~/build/mkmyocamlbuild_config.sh      2008-10-17 12:22:50.000000000 +0200
-+++ ocaml/build/mkmyocamlbuild_config.sh       2008-10-20 15:03:04.000000000 +0200
-@@ -19,6 +19,7 @@
- sed \
-     -e 's/^.*FLEXDIR.*$//g' \
-     -e 's/^#ml \(.*\)/\1/' \
-+    -e 's/\$(AS)/no/' \
-     -e 's/^\(#.*\)$/(* \1 *)/' \
-     -e 's/^\(.*\$([0-9]).*\)$/(* \1 *)/' \
-     -e 's/^\([^(=]*\)=\([^"]*\)$/let <:lower<\1>> = "\2";;/' \