[Pkg-ocaml-maint-commits] [ocamlbricks] 01/03: Refresh patches

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocamlbricks.

commit 2ec776955679d97db7f5a7f0b1019c0cf5c94b35
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Apr 20 13:12:34 2017 +0200

    Refresh patches
---
 debian/patches/0002-Use-the-Debian-prefix-for-building.patch |  8 +++++---
 .../0003-Fix-the-build-on-non-native-architectures.patch     |  8 +++++---
 debian/patches/0004-install-stublibs.patch                   | 12 +++++++++++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
index 4ca1ae0..54a188d 100644
--- a/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
+++ b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
@@ -6,9 +6,11 @@ This configures the build to use debian/tmp as prefix for installation
 
 Forwarded: not-needed
 ---
- CONFIGME | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ CONFIGME | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
+diff --git a/CONFIGME b/CONFIGME
+index 157db73..fad53e4 100644
 --- a/CONFIGME
 +++ b/CONFIGME
 @@ -34,11 +34,11 @@
@@ -25,7 +27,7 @@ Forwarded: not-needed
  
  # Prefix for the locale files
  localeprefix=${prefix}/share/locale
-@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || e
+@@ -59,12 +59,12 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1)
  # library or into ${ocaml_libraryprefix}, but you  can change it if you really 
  # want to install into a different, custom prefix.
  # *No* trailing slash should be included.
diff --git a/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
index a96770e..45d1837 100644
--- a/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
+++ b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
@@ -9,12 +9,14 @@ Origin: vendor
 Bug: https://bugs.launchpad.net/ocamlbricks/+bug/1130098
 Forwarded: https://bugs.launchpad.net/ocamlbricks/+bug/1130098
 ---
- Makefile.d/ocamlmklib_wrapper.sh | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
+ Makefile.d/ocamlmklib_wrapper.sh | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
+diff --git a/Makefile.d/ocamlmklib_wrapper.sh b/Makefile.d/ocamlmklib_wrapper.sh
+index 420dfca..ca08798 100755
 --- a/Makefile.d/ocamlmklib_wrapper.sh
 +++ b/Makefile.d/ocamlmklib_wrapper.sh
-@@ -40,5 +40,9 @@ CMX=$(ocamlobjinfo _build/ocamlbricks.cm
+@@ -40,5 +40,9 @@ CMX=$(ocamlobjinfo _build/ocamlbricks.cma | awk '/Unit name/{x=tolower(substr($3
  cd _build/
  echo "Rebuilding library with ocamlmklib..."
  echo '---'; set -x; ocamlc   -a -linkall -dllib -locamlbricks_stubs -o ocamlbricks.cma  $INCLUDES $CMO; set +x
diff --git a/debian/patches/0004-install-stublibs.patch b/debian/patches/0004-install-stublibs.patch
index 02a826a..75b1fb8 100644
--- a/debian/patches/0004-install-stublibs.patch
+++ b/debian/patches/0004-install-stublibs.patch
@@ -1,6 +1,16 @@
+From: Lucas Nussbaum <lucas at debian.org>
+Date: Thu, 20 Apr 2017 13:10:42 +0200
+Subject: Install stublibs
+
+---
+ Makefile | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index dd54468..8702125 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -433,18 +433,17 @@ install-libraries: libraries install-lib
+@@ -433,18 +433,17 @@ install-libraries: libraries install-libraries-local
  	if [ "$(NATIVE_LIBRARIES) $(BYTE_LIBRARIES)" == " " ]; then \
  	  echo "There are no native libraries to install: ok, no problem..."; \
  	else \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlbricks.git