[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.19-1-5-g5a77704

[Stephane Glondu]

The following commit has been merged in the master branch:
commit ebbe32691ec0e91e7eb491710be1f43c3e8e82f2
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Dec 1 09:47:40 2009 +0100

    Remove Add-xml-light-include-flag.patch (not needed)

diff --git a/debian/patches/0001-Add-xml-light-include-flag.patch b/debian/patches/0001-Add-xml-light-include-flag.patch
deleted file mode 100644
index 27b272c..0000000
--- a/debian/patches/0001-Add-xml-light-include-flag.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Sylvain Le Gall <gildor at debian.org>
-Date: Sun, 8 Mar 2009 12:58:39 +0100
-Subject: [PATCH] Add xml-light include flag
-
-Debian-specific (xml-light is installed by default directly in `ocamlc
--where`).
-
-Forwarded: not-needed
-Signed-off-by: Sylvain Le Gall <gildor at debian.org>
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- src/Makefile |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index efaddd2..b0551ad 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -28,6 +28,7 @@ include ../master.Makefile
- SYSTEM_INCLUDES= \
- 	-I +threads \
- 	-I +ocamldoc \
-+	-I +xml-light \
- 	-I ocaml/parsing \
- 	-I ocaml/typing \
- 	$(OCAML_DRIVER_INCLUDES) \
--- 
diff --git a/debian/patches/0002-Don-t-try-to-extract-documentation-from-internal-hea.patch b/debian/patches/0001-Don-t-try-to-extract-documentation-from-internal-hea.patch
similarity index 95%
rename from debian/patches/0002-Don-t-try-to-extract-documentation-from-internal-hea.patch
rename to debian/patches/0001-Don-t-try-to-extract-documentation-from-internal-hea.patch
index fe4083c..9c76c04 100644
--- a/debian/patches/0002-Don-t-try-to-extract-documentation-from-internal-hea.patch
+++ b/debian/patches/0001-Don-t-try-to-extract-documentation-from-internal-hea.patch
@@ -11,7 +11,7 @@ Signed-off-by: Sylvain Le Gall <gildor at debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/doc/Makefile b/doc/Makefile
-index e4a329d..aa9c0c4 100644
+index 475533b..eea35d5 100644
 --- a/doc/Makefile
 +++ b/doc/Makefile
 @@ -33,7 +33,7 @@ STDLIB_DOC=stdlib.odoc
diff --git a/debian/patches/series b/debian/patches/series
index 8fcdd89..8e1c182 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Add-xml-light-include-flag.patch
-0002-Don-t-try-to-extract-documentation-from-internal-hea.patch
+0001-Don-t-try-to-extract-documentation-from-internal-hea.patch

-- 
cameleon packaging