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

glondu pushed a commit to branch master
in repository perl4caml.

commit 9394914fcdaee5d18c3561f348264a09926a1e90
Author: Dimitri John Ledkov <x...@ubuntu.com>
Date:   Tue Jun 27 03:57:49 2017 +0100

    Import Debian changes 0.9.5-4ubuntu1
    
    perl4caml (0.9.5-4ubuntu1) artful; urgency=medium
    
      * Cherrypick random patch from annexia.org to fix FTBFS with ocaml 4.04.
    
    perl4caml (0.9.5-4build12) artful; urgency=high
    
      * No change rebuild against ocaml 4.04 transition.
    
    perl4caml (0.9.5-4build11) zesty; urgency=medium
    
      * No-change rebuild for perl 5.24 transition
    
    perl4caml (0.9.5-4build10) xenial; urgency=medium
    
      * Rebuild for Perl 5.22.1.
    
    perl4caml (0.9.5-4build9) xenial; urgency=medium
    
      * No-change rebuild against ocaml 4.02.
    
    perl4caml (0.9.5-4build8) utopic; urgency=medium
    
      * Rebuild for Perl 5.20.0.
    
    perl4caml (0.9.5-4build7) trusty; urgency=medium
    
      * Rebuild for ocaml-4.01.
    
    perl4caml (0.9.5-4build6) trusty; urgency=low
    
      * Rebuild for Perl 5.18.
    
    perl4caml (0.9.5-4build5) precise; urgency=low
    
      * Rebuild with ocamlopt on armhf.
    
    perl4caml (0.9.5-4build4) precise; urgency=low
    
      * Rebuild for OCaml 3.12.1.
    
    perl4caml (0.9.5-4build3) precise; urgency=low
    
      * Rebuild for Perl 5.14.
    
    perl4caml (0.9.5-4build2) oneiric; urgency=low
    
      * Rebuild for armel ocaml fixes.
    
    perl4caml (0.9.5-4build1) oneiric; urgency=low
    
      * Rebuild for Perl 5.12.
---
 debian/changelog                                   | 78 ++++++++++++++++++++++
 debian/control                                     |  3 +-
 .../0001-Fix-use-of-CAMLparam-etc-macros.patch     | 41 ++++++++++++
 debian/patches/debian-changes-0.9.5-4              | 69 +++++++++++++++++++
 debian/patches/series                              |  2 +
 5 files changed, 192 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cd6445e..7ca4ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,81 @@
+perl4caml (0.9.5-4ubuntu1) artful; urgency=medium
+
+  * Cherrypick random patch from annexia.org to fix FTBFS with ocaml 4.04.
+
+ -- Dimitri John Ledkov <x...@ubuntu.com>  Tue, 27 Jun 2017 03:57:49 +0100
+
+perl4caml (0.9.5-4build12) artful; urgency=high
+
+  * No change rebuild against ocaml 4.04 transition.
+
+ -- Dimitri John Ledkov <x...@ubuntu.com>  Mon, 26 Jun 2017 22:49:35 +0100
+
+perl4caml (0.9.5-4build11) zesty; urgency=medium
+
+  * No-change rebuild for perl 5.24 transition
+
+ -- Iain Lane <i...@orangesquash.org.uk>  Mon, 24 Oct 2016 10:38:25 +0100
+
+perl4caml (0.9.5-4build10) xenial; urgency=medium
+
+  * Rebuild for Perl 5.22.1.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Fri, 18 Dec 2015 03:40:47 +0000
+
+perl4caml (0.9.5-4build9) xenial; urgency=medium
+
+  * No-change rebuild against ocaml 4.02.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemc...@canonical.com>  Mon, 02 Nov 2015 
15:39:48 -0500
+
+perl4caml (0.9.5-4build8) utopic; urgency=medium
+
+  * Rebuild for Perl 5.20.0.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Thu, 21 Aug 2014 13:34:20 +0100
+
+perl4caml (0.9.5-4build7) trusty; urgency=medium
+
+  * Rebuild for ocaml-4.01.
+
+ -- Matthias Klose <d...@ubuntu.com>  Mon, 23 Dec 2013 12:11:47 +0000
+
+perl4caml (0.9.5-4build6) trusty; urgency=low
+
+  * Rebuild for Perl 5.18.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Mon, 21 Oct 2013 12:44:37 +0100
+
+perl4caml (0.9.5-4build5) precise; urgency=low
+
+  * Rebuild with ocamlopt on armhf.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Tue, 24 Jan 2012 00:52:42 +0000
+
+perl4caml (0.9.5-4build4) precise; urgency=low
+
+  * Rebuild for OCaml 3.12.1.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Fri, 18 Nov 2011 21:00:29 +0000
+
+perl4caml (0.9.5-4build3) precise; urgency=low
+
+  * Rebuild for Perl 5.14.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Wed, 16 Nov 2011 11:52:23 +0000
+
+perl4caml (0.9.5-4build2) oneiric; urgency=low
+
+  * Rebuild for armel ocaml fixes.
+
+ -- Adam Conrad <adcon...@ubuntu.com>  Fri, 19 Aug 2011 13:37:55 -0600
+
+perl4caml (0.9.5-4build1) oneiric; urgency=low
+
+  * Rebuild for Perl 5.12.
+
+ -- Colin Watson <cjwat...@ubuntu.com>  Mon, 09 May 2011 10:19:48 +0100
+
 perl4caml (0.9.5-4) unstable; urgency=low
 
   * Add 0003-Fix-for-Perl-5.12-SVt_RV-missing.patch (Closes: #578800)
diff --git a/debian/control b/debian/control
index abbde69..c77dc6f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: perl4caml
 Priority: optional
 Section: ocaml
-Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers 
<debian-ocaml-ma...@lists.debian.org>
 Uploaders:
  Mike Furr <mf...@debian.org>,
  Stéphane Glondu <glo...@debian.org>
diff --git a/debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch 
b/debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch
new file mode 100644
index 0000000..e04c7e5
--- /dev/null
+++ b/debian/patches/0001-Fix-use-of-CAMLparam-etc-macros.patch
@@ -0,0 +1,41 @@
+From 36b9a44ab49471646b7a3548d1e2d28c015063ad Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjo...@redhat.com>
+Date: Sun, 6 Nov 2016 19:09:58 +0000
+Subject: [PATCH] Fix use of CAMLparam etc macros.
+
+This was broken previously, and OCaml 4.04 revealed it.
+---
+ perl_c.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/perl_c.c b/perl_c.c
+index 66f2959..ce53667 100644
+--- a/perl_c.c
++++ b/perl_c.c
+@@ -719,11 +719,13 @@ perl4caml_get_hv (value optcreate, value name)
+ static inline void
+ check_perl_failure ()
+ {
++  CAMLparam0 ();
++  CAMLlocal1 (errv);
++
+   SV *errsv = get_sv ("@", TRUE);
+ 
+   if (SvTRUE (errsv))         /* Equivalent of $@ in Perl. */
+     {
+-      CAMLlocal1 (errv);
+       STRLEN n_a;
+       const char *err = SvPV (errsv, n_a);
+ 
+@@ -731,6 +733,8 @@ check_perl_failure ()
+ 
+       caml_raise_with_arg (*caml_named_value ("perl4caml_perl_failure"), 
errv);
+     }
++
++  CAMLreturn0;
+ }
+ 
+ CAMLprim value
+-- 
+2.7.4
+
diff --git a/debian/patches/debian-changes-0.9.5-4 
b/debian/patches/debian-changes-0.9.5-4
new file mode 100644
index 0000000..701548d
--- /dev/null
+++ b/debian/patches/debian-changes-0.9.5-4
@@ -0,0 +1,69 @@
+Description: Upstream changes introduced in version 0.9.5-4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ perl4caml (0.9.5-4) unstable; urgency=low
+ .
+   * Add 0003-Fix-for-Perl-5.12-SVt_RV-missing.patch (Closes: #578800)
+   * Switch source package format to 3.0 (quilt)
+   * debian/control:
+     - libperl4caml-ocaml-dev: add ocaml-findlib to Recommends
+     - bump Standards-Version to 3.8.4 (no changes)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Stéphane Glondu <glo...@debian.org>
+Bug-Debian: http://bugs.debian.org/578800
+
+---
+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:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- perl4caml-0.9.5.orig/.depend
++++ perl4caml-0.9.5/.depend
+@@ -1,3 +1,4 @@
++perl.cmi: 
+ perl.cmo: perl.cmi 
+ perl.cmx: perl.cmi 
+ examples/google.cmo: wrappers/pl_Net_Google.cmo 
+@@ -38,12 +39,12 @@ wrappers/pl_HTTP_Headers.cmo: perl.cmi
+ wrappers/pl_HTTP_Headers.cmx: perl.cmx 
+ wrappers/pl_HTTP_Message.cmo: wrappers/pl_HTTP_Headers.cmo perl.cmi 
+ wrappers/pl_HTTP_Message.cmx: wrappers/pl_HTTP_Headers.cmx perl.cmx 
+-wrappers/pl_HTTP_Request_Common.cmo: wrappers/pl_HTTP_Request.cmo perl.cmi 
+-wrappers/pl_HTTP_Request_Common.cmx: wrappers/pl_HTTP_Request.cmx perl.cmx 
+ wrappers/pl_HTTP_Request.cmo: wrappers/pl_URI.cmo \
+     wrappers/pl_HTTP_Message.cmo perl.cmi 
+ wrappers/pl_HTTP_Request.cmx: wrappers/pl_URI.cmx \
+     wrappers/pl_HTTP_Message.cmx perl.cmx 
++wrappers/pl_HTTP_Request_Common.cmo: wrappers/pl_HTTP_Request.cmo perl.cmi 
++wrappers/pl_HTTP_Request_Common.cmx: wrappers/pl_HTTP_Request.cmx perl.cmx 
+ wrappers/pl_HTTP_Response.cmo: wrappers/pl_HTTP_Request.cmo \
+     wrappers/pl_HTTP_Message.cmo perl.cmi 
+ wrappers/pl_HTTP_Response.cmx: wrappers/pl_HTTP_Request.cmx \
+@@ -52,14 +53,14 @@ wrappers/pl_LWP_UserAgent.cmo: wrappers/
+     wrappers/pl_HTTP_Request.cmo wrappers/pl_HTTP_Cookies.cmo perl.cmi 
+ wrappers/pl_LWP_UserAgent.cmx: wrappers/pl_HTTP_Response.cmx \
+     wrappers/pl_HTTP_Request.cmx wrappers/pl_HTTP_Cookies.cmx perl.cmx 
+-wrappers/pl_Net_Google_Cache.cmo: perl.cmi 
+-wrappers/pl_Net_Google_Cache.cmx: perl.cmx 
+ wrappers/pl_Net_Google.cmo: wrappers/pl_Net_Google_Spelling.cmo \
+     wrappers/pl_Net_Google_Search.cmo wrappers/pl_Net_Google_Cache.cmo \
+     perl.cmi 
+ wrappers/pl_Net_Google.cmx: wrappers/pl_Net_Google_Spelling.cmx \
+     wrappers/pl_Net_Google_Search.cmx wrappers/pl_Net_Google_Cache.cmx \
+     perl.cmx 
++wrappers/pl_Net_Google_Cache.cmo: perl.cmi 
++wrappers/pl_Net_Google_Cache.cmx: perl.cmx 
+ wrappers/pl_Net_Google_Response.cmo: perl.cmi 
+ wrappers/pl_Net_Google_Response.cmx: perl.cmx 
+ wrappers/pl_Net_Google_Search.cmo: wrappers/pl_Net_Google_Response.cmo \
diff --git a/debian/patches/series b/debian/patches/series
index 9445804..4f32cda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 0001-Fix-Makefile-to-detect-ocamlopt.patch
 0002-Disable-libnet-google-perl-wrappers.patch
 0003-Fix-for-Perl-5.12-SVt_RV-missing.patch
+debian-changes-0.9.5-4
+0001-Fix-use-of-CAMLparam-etc-macros.patch

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

_______________________________________________
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

Reply via email to