[Pkg-ocaml-maint-commits] [ocamlpam] 01/05: Import Debian changes 1.1-4ubuntu1

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ocamlpam.

commit f7952a0ec9e83b577d8129a18dde5005fd574163
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date:   Mon Jul 3 15:39:57 2017 +0100

    Import Debian changes 1.1-4ubuntu1
    
    ocamlpam (1.1-4ubuntu1) artful; urgency=medium
    
      * Call CAMLParam0 before CAMLlocal to resolve FTBFS with ocaml 4.04.
    
    ocamlpam (1.1-4build8) artful; urgency=high
    
      * No change rebuild against ocaml 4.04 transition.
    
    ocamlpam (1.1-4build7) xenial; urgency=medium
    
      * No-change rebuild against ocaml 4.02.
    
    ocamlpam (1.1-4build6) trusty; urgency=medium
    
      * Rebuild for ocaml-4.01.
    
    ocamlpam (1.1-4build5) precise; urgency=low
    
      * Rebuild with ocamlopt on armhf.
    
    ocamlpam (1.1-4build4) precise; urgency=low
    
      * Rebuild for OCaml 3.12.1.
    
    ocamlpam (1.1-4build3) oneiric; urgency=low
    
      * Rebuild to pick up armel ocaml fixes.
    
    ocamlpam (1.1-4build2) oneiric; urgency=low
    
      * Rebuild for OCaml 3.12.0.
    
    ocamlpam (1.1-4build1) lucid; urgency=low
    
      * No-change rebuild for OCaml 3.11.2 transition (LP: #522363).
---
 debian/changelog                | 54 +++++++++++++++++++++++++++++++++++++++++
 debian/control                  |  4 +--
 debian/patches/ocaml-4.04.patch | 13 ++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  1 -
 debian/source/format            |  1 +
 6 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b17370..f96934c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,57 @@
+ocamlpam (1.1-4ubuntu1) artful; urgency=medium
+
+  * Call CAMLParam0 before CAMLlocal to resolve FTBFS with ocaml 4.04.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 03 Jul 2017 15:39:57 +0100
+
+ocamlpam (1.1-4build8) artful; urgency=high
+
+  * No change rebuild against ocaml 4.04 transition.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 26 Jun 2017 22:49:25 +0100
+
+ocamlpam (1.1-4build7) xenial; urgency=medium
+
+  * No-change rebuild against ocaml 4.02.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at canonical.com>  Mon, 02 Nov 2015 15:34:46 -0500
+
+ocamlpam (1.1-4build6) trusty; urgency=medium
+
+  * Rebuild for ocaml-4.01.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Dec 2013 12:11:42 +0000
+
+ocamlpam (1.1-4build5) precise; urgency=low
+
+  * Rebuild with ocamlopt on armhf.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 24 Jan 2012 00:52:23 +0000
+
+ocamlpam (1.1-4build4) precise; urgency=low
+
+  * Rebuild for OCaml 3.12.1.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Fri, 18 Nov 2011 20:59:32 +0000
+
+ocamlpam (1.1-4build3) oneiric; urgency=low
+
+  * Rebuild to pick up armel ocaml fixes.
+
+ -- Adam Conrad <adconrad at ubuntu.com>  Fri, 19 Aug 2011 13:34:09 -0600
+
+ocamlpam (1.1-4build2) oneiric; urgency=low
+
+  * Rebuild for OCaml 3.12.0.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Mon, 16 May 2011 19:55:12 +0100
+
+ocamlpam (1.1-4build1) lucid; urgency=low
+
+  * No-change rebuild for OCaml 3.11.2 transition (LP: #522363).
+
+ -- Ilya Barygin <barygin at gmail.com>  Wed, 17 Feb 2010 18:13:37 +0300
+
 ocamlpam (1.1-4) unstable; urgency=low
 
   * Switch packaging to dh-ocaml 0.9
diff --git a/debian/control b/debian/control
index e847a5a..703e017 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
 Source: ocamlpam
 Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
  cdbs,
- quilt (>= 0.46-7~),
  debhelper (>= 7),
  dh-ocaml (>= 0.9),
  libpam-dev,
diff --git a/debian/patches/ocaml-4.04.patch b/debian/patches/ocaml-4.04.patch
new file mode 100644
index 0000000..7c15fc4
--- /dev/null
+++ b/debian/patches/ocaml-4.04.patch
@@ -0,0 +1,13 @@
+Description: Call CAMLParam0 before CAMLlocal to resolve FTBFS with ocaml 4.04.
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+
+--- ocamlpam-1.1.orig/pam_stubs.c
++++ ocamlpam-1.1/pam_stubs.c
+@@ -57,6 +57,7 @@ static int converse(int nMsg, const stru
+ 	struct pam_response * local_responses;
+ 	caml_pam_handle * h;
+ 
++	CAMLparam0();
+ 	CAMLlocal1(ret);
+ 
+ 	h = (caml_pam_handle *)data;
diff --git a/debian/patches/series b/debian/patches/series
index 0813239..ce01f34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-FTBFS-when-native-objects-are-not-compiled.patch
+ocaml-4.04.patch
diff --git a/debian/rules b/debian/rules
index 4a031fe..7b6bc47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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