[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, 3.11/master, updated. debian/3.10.2-3-58-g9667598

[Stephane Glondu]

The following commit has been merged in the 3.11/master branch:
commit 96675986319cce07d96e89cb4538494949b3fa14
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Nov 2 12:58:44 2008 +0100

    Remove not-native-no-aspp.dpatch
    
    See upstream bug #4375

diff --git a/debian/changelog b/debian/changelog
index ad0f355..9239f7d 100644
--- 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 at glondu.net>  Mon, 27 Oct 2008 19:36:23 +0100
+ -- Stephane Glondu <steph at 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 3be95a8..fcf35f8 100644
--- 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
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 at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at 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";;/' \

-- 
OCaml packaging