[Pkg-ocaml-maint-commits] [camljava] 02/08: Import Debian changes 0.3-1ubuntu1
Stéphane Glondu
glondu at moszumanska.debian.org
Tue Jul 18 08:07:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository camljava.
commit ba746f11ea8a60f9031e8caa22623dd91f529e0a
Merge: 065cec7 3fd472d
Author: Dimitri John Ledkov <xnox at ubuntu.com>
Date: Mon Jul 3 15:48:08 2017 +0100
Import Debian changes 0.3-1ubuntu1
camljava (0.3-1ubuntu1) artful; urgency=medium
* Cherrypick upstream patch to use jlong instead of int64, fixes FTBFS
with ocaml 4.04.
camljava (0.3-1build7) artful; urgency=high
* No change rebuild against ocaml 4.04.
camljava (0.3-1build6) xenial; urgency=medium
* No-change rebuild against ocaml 4.02.
camljava (0.3-1build5) trusty; urgency=medium
* Rebuild for ocaml-4.01.
camljava (0.3-1build4) precise; urgency=low
* Rebuild for OCaml 3.12.1.
camljava (0.3-1build3) oneiric; urgency=low
* Rebuild to pick up ocaml fixes on armel.
camljava (0.3-1build2) oneiric; urgency=low
* Rebuild for OCaml 3.12.0.
camljava (0.3-1build1) lucid; urgency=low
* No-change rebuild for OCaml 3.11.2 transition (LP: #526073).
debian/changelog | 49 ++++++++++++++
debian/control | 3 +-
.../05cd8336a76065cd89474d339d555abdade1a299.patch | 79 ++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 131 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index ece3692,0000000..54279c4
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,54 @@@
++camljava (0.3-1ubuntu1) artful; 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).
+
+ -- Stefano Zacchiroli <zack at debian.org> Tue, 01 Dec 2009 11:19:13 +0100
diff --cc debian/control
index 982890c,0000000..d7f8ff3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,44 -1,0 +1,45 @@@
+Source: camljava
+Section: ocaml
+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: Stefano Zacchiroli <zack at debian.org>
+Build-Depends:
+ debhelper (>= 7),
+ ocaml-nox,
+ default-jdk,
+ ocaml-findlib,
+ cdbs,
+ quilt,
+ dh-ocaml (>= 0.9)
+Standards-Version: 3.8.3
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camljava.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camljava.git
+Homepage: http://pauillac.inria.fr/~xleroy/software.html#camljava
+
+Package: libcamljava-ocaml-dev
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ default-jdk,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: interface between OCaml and Java via Caml/C interface and JNI
+ CamlJava is an interface between OCaml and Java allowing programs written in
+ one of the two languages to call code written in the other.
+ .
+ Interaction among the two languages happen via the respective C interfaces:
+ Caml/C interface for OCaml and JNI (Java Native Interface) for Java.
+ .
+ Currently, CamlJava provides a low-level, weakly-typed OCaml interface very
+ similar to the JNI. Java object references are mapped to an abstract type, and
+ various JNI-like operations are provided to allow Java method invocation,
+ field access, and more.
+ .
+ A basic callback facility (allowing Java code to invoke methods on OCaml
+ objects) is also provided, although some stub Java code must be written by
+ hand.
+ .
+ This package contain all the development stuff needed to use CamlJava from
+ OCaml programs.
diff --cc debian/patches/05cd8336a76065cd89474d339d555abdade1a299.patch
index 0000000,0000000..0d61914
new file mode 100644
--- /dev/null
+++ b/debian/patches/05cd8336a76065cd89474d339d555abdade1a299.patch
@@@ -1,0 -1,0 +1,79 @@@
++From 05cd8336a76065cd89474d339d555abdade1a299 Mon Sep 17 00:00:00 2001
++From: Xavier Leroy <xavier.leroy at inria.fr>
++Date: Wed, 28 Dec 2016 11:35:43 +0100
++Subject: [PATCH] Export the exception "Exception". Quick 2016 upgrade.
++
++---
++ Changes | 6 ++++++
++ Makefile.config | 6 +++---
++ lib/jni.mli | 3 +++
++ lib/jnistubs.c | 2 +-
++ 4 files changed, 13 insertions(+), 4 deletions(-)
++ create mode 100644 Changes
++
++diff --git a/Changes b/Changes
++new file mode 100644
++index 0000000..86a3c85
++--- /dev/null
+++++ b/Changes
++@@ -0,0 +1,6 @@
+++Current:
+++- Export "exception Exception of obj" in jni.mli
+++- Update Makefile.config to OpenJDK 8 for Linux/AMD64
+++- Migration to Github
+++
+++Version 0.3, 2004-07-13
++diff --git a/Makefile.config b/Makefile.config
++index 133cd2d..cdb5211 100644
++--- a/Makefile.config
+++++ b/Makefile.config
++@@ -13,11 +13,11 @@ JAVAC=javac -g
++
++ ################### JNI interface #####################
++
++-## Defaults are set for Sun's JDK 1.4.2 under Linux.
+++## Defaults are set for OpenJDK 8 under Linux/AMD64.
++ ## For other platforms, adjust as required and tell us about it.
++
++ # Home location for the JDK. Only used for setting other variables below.
++-JDKHOME=/usr/lib/jvm/java-6-sun
+++JDKHOME=/usr/lib/jvm/java-8-openjdk-amd64
++
++ # Current architecture identification string, as intended by the JDK.
++ # Common values for x86 architectures are "i386" or "amd64". You can find it
++@@ -29,7 +29,7 @@ ARCH=amd64
++ JNIINCLUDES=-I$(JDKHOME)/include -I$(JDKHOME)/include/linux
++
++ # The library to link with to get the JNI
++-JNILIBS=-ljava
+++JNILIBS=-ljvm
++
++ # Additional link-time options to pass to $(CC) when linking with $(JNILIBS)
++ JNILIBOPTS=-L$(JDKHOME)/jre/lib/$(ARCH)/ \
++diff --git a/lib/jni.mli b/lib/jni.mli
++index a4ebd1f..c449ae0 100644
++--- a/lib/jni.mli
+++++ b/lib/jni.mli
++@@ -28,6 +28,9 @@ exception Null_pointer
++ (* Exception raised by the operations below when they
++ encounter a null object reference in arguments that must
++ be non-null. *)
+++exception Exception of obj
+++ (* Exception raised by the method invocation functions below
+++ when the Java method terminates on an unhandled exception. *)
++ external is_null: obj -> bool = "camljava_IsNull"
++ (* Determine if the given object reference is [null] *)
++ external is_same_object: obj -> obj -> bool = "camljava_IsSameObject"
++diff --git a/lib/jnistubs.c b/lib/jnistubs.c
++index bfc6c9d..c0d4e75 100644
++--- a/lib/jnistubs.c
+++++ b/lib/jnistubs.c
++@@ -924,7 +924,7 @@ value camljava_WrapCamlObject(value vobj)
++ value * wrapper = stat_alloc(sizeof(value));
++ *wrapper = vobj;
++ register_global_root(wrapper);
++- return copy_int64((int64) (value) wrapper);
+++ return copy_int64((jlong) (value) wrapper);
++ }
++
++ void camljava_FreeWrapper(JNIEnv * env, jclass cls, jlong wrapper)
diff --cc debian/patches/series
index 8619e1b,0000000..1db8a81
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
+0001-ldflags-for-recent-JDK.patch
+0002-Makefile-misc-fixes.patch
+0003-GC-global-reference-fix-for-JDK-1.6.patch
+0004-enforce-callback-invocation-from-main-thread.patch
+0005-debugging-facility-for-Java-exceptions.patch
+0006-ability-to-inhibit-automatic-string-convertion.patch
++05cd8336a76065cd89474d339d555abdade1a299.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/camljava.git
More information about the Pkg-ocaml-maint-commits
mailing list