The following commit has been merged in the master branch: commit aabee3d4c49bc43d6363ee7eabfa724ce0fe82b8 Author: Mehdi Dogguy <me...@debian.org> Date: Mon Jan 2 17:29:24 2012 +0100
0004-Use-bin-cp-instead-of-usr-bin-install.patch diff --git a/debian/changelog b/debian/changelog index b7e0886..f5a5b45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,10 +7,11 @@ frama-c (20111001+nitrogen+dfsg-1) unstable; urgency=low - rebase 0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch - update 0004-Accept-ocamlgraph-1.8.patch - add 0003-Fix-spelling-error-in-binary.patch + - add 0004-Use-bin-cp-instead-of-usr-bin-install.patch * Bump minimum requirement for ocamlgraph to 1.8. * Bump Standards-Version to 3.9.2, no changes needed. - -- Mehdi Dogguy <me...@debian.org> Mon, 02 Jan 2012 14:45:44 +0100 + -- Mehdi Dogguy <me...@debian.org> Mon, 02 Jan 2012 17:29:13 +0100 frama-c (20110201+carbon+dfsg-2) unstable; urgency=low diff --git a/debian/patches/0004-Use-bin-cp-instead-of-usr-bin-install.patch b/debian/patches/0004-Use-bin-cp-instead-of-usr-bin-install.patch new file mode 100644 index 0000000..df3cf91 --- /dev/null +++ b/debian/patches/0004-Use-bin-cp-instead-of-usr-bin-install.patch @@ -0,0 +1,22 @@ +From: Mehdi Dogguy <me...@debian.org> +Date: Mon, 2 Jan 2012 17:28:56 +0100 +Subject: Use /bin/cp instead of /usr/bin/install + +--- + share/Makefile.common | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/share/Makefile.common b/share/Makefile.common +index c9e8727..ce1a699 100644 +--- a/share/Makefile.common ++++ b/share/Makefile.common +@@ -138,7 +138,7 @@ CHMOD_RW= sh -c \ + 'for f in "$$@"; do \ + if test -e $$f; then chmod u+w $$f; fi \ + done' chmod_rw +-CP = /usr/bin/install ++CP = /bin/cp + ECHO = echo + MKDIR = mkdir -p + MV = mv +-- diff --git a/debian/patches/series b/debian/patches/series index 7f38102..d810b77 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0001-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch 0002-Accept-ocamlgraph-1.8.patch 0003-Fix-spelling-error-in-binary.patch +0004-Use-bin-cp-instead-of-usr-bin-install.patch -- frama-c 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