[Pkg-ocaml-maint-commits] [camljava] 03/08: Merge branch 'ubuntu'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository camljava.

commit aa6a3e5be90add6f82a8aecc4b94e5cf182703e2
Merge: 065cec7 ba746f1
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jul 18 09:29:54 2017 +0200

    Merge branch 'ubuntu'

 debian/changelog                                   |  7 ++
 .../05cd8336a76065cd89474d339d555abdade1a299.patch | 79 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 87 insertions(+)

diff --cc debian/changelog
index ece3692,54279c4..a538c75
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,52 +1,10 @@@
 -camljava (0.3-1ubuntu1) artful; urgency=medium
++camljava (0.3-2) UNRELEASED; urgency=medium
+ 
+   * Cherrypick upstream patch to use jlong instead of int64, fixes FTBFS
+     with ocaml 4.04.
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 03 Jul 2017 15:48:08 +0100
+ 
 -camljava (0.3-1build7) artful; urgency=high
 -
 -  * No change rebuild against ocaml 4.04.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Tue, 27 Jun 2017 13:37:43 +0100
 -
 -camljava (0.3-1build6) xenial; urgency=medium
 -
 -  * No-change rebuild against ocaml 4.02.
 -
 - -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at canonical.com>  Mon, 02 Nov 2015 16:55:52 -0600
 -
 -camljava (0.3-1build5) trusty; urgency=medium
 -
 -  * Rebuild for ocaml-4.01.
 -
 - -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Dec 2013 16:15:50 +0000
 -
 -camljava (0.3-1build4) precise; urgency=low
 -
 -  * Rebuild for OCaml 3.12.1.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Sat, 19 Nov 2011 00:39:58 +0000
 -
 -camljava (0.3-1build3) oneiric; urgency=low
 -
 -  * Rebuild to pick up ocaml fixes on armel.
 -
 - -- Adam Conrad <adconrad at ubuntu.com>  Wed, 24 Aug 2011 16:26:31 -0600
 -
 -camljava (0.3-1build2) oneiric; urgency=low
 -
 -  * Rebuild for OCaml 3.12.0.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Mon, 16 May 2011 20:30:57 +0100
 -
 -camljava (0.3-1build1) lucid; urgency=low
 -
 -  * No-change rebuild for OCaml 3.11.2 transition (LP: #526073).
 -
 - -- Ilya Barygin <barygin at gmail.com>  Wed, 24 Feb 2010 21:06:12 +0300
 -
  camljava (0.3-1) unstable; urgency=low
  
    * Initial Release (Closes: #558090).

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