[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20111001+nitrogen+dfsg-1-1-gbda4586

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit bda4586ecbd7bd8cd90abf69b1b31fb1432db5c9
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Jan 3 15:25:15 2012 +0100

    add 0005-Disable-CHMOD_RO-invocations.patch.

diff --git a/debian/changelog b/debian/changelog
index f5a5b45..e9087f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frama-c (20111001+nitrogen+dfsg-2) unstable; urgency=low
+
+  * add 0005-Disable-CHMOD_RO-invocations.patch.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 03 Jan 2012 15:24:55 +0100
+
 frama-c (20111001+nitrogen+dfsg-1) unstable; urgency=low
 
   * New upstream release (Closes: #652257).
diff --git a/debian/patches/0004-Use-bin-cp-instead-of-usr-bin-install.patch b/debian/patches/0005-Disable-CHMOD_RO-invocations.patch
similarity index 54%
copy from debian/patches/0004-Use-bin-cp-instead-of-usr-bin-install.patch
copy to debian/patches/0005-Disable-CHMOD_RO-invocations.patch
index df3cf91..10e610b 100644
--- a/debian/patches/0004-Use-bin-cp-instead-of-usr-bin-install.patch
+++ b/debian/patches/0005-Disable-CHMOD_RO-invocations.patch
@@ -1,22 +1,22 @@
 From: Mehdi Dogguy <mehdi at debian.org>
-Date: Mon, 2 Jan 2012 17:28:56 +0100
-Subject: Use /bin/cp instead of /usr/bin/install
+Date: Tue, 3 Jan 2012 15:24:27 +0100
+Subject: Disable CHMOD_RO invocations
 
 ---
  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
+index ce1a699..1993cf1 100644
 --- a/share/Makefile.common
 +++ b/share/Makefile.common
-@@ -138,7 +138,7 @@ CHMOD_RW= sh -c \
+@@ -133,7 +133,7 @@ external_make = \
+ 
+ CAT	= cat
+ CHMOD	= chmod
+-CHMOD_RO= chmod a-w
++CHMOD_RO= true
+ 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 d810b77..ae3a88c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Accept-ocamlgraph-1.8.patch
 0003-Fix-spelling-error-in-binary.patch
 0004-Use-bin-cp-instead-of-usr-bin-install.patch
+0005-Disable-CHMOD_RO-invocations.patch

-- 
frama-c packaging