The following commit has been merged in the master branch: commit 6f602b0921450ca7f0bf09f0b41d0db59f8a51f6 Author: Stephane Glondu <st...@glondu.net> Date: Sun Sep 11 16:35:31 2011 +0200
Fix detection of lablgtk-extras diff --git a/debian/patches/0001-Don-t-try-to-extract-documentation-from-internal-hea.patch b/debian/patches/0001-Don-t-try-to-extract-documentation-from-internal-hea.patch index 9c76c04..b6e3f69 100644 --- a/debian/patches/0001-Don-t-try-to-extract-documentation-from-internal-hea.patch +++ b/debian/patches/0001-Don-t-try-to-extract-documentation-from-internal-hea.patch @@ -1,6 +1,6 @@ From: Sylvain Le Gall <gil...@debian.org> Date: Sun, 8 Mar 2009 13:37:44 +0100 -Subject: [PATCH] Don't try to extract documentation from internal header files +Subject: Don't try to extract documentation from internal header files Debian-specific. @@ -11,7 +11,7 @@ Signed-off-by: Sylvain Le Gall <gil...@debian.org> 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile b/doc/Makefile -index 475533b..eea35d5 100644 +index faaed57..3140b48 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -33,7 +33,7 @@ STDLIB_DOC=stdlib.odoc diff --git a/debian/patches/0002-Fix-detection-of-lablgtk-extras.patch b/debian/patches/0002-Fix-detection-of-lablgtk-extras.patch new file mode 100644 index 0000000..7a04cb4 --- /dev/null +++ b/debian/patches/0002-Fix-detection-of-lablgtk-extras.patch @@ -0,0 +1,27 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Sun, 11 Sep 2011 16:34:37 +0200 +Subject: Fix detection of lablgtk-extras + +Forwarded: no +Signed-off-by: Stephane Glondu <st...@glondu.net> +--- + utils/checkocaml.ml | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/utils/checkocaml.ml b/utils/checkocaml.ml +index 42b6542..3a07ddf 100644 +--- a/utils/checkocaml.ml ++++ b/utils/checkocaml.ml +@@ -873,7 +873,10 @@ let detect_xml_light ?(modes=[`Byte;`Opt]) conf = + let detect_lablgtkextras ?(modes=[`Byte;`Opt]) lablgtk_incs conf = + let includes = + ["default install", +- (Filename.concat (ocaml_libdir conf) "lablgtk-extras") :: lablgtk_incs ++ (Filename.concat (ocaml_libdir conf) "lablgtk-extras") ++ :: (Filename.concat (ocaml_libdir conf) "xml-light") ++ :: (Filename.concat (ocaml_libdir conf) "config-file") ++ :: lablgtk_incs + ] + in + let includes = +-- diff --git a/debian/patches/series b/debian/patches/series index 8e1c182..80e86f7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Don-t-try-to-extract-documentation-from-internal-hea.patch +0002-Fix-detection-of-lablgtk-extras.patch -- cameleon packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits