[SCM] Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI branch, master, updated. debian/3.2.7-4-6-g4dcbc62
Andrew Ross
ubuntu at rossfamily.co.uk
Sun Jul 22 18:16:26 UTC 2012
The following commit has been merged in the master branch:
commit 674c91d0409d09021f580b7460b03857b17445a8
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date: Mon Jul 16 19:55:44 2012 +0100
Updated for upstream version 3.3.0
diff --git a/debian/changelog b/debian/changelog
index cacfb58..ce955fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libjna-java (3.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+ * Bump standards version (no changes required).
+ * Link javadoc to default-jdk API
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Mon, 16 Jul 2012 18:17:37 +0100
+
libjna-java (3.2.7-4) unstable; urgency=low
* Remove optional build time dependency on openjdk-6-jdk (depend on
diff --git a/debian/control b/debian/control
index 14d6eec..527a87d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Michael Koch <konqueror at gmx.de>, Jan Dittberner <jandd at debian.org>,
Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant,
ant-optional, libx11-dev, libxt-dev, libffi-dev, pkg-config,
maven-repo-helper (>= 1.5~), javahelper (>=0.32~)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
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
diff --git a/debian/patches/01-nbproject.patch b/debian/patches/01-nbproject.patch
index 9898ace..8762755 100644
--- a/debian/patches/01-nbproject.patch
+++ b/debian/patches/01-nbproject.patch
@@ -3,7 +3,7 @@ Description: fix build.xml to remove nbproject usage as we don't have it.
--- a/build.xml
+++ b/build.xml
-@@ -647,7 +647,6 @@
+@@ -663,7 +663,6 @@
<zipfileset src="${dist}/src.zip"/>
<zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
<zipfileset dir="." includes=".classpath,.project"/>
diff --git a/debian/patches/02-builddir.patch b/debian/patches/02-builddir.patch
index 7cea4e6..df18222 100644
--- a/debian/patches/02-builddir.patch
+++ b/debian/patches/02-builddir.patch
@@ -3,7 +3,7 @@ Description: no special build dir for d64
--- a/build.xml
+++ b/build.xml
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
<equals arg1="${vm.arch}" arg2="-d64"/>
</and>
</condition>
diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch
index 0d449ac..cbacd1b 100644
--- a/debian/patches/03-dynlink-and-cflags.patch
+++ b/debian/patches/03-dynlink-and-cflags.patch
@@ -3,7 +3,7 @@ Description: dynlink and cflags
--- a/build.xml
+++ b/build.xml
-@@ -393,6 +393,19 @@
+@@ -398,6 +398,19 @@
<arg value="JNA_JNI_VERSION=${jni.version}"/>
<arg value="CHECKSUM=${jni.md5}"/>
</exec>
@@ -23,7 +23,7 @@ Description: dynlink and cflags
<mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
<copy todir="${classes}/com/sun/jna/${os.prefix}">
<fileset dir="${build.native}"
-@@ -404,15 +417,6 @@
+@@ -409,15 +422,6 @@
<fileset dir="${build.native}"
includes="jnidispatch.dll,libjnidispatch.*"/>
</copy>
diff --git a/debian/patches/04-load-native-code-from-fs.patch b/debian/patches/04-load-native-code-from-fs.patch
index 38d7ebf..60b3208 100644
--- a/debian/patches/04-load-native-code-from-fs.patch
+++ b/debian/patches/04-load-native-code-from-fs.patch
@@ -3,7 +3,7 @@ Subject: try to load native library from /usr/lib/jni if system
Author: Jan Dittberner <jandd at debian.org>
--- a/src/com/sun/jna/Native.java
+++ b/src/com/sun/jna/Native.java
-@@ -648,6 +648,9 @@
+@@ -662,6 +662,9 @@
private static void loadNativeLibrary() {
String libName = "jnidispatch";
String bootPath = System.getProperty("jna.boot.library.path");
diff --git a/debian/patches/05-support-gnu-kfreebsd.patch b/debian/patches/05-support-gnu-kfreebsd.patch
index 33de6d1..3bad352 100644
--- a/debian/patches/05-support-gnu-kfreebsd.patch
+++ b/debian/patches/05-support-gnu-kfreebsd.patch
@@ -13,7 +13,7 @@ Subject: patch build.xml and native/Makefile to support Debian GNU/kFreeBSD
-e 's/Darwin.*/darwin/g' \
--- a/build.xml
+++ b/build.xml
-@@ -129,6 +129,9 @@
+@@ -130,6 +130,9 @@
<condition property="os.prefix" value="freebsd-${os.arch}">
<os name="FreeBSD"/>
</condition>
diff --git a/debian/patches/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch
index 8afd952..a52c08f 100644
--- a/debian/patches/06-remove-gjdoc-inexistent-options.patch
+++ b/debian/patches/06-remove-gjdoc-inexistent-options.patch
@@ -3,12 +3,12 @@ Subject: disable javadoc options that are not supported by gjdoc
--- a/build.xml
+++ b/build.xml
-@@ -562,7 +562,7 @@
- <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
- <group title="Platform Specific" packages="com.sun.jna.platform"/>
+@@ -582,7 +582,7 @@
+ <group title="Platform Utilities" packages="com.sun.jna.platform,com.sun.jna.platform.dnd"/>
+ <group title="Platform Specific" packages="com.sun.jna.platform.*"/>
- <arg value="-notimestamp"/>
+ <!--arg value="-notimestamp"/-->
</javadoc>
- <subant target="javadoc">
- <fileset dir="${contrib}" includes="platform/build.xml"/>
+ </target>
+
diff --git a/debian/patches/07-include-platform-jar.patch b/debian/patches/07-include-platform-jar.patch
index fc0ea23..edb5549 100644
--- a/debian/patches/07-include-platform-jar.patch
+++ b/debian/patches/07-include-platform-jar.patch
@@ -1,29 +1,8 @@
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-06-03 18:23:26.431989502 +0100
+--- /dev/null
++++ b/contrib/platform/build.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="platform" default="jar" basedir=".">
diff --git a/debian/patches/08-multiarch-support.patch b/debian/patches/08-multiarch-support.patch
index 29c6d23..2a0fc68 100644
--- a/debian/patches/08-multiarch-support.patch
+++ b/debian/patches/08-multiarch-support.patch
@@ -1,7 +1,5 @@
-Index: libjna-java-3.2.7/src/com/sun/jna/Platform.java
-===================================================================
---- libjna-java-3.2.7.orig/src/com/sun/jna/Platform.java 2009-07-07 05:41:18.000000000 +0100
-+++ libjna-java-3.2.7/src/com/sun/jna/Platform.java 2011-05-25 23:24:11.725855192 +0100
+--- a/src/com/sun/jna/Platform.java
++++ b/src/com/sun/jna/Platform.java
@@ -99,4 +99,57 @@
}
return Native.POINTER_SIZE == 8;
@@ -60,11 +58,9 @@ Index: libjna-java-3.2.7/src/com/sun/jna/Platform.java
+ }
+ }
}
-Index: libjna-java-3.2.7/src/com/sun/jna/NativeLibrary.java
-===================================================================
---- libjna-java-3.2.7.orig/src/com/sun/jna/NativeLibrary.java 2010-07-19 08:57:18.000000000 +0100
-+++ libjna-java-3.2.7/src/com/sun/jna/NativeLibrary.java 2011-05-25 23:27:45.045855352 +0100
-@@ -618,7 +618,7 @@
+--- a/src/com/sun/jna/NativeLibrary.java
++++ b/src/com/sun/jna/NativeLibrary.java
+@@ -634,7 +634,7 @@
// 64bit machines, so we have to explicitly search the 64bit one when
// running a 64bit JVM.
//
@@ -73,7 +69,7 @@ Index: libjna-java-3.2.7/src/com/sun/jna/NativeLibrary.java
// Linux & FreeBSD use /usr/lib32, solaris uses /usr/lib/32
archPath = (Platform.isSolaris() ? "/" : "") + Pointer.SIZE * 8;
}
-@@ -628,11 +628,48 @@
+@@ -644,11 +644,48 @@
"/usr/lib",
"/lib",
};
@@ -98,11 +94,11 @@ Index: libjna-java-3.2.7/src/com/sun/jna/NativeLibrary.java
+ cpu + "-" + kernel + "-" + libc;
+
+ // Assemble path with all possible options
-+ paths = new String[] {
+ paths = new String[] {
+ "/usr/lib/" + multiArchPath,
+ "/lib/" + multiArchPath,
-+ "/usr/lib" + archPath,
-+ "/lib" + archPath,
+ "/usr/lib" + archPath,
+ "/lib" + archPath,
+ "/usr/lib",
+ "/lib",
+ };
@@ -114,21 +110,19 @@ Index: libjna-java-3.2.7/src/com/sun/jna/NativeLibrary.java
+ cpu + "-" + libc;
+
+ // Assemble path with all possible options
- paths = new String[] {
++ paths = new String[] {
+ "/usr/lib/" + multiArchPath,
+ "/lib/" + multiArchPath,
- "/usr/lib" + archPath,
- "/lib" + archPath,
++ "/usr/lib" + archPath,
++ "/lib" + archPath,
+ "/usr/lib",
+ "/lib",
};
}
for (int i=0;i < paths.length;i++) {
-Index: libjna-java-3.2.7/build.xml
-===================================================================
---- libjna-java-3.2.7.orig/build.xml 2011-05-25 21:26:05.084188334 +0100
-+++ libjna-java-3.2.7/build.xml 2011-05-25 21:28:42.574188163 +0100
-@@ -72,6 +72,8 @@
+--- a/build.xml
++++ b/build.xml
+@@ -73,6 +73,8 @@
<echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
<echo>java.home=${java.home}</echo>
<echo>java.library.path=${java.library.path}</echo>
diff --git a/debian/patches/09-javadoc.patch b/debian/patches/09-javadoc.patch
new file mode 100644
index 0000000..a481f90
--- /dev/null
+++ b/debian/patches/09-javadoc.patch
@@ -0,0 +1,13 @@
+Link javadoc to the default-jdk javadoc.
+
+--- a/build.xml
++++ b/build.xml
+@@ -567,7 +567,7 @@
+ <doctitle>JNA API Documentation</doctitle>
+ <header>${header}</header>
+ <bottom>${footer}</bottom>
+- <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
++ <link href="/usr/share/doc/default-jdk-doc/api"/>
+
+ <packageset dir="${src}" defaultexcludes="yes">
+ <patternset>
diff --git a/debian/patches/series b/debian/patches/series
index 7d354a1..7391929 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
06-remove-gjdoc-inexistent-options.patch
07-include-platform-jar.patch
08-multiarch-support.patch
+09-javadoc.patch
--
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