The following commit has been merged in the master branch: commit bba1e3704ab7d60d1149cfb9bcec3280b2684c27 Author: Nicolas Dandrimont <nicolas.dandrim...@crans.org> Date: Mon Jun 27 21:40:40 2011 +0200
Add patch to make Camlp4 depend on Dynlink on all arches (Closes: #630490) diff --git a/debian/changelog b/debian/changelog index 0607ed6..3651ea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ findlib (1.2.7+debian-1) unstable; urgency=low * New upstream release + * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: + #630490) - -- Nicolas Dandrimont <nicolas.dandrim...@crans.org> Mon, 27 Jun 2011 21:34:08 +0200 + -- Nicolas Dandrimont <nicolas.dandrim...@crans.org> Mon, 27 Jun 2011 21:37:42 +0200 findlib (1.2.6+debian-2) unstable; urgency=low diff --git a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch new file mode 100644 index 0000000..6e5dc32 --- /dev/null +++ b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch @@ -0,0 +1,31 @@ +From: Nicolas Dandrimont <nicolas.dandrim...@crans.org> +Date: Tue, 14 Jun 2011 15:21:31 +0200 +Subject: Camlp4 depends on Dynlink on every architecture + +--- + site-lib-src/camlp4.310/META.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/site-lib-src/camlp4.310/META.in b/site-lib-src/camlp4.310/META.in +index 637d848..a490ab1 100644 +--- a/site-lib-src/camlp4.310/META.in ++++ b/site-lib-src/camlp4.310/META.in +@@ -6,7 +6,7 @@ dnl This file is input of the m4 macro processor. + `directory = "'camlp4_dir`"' + + `# For the toploop:' +-`requires(byte,toploop) = "'camlp4_dynlink`"' ++`requires(byte,toploop) = "dynlink"' + `archive(byte,toploop,camlp4o) = "camlp4o.cma"' + `archive(byte,toploop,camlp4r) = "camlp4r.cma"' + +@@ -16,7 +16,7 @@ dnl This file is input of the m4 macro processor. + `preprocessor = "'camlp4_cmd`"' + + `package "lib" (' +-` requires = "camlp4 'camlp4_dynlink`"' ++` requires = "camlp4 dynlink"' + ` version = "[distributed with Ocaml]"' + ` description = "Camlp4 library"' + ` archive(byte) = "camlp4lib.cma"' +-- diff --git a/debian/patches/series b/debian/patches/series index 08faec1..eface1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Change-standard-directories-to-conform-our-own-polic.patch 0002-Extra-configuration-search-path.patch 0003-META.num-bugfix-moved-directory-directive-outside-co.patch +0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch -- findlib 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