[SCM] Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI branch, master, updated. debian/3.2.4-2-16-g562bf53
Andrew Ross
rockclimb-guest at alioth.debian.org
Tue May 24 22:08:14 UTC 2011
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 562bf53402a853a6c630c685bf2ebc40517826c5 (commit)
via 09cf7f07682d79604a4c77da1078aff11085d40f (commit)
from e493459b3e51a1401503707f232e87c17a9e8622 (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 562bf53402a853a6c630c685bf2ebc40517826c5
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Tue May 24 22:38:51 2011 +0100
Build and install platform.jar too.
* Build and install platform.jar too.
* Bump Standards-Version to 3.9.2.
* Drop dependency on jre.
* Update debian/copyright to cover platform code.
* Add myself to uploaders.
commit 09cf7f07682d79604a4c77da1078aff11085d40f
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Tue May 24 22:34:56 2011 +0100
Build and install platform.jar too.
* Build and install platform.jar too.
* Bump Standards-Version to 3.9.2.
* Drop dependency on jre.
* Update debian/copyright to cover platform code.
* Add myself to uploaders.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 10 ++++
debian/control | 7 ++-
debian/copyright | 4 +-
debian/libjna-java-doc.examples | 1 -
debian/patches/07-include-platform-jar.patch | 61 ++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 ++-
7 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fd1237c..9de783f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libjna-java (3.2.7-2) unstable; urgency=low
+
+ * Build and install platform.jar too.
+ * Bump Standards-Version to 3.9.2.
+ * Drop dependency on jre.
+ * Update debian/copyright to cover platform code.
+ * Add myself to uploaders.
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Sun, 22 May 2011 21:19:01 +0100
+
libjna-java (3.2.7-1) unstable; urgency=low
* New upstream release (Closes: #602564)
diff --git a/debian/control b/debian/control
index 4b2e359..5ed7d18 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,19 @@ Source: libjna-java
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>
+Uploaders: Michael Koch <konqueror at gmx.de>, Jan Dittberner <jandd at debian.org>,
+ Ludovic Claude <ludovic.claude at laposte.net>, Andrew Ross <ubuntu at rossfamily.co.uk>
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 (>= 1.5~)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://jna.dev.java.net/
Vcs-Git: git://git.debian.org/pkg-java/libjna-java.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/libjna-java.git;a=summary
Package: libjna-java
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, default-jre-headless | java2-runtime-headless
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libjna-java-doc
Description: Dynamic access of native libraries from Java without JNI
JNA provides Java programs easy access to native shared libraries without
diff --git a/debian/copyright b/debian/copyright
index 3f2745b..c6bb5a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,10 +4,12 @@ Download: https://jna.dev.java.net/
Files: *
Copyright:
(C) 1998 Sun Microsystems, Inc.
- (C) 2007-2009 Timothy Wall <twalljava at dev.java.net>
+ (C) 2007-2010 Timothy Wall <twalljava at dev.java.net>
(C) 2007 Thomas Boerkel
(C) 2007 Wayne Meissner
(C) 2007 Olivier Chafik
+ (C) 2010 Daniel Doubrovkine
+ (C) 2010 Digital Rapids Corp.
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/debian/libjna-java-doc.examples b/debian/libjna-java-doc.examples
deleted file mode 100644
index fcd28d3..0000000
--- a/debian/libjna-java-doc.examples
+++ /dev/null
@@ -1 +0,0 @@
-contrib/*
\ No newline at end of file
diff --git a/debian/patches/07-include-platform-jar.patch b/debian/patches/07-include-platform-jar.patch
new file mode 100644
index 0000000..00ba008
--- /dev/null
+++ b/debian/patches/07-include-platform-jar.patch
@@ -0,0 +1,61 @@
+Include a simple ant build file for the platform.jar part of the source. The next
+upstream version should already include this.
+
+Index: libjna-java-3.2.7/pom.xml
+===================================================================
+--- libjna-java-3.2.7.orig/pom.xml 2011-05-22 20:06:42.104338432 +0100
++++ libjna-java-3.2.7/pom.xml 2011-05-22 20:08:00.283504785 +0100
+@@ -33,6 +33,7 @@
+ <tasks>
+ <!--<ant dir="." target="dist" />-->
+ <attachArtifact file="dist/jna.jar" />
++ <attachArtifact file="dist/platform.jar" />
+ <attachArtifact file="dist/src-mvn.zip" classifier="sources" type="jar"/>
+ </tasks>
+ </configuration>
+@@ -64,4 +65,4 @@
+ <url>http://download.java.net/maven/2/</url>
+ </pluginRepository>
+ </pluginRepositories>
+-</project>
+\ No newline at end of file
++</project>
+Index: libjna-java-3.2.7/contrib/platform/build.xml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libjna-java-3.2.7/contrib/platform/build.xml 2011-05-22 21:07:10.743504899 +0100
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project name="platform" default="jar" basedir=".">
++
++ <property name="src" location="src"/>
++ <property name="build" location="build"/>
++ <property name="dist" location="../../build/"/>
++
++ <path id="classpath">
++ <fileset dir="${dist}" includes="jna.jar"/>
++ </path>
++
++ <target name="init">
++ <mkdir dir="${build}"/>
++ </target>
++
++ <target name="compile" depends="init" description="compile the source " >
++ <javac srcdir="${src}" destdir="${build}" classpathref="classpath"/>
++ </target>
++
++ <target name="jar" depends="compile" description="jar" >
++ <jar jarfile="${dist}/platform.jar" basedir="${build}"/>
++ </target>
++
++ <target name="javadoc">
++ <!-- we don't build the javadoc for now, this should all
++ be sorted in the next upstream release. -->
++ </target>
++
++ <target name="clean" description="clean" >
++ <delete dir="${build}"/>
++ <delete file="${dist}/platform.jar"/>
++ </target>
++</project>
++
diff --git a/debian/patches/series b/debian/patches/series
index f1abff9..59772d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04-load-native-code-from-fs.patch
05-support-gnu-kfreebsd.patch
06-remove-gjdoc-inexistent-options.patch
+07-include-platform-jar.patch
diff --git a/debian/rules b/debian/rules
index 827af0c..653f715 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,19 @@ override_dh_auto_clean:
ant -f build.xml clean; \
fi
rm -f build.number
+ rm -rf build doc
+ rm -rf contrib/platform/build
mh_clean
dh_clean
override_dh_auto_build:
- ant -f build.xml -Dcflags_extra.native="" -Ddynlink.native=true -Dnomixedjar.native=true -Djni.md5="" jar
+ ant -f build.xml -Dcflags_extra.native="" -Ddynlink.native=true -Dnomixedjar.native=true -Djni.md5="" jar contrib-jars
ant -f build.xml javadoc
+# install. using platform.jar is a silly idea in /usr/share/java/ as it's bound to collide
override_dh_auto_install:
mh_installjar -plibjna-java -l --usj-name=jna pom.xml build/jna.jar
+ mh_installjar -plibjna-java -l --usj-name=jna-platform pom.xml build/platform.jar
override_dh_makeshlibs:
# don't call dh_makeshlibs
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