The following commit has been merged in the master branch: commit 5a5050accb2c06f8dd31ab2c14e281796645a0ab Author: Nicolas Dandrimont <nicolas.dandrim...@crans.org> Date: Mon Jun 27 21:56:33 2011 +0200
Do not use an absolute path in META.camlp4 (Closes: #628021) diff --git a/debian/changelog b/debian/changelog index 80abef8..e0506dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ findlib (1.2.7+debian-1) unstable; urgency=low * 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) - -- Nicolas Dandrimont <nicolas.dandrim...@crans.org> Mon, 27 Jun 2011 21:50:32 +0200 + -- Nicolas Dandrimont <nicolas.dandrim...@crans.org> Mon, 27 Jun 2011 21:55:51 +0200 findlib (1.2.6+debian-2) unstable; urgency=low diff --git a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch new file mode 100644 index 0000000..08e0824 --- /dev/null +++ b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch @@ -0,0 +1,22 @@ +From: Nicolas Dandrimont <nicolas.dandrim...@crans.org> +Date: Mon, 27 Jun 2011 21:55:16 +0200 +Subject: Do not use an absolute path in META.camlp4 + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index e82ecc1..a896c35 100755 +--- a/configure ++++ b/configure +@@ -416,7 +416,7 @@ fi + # Check on camlp4: + + if in_path camlp4; then +- camlp4_dir=`camlp4 -where` ++ camlp4_dir=`camlp4 -where | sed -s 's@/usr/lib/ocaml/@^@'` + if [ ${use_cygpath} -gt 0 ]; then + camlp4_dir=`echo x | env USE_CYGPATH=1 tools/patch x "$camlp4_dir"` + # This makes camlp4_dir a windows path +-- diff --git a/debian/patches/series b/debian/patches/series index eface1e..2dd0d66 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 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 +0005-Do-not-use-an-absolute-path-in-META.camlp4.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