[SCM] Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI branch, master, updated. debian/3.2.4-1-7-ga438647
Jan Dittberner
jandd at alioth.debian.org
Tue May 25 22:18:01 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI".
The branch, master has been updated
via a438647e71ae5ce6112051b40cc9e28729a64d66 (commit)
via 2f7760c59cfeebe501a7e9d4cfadedde911e0f58 (commit)
via e959edc30e07810dceaea61ae7a677182418c6ac (commit)
via 1784500d07102e14359498d9986ab0819c8ece2a (commit)
via 2cb0f206e430e09ff69da0a4bad28ae406b40de2 (commit)
via 758a519eb8eb6bcf3864e717833e49f3875483b7 (commit)
via 0d1ea38719b2da67a7e9c19ebfc88a1b6b5d9513 (commit)
from 955f5dd11e27f853028cf22e5e4ffa1b2d650cf9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a438647e71ae5ce6112051b40cc9e28729a64d66
Author: Jan Dittberner <jandd at debian.org>
Date: Wed May 26 00:15:04 2010 +0200
Release 3.2.4-2
commit 2f7760c59cfeebe501a7e9d4cfadedde911e0f58
Author: Jan Dittberner <jandd at debian.org>
Date: Wed May 26 00:06:56 2010 +0200
import debian/patches/50-remove-gjdoc-inexistent-options.dpatch as debian/patches/06-remove-gjdoc-inexistent-options.patch
commit e959edc30e07810dceaea61ae7a677182418c6ac
Author: Jan Dittberner <jandd at debian.org>
Date: Tue May 25 23:49:16 2010 +0200
move GNU/kFreeBSD before FreeBSD
commit 1784500d07102e14359498d9986ab0819c8ece2a
Author: Jan Dittberner <jandd at debian.org>
Date: Tue May 25 22:58:35 2010 +0200
debian/rules: add -Djni.md5="" to ant call
commit 2cb0f206e430e09ff69da0a4bad28ae406b40de2
Author: Jan Dittberner <jandd at debian.org>
Date: Sun May 2 12:24:24 2010 +0200
add debian/patches/05-support-gnu-kfreebsd.patch to support GNU/kFreeBSD architectures
commit 758a519eb8eb6bcf3864e717833e49f3875483b7
Author: Jan Dittberner <jandd at debian.org>
Date: Sun May 2 12:05:00 2010 +0200
set JAVA_HOME to /usr/lib/jvm/default-java
commit 0d1ea38719b2da67a7e9c19ebfc88a1b6b5d9513
Author: Jan Dittberner <jandd at debian.org>
Date: Sun May 2 10:47:14 2010 +0200
debian/control: set Build-Depends to default-jdk | openjdk-6-jdk
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 13 ++++++++++
debian/control | 2 +-
debian/patches/05-support-gnu-kfreebsd.patch | 25 ++++++++++++++++++++
.../06-remove-gjdoc-inexistent-options.patch | 13 ++++++++++
debian/patches/series | 2 +
debian/rules | 4 +-
6 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 42df579..6564367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libjna-java (3.2.4-2) unstable; urgency=low
+
+ * make libjna-java buildable on GNU/kFreeBSD
+ * debian/control: set Build-Depends to default-jdk | openjdk-6-jdk
+ * set JAVA_HOME to /usr/lib/jvm/default-java
+ * add debian/patches/05-support-gnu-kfreebsd.patch to support
+ GNU/kFreeBSD architectures
+ * debian/rules: add -Djni.md5="" to ant call
+ * import debian/patches/50-remove-gjdoc-inexistent-options.dpatch as
+ debian/patches/06-remove-gjdoc-inexistent-options.patch
+
+ -- Jan Dittberner <jandd at debian.org> Wed, 26 May 2010 00:14:07 +0200
+
libjna-java (3.2.4-1) unstable; urgency=low
[ Ludovic Claude ]
diff --git a/debian/control b/debian/control
index 7a3c423..2710831 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>, Jan Dittberner <jandd at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 7.0.50~), openjdk-6-jdk, ant,
+Build-Depends: debhelper (>= 7.0.50~), default-jdk | openjdk-6-jdk, ant,
ant-optional, libx11-dev, libxt-dev, libffi-dev, pkg-config, maven-repo-helper
Standards-Version: 3.8.4
Homepage: http://jna.dev.java.net/
diff --git a/debian/patches/05-support-gnu-kfreebsd.patch b/debian/patches/05-support-gnu-kfreebsd.patch
new file mode 100644
index 0000000..143e3f5
--- /dev/null
+++ b/debian/patches/05-support-gnu-kfreebsd.patch
@@ -0,0 +1,25 @@
+Author: Jan Dittberner <jandd at debian.org>
+Subject: patch build.xml and native/Makefile to support Debian GNU/kFreeBSD
+
+--- a/native/Makefile
++++ b/native/Makefile
+@@ -22,6 +22,7 @@
+
+ OS=$(shell uname | sed -e 's/\(CYGWIN\|MINGW32\).*/win32/g' \
+ -e 's/SunOS.*/solaris/g' \
++ -e 's/GNU\/kFreeBSD/linux/g' \
+ -e 's/FreeBSD.*/freebsd/g' \
+ -e 's/OpenBSD.*/openbsd/g' \
+ -e 's/Darwin.*/darwin/g' \
+--- a/build.xml
++++ b/build.xml
+@@ -126,6 +126,9 @@
+ <condition property="os.prefix" value="freebsd-${os.arch}">
+ <os name="FreeBSD"/>
+ </condition>
++ <condition property="os.prefix" value="linux-${jre.arch}">
++ <os name="GNU/kFreeBSD"/>
++ </condition>
+ <condition property="os.prefix" value="openbsd-${os.arch}">
+ <os name="OpenBSD"/>
+ </condition>
diff --git a/debian/patches/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch
new file mode 100644
index 0000000..e9e4bc1
--- /dev/null
+++ b/debian/patches/06-remove-gjdoc-inexistent-options.patch
@@ -0,0 +1,13 @@
+Author: Jan Dittberner <jandd at debian.org>
+Subject: disable javadoc options that are not supported by gjdoc
+
+--- a/build.xml
++++ b/build.xml
+@@ -546,7 +546,6 @@
+ <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
+ <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
+
+- <arg value="-notimestamp"/>
+ </javadoc>
+ </target>
+
diff --git a/debian/patches/series b/debian/patches/series
index bbe03ef..f1abff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
02-builddir.patch
03-dynlink-and-cflags.patch
04-load-native-code-from-fs.patch
+05-support-gnu-kfreebsd.patch
+06-remove-gjdoc-inexistent-options.patch
diff --git a/debian/rules b/debian/rules
index c3ff5c9..7142a3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+export JAVA_HOME=/usr/lib/jvm/default-java
VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
@@ -13,7 +13,7 @@ override_dh_auto_clean:
dh_clean
override_dh_auto_build:
- ant -f build.xml -Dcflags_extra.native="" -Ddynlink.native=true -Dnomixedjar.native=true jar
+ ant -f build.xml -Dcflags_extra.native="" -Ddynlink.native=true -Dnomixedjar.native=true -Djni.md5="" jar
ant -f build.xml javadoc
override_dh_auto_install:
hooks/post-receive
--
Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI
More information about the pkg-java-commits
mailing list