[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.90+bzr364.3-1-9-gba9fa9a

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit 9e2a3772ae6d26d88902471285c157a9ddfd279f
Author: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
Date:   Sun Jun 23 15:03:17 2013 +0200

    Update patches to the format gbp-pq expects

diff --git a/debian/patches/fix_mlvalues.h_path.diff b/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch
similarity index 67%
rename from debian/patches/fix_mlvalues.h_path.diff
rename to debian/patches/0001-Fix-the-OCaml-C-header-paths.patch
index fc3192b..3af4cda 100644
--- a/debian/patches/fix_mlvalues.h_path.diff
+++ b/debian/patches/0001-Fix-the-OCaml-C-header-paths.patch
@@ -1,3 +1,18 @@
+From: Lucas Nussbaum <lucas at debian.org>
+Date: Sat, 1 Dec 2012 18:41:14 +0100
+Subject: Fix the OCaml C header paths
+
+This uses the Debian-specific paths for the caml C includes
+
+Forwarded: not-needed
+---
+ EXTRA/does-process-exist-c-wrapper.c |  4 ++--
+ EXTRA/waitpid-c-wrapper.c            | 12 ++++++------
+ GETTEXT/gettext-c-wrapper.c          |  6 +++---
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/EXTRA/does-process-exist-c-wrapper.c b/EXTRA/does-process-exist-c-wrapper.c
+index e512376..8351c78 100644
 --- a/EXTRA/does-process-exist-c-wrapper.c
 +++ b/EXTRA/does-process-exist-c-wrapper.c
 @@ -24,10 +24,10 @@
@@ -13,6 +28,8 @@
  
  /* Return true iff the process identified by the given pid exists. The idea is just to
     call kill with 0 as a signal, which is easy in C but impossible in OCaml: */
+diff --git a/EXTRA/waitpid-c-wrapper.c b/EXTRA/waitpid-c-wrapper.c
+index 7d08874..ee7a407 100644
 --- a/EXTRA/waitpid-c-wrapper.c
 +++ b/EXTRA/waitpid-c-wrapper.c
 @@ -22,12 +22,12 @@
@@ -34,6 +51,8 @@
  
  #define WAITPID_NAME "waitpid"
  
+diff --git a/GETTEXT/gettext-c-wrapper.c b/GETTEXT/gettext-c-wrapper.c
+index 0c3ea78..42d5bed 100644
 --- a/GETTEXT/gettext-c-wrapper.c
 +++ b/GETTEXT/gettext-c-wrapper.c
 @@ -22,11 +22,11 @@
diff --git a/debian/patches/debian-prefix.diff b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
similarity index 66%
rename from debian/patches/debian-prefix.diff
rename to debian/patches/0002-Use-the-Debian-prefix-for-building.patch
index 3db631b..64c13eb 100644
--- a/debian/patches/debian-prefix.diff
+++ b/debian/patches/0002-Use-the-Debian-prefix-for-building.patch
@@ -1,3 +1,16 @@
+From: Lucas Nussbaum <lucas at debian.org>
+Date: Tue, 12 Feb 2013 19:46:50 +0100
+Subject: Use the Debian prefix for building
+
+This configures the build to use debian/tmp as prefix for installation
+
+Forwarded: not-needed
+---
+ CONFIGME | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CONFIGME b/CONFIGME
+index 24941d6..cadaf22 100644
 --- a/CONFIGME
 +++ b/CONFIGME
 @@ -34,11 +34,11 @@
@@ -14,7 +27,7 @@
  
  # Prefix for the locale files
  localeprefix=${prefix}/share/locale
-@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || e
+@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || exit -1)
  # By default they will be installed 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/no-ocamlopt-arches.diff b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
similarity index 51%
rename from debian/patches/no-ocamlopt-arches.diff
rename to debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
index 254c51a..c6dcbe6 100644
--- a/debian/patches/no-ocamlopt-arches.diff
+++ b/debian/patches/0003-Fix-the-build-on-non-native-architectures.patch
@@ -1,19 +1,22 @@
-Description: build on non-ocamlopt architectures
-Author: Lucas Nussbaum <lucas at debian.org>
+From: Lucas Nussbaum <lucas at debian.org>
+Date: Tue, 28 May 2013 16:36:40 +0200
+Subject: Fix the build on non-native architectures
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
+This patch complements an incomplete upstream fix on architectures without
+ocamlopt
 
 Origin: vendor
 Bug: https://bugs.launchpad.net/ocamlbricks/+bug/1130098
 Forwarded: https://bugs.launchpad.net/ocamlbricks/+bug/1130098
-Last-Update: 2013-05-28
+---
+ Makefile.d/ocamlmklib_wrapper.sh | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
---- ocamlbricks-0.90+bzr364.3.orig/Makefile.d/ocamlmklib_wrapper.sh
-+++ ocamlbricks-0.90+bzr364.3/Makefile.d/ocamlmklib_wrapper.sh
-@@ -41,6 +41,12 @@ cd _build/
+diff --git a/Makefile.d/ocamlmklib_wrapper.sh b/Makefile.d/ocamlmklib_wrapper.sh
+index da72860..7a5d6ed 100755
+--- a/Makefile.d/ocamlmklib_wrapper.sh
++++ b/Makefile.d/ocamlmklib_wrapper.sh
+@@ -42,6 +42,12 @@ cd _build/
  echo "Rebuilding library with ocamlmklib..."
  set -x
  ocamlmklib -custom -o ocamlbricks $OBJECTS $INCLUDES $CMO
diff --git a/debian/patches/series b/debian/patches/series
index cd1d1aa..41484da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-fix_mlvalues.h_path.diff
-debian-prefix.diff
-no-ocamlopt-arches.diff
+0001-Fix-the-OCaml-C-header-paths.patch
+0002-Use-the-Debian-prefix-for-building.patch
+0003-Fix-the-build-on-non-native-architectures.patch

-- 
ocamlbricks packaging