The following commit has been merged in the master branch: commit 693f729d68db06ba405866e7073417675962b999 Author: Nicolas Dandrimont <nicolas.dandrim...@crans.org> Date: Mon Jun 27 22:46:53 2011 +0200
Disable graphics and labltk when unavailable (Closes: #605695) diff --git a/debian/changelog b/debian/changelog index e0506dc..3ea82f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,12 @@ findlib (1.2.7+debian-1) unstable; urgency=low * New upstream release * Add myself to Uploaders - * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: - #630490) - * Add patch to use a relative path in META.camlp4 (Closes: #628021) + * Add patches: + - Make Camlp4 depend on Dynlink on every arch (Closes: #630490) + - Use a relative path in META.camlp4 (Closes: #628021) + - Disable graphics and labltk when unavailable (Closes: #605695) - -- Nicolas Dandrimont <nicolas.dandrim...@crans.org> Mon, 27 Jun 2011 21:55:51 +0200 + -- Nicolas Dandrimont <nicolas.dandrim...@crans.org> Mon, 27 Jun 2011 22:45:07 +0200 findlib (1.2.6+debian-2) unstable; urgency=low diff --git a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch new file mode 100644 index 0000000..93e3b93 --- /dev/null +++ b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch @@ -0,0 +1,34 @@ +From: Nicolas Dandrimont <nicolas.dandrim...@crans.org> +Date: Mon, 27 Jun 2011 22:41:54 +0200 +Subject: Disable graphics and labltk when unavailable + +--- + site-lib-src/graphics/META.in | 1 + + site-lib-src/labltk/META.in | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in +index 7fd5ec2..eacac66 100644 +--- a/site-lib-src/graphics/META.in ++++ b/site-lib-src/graphics/META.in +@@ -1,6 +1,7 @@ + dnl This file is input of the m4 macro processor. + `# Specifications for the "graphics" library:' + `requires = ""' ++`exists_if = "graphics.cma"' + `version = "[distributed with Ocaml]"' + `description = "Portable drawing primitives"' + `directory = "^"' +diff --git a/site-lib-src/labltk/META.in b/site-lib-src/labltk/META.in +index 29347bd..6819198 100644 +--- a/site-lib-src/labltk/META.in ++++ b/site-lib-src/labltk/META.in +@@ -1,6 +1,7 @@ + dnl This file is input of the m4 macro processor. + `# Specifications for the "labltk" library:' + `requires = ""' ++`exists_if = "labltk.cma"' + `version = "[distributed with Ocaml]"' + `description = "The Tk windowing toolkit"' + `directory = "+labltk"' +-- diff --git a/debian/patches/series b/debian/patches/series index 2dd0d66..2ee13c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-META.num-bugfix-moved-directory-directive-outside-co.patch 0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch 0005-Do-not-use-an-absolute-path-in-META.camlp4.patch +0006-Disable-graphics-and-labltk-when-unavailable.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