This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjna-java.
commit 5a7cc5fa030834af407d3eb770c975ff66676aca Author: Emmanuel Bourg <[email protected]> Date: Wed Oct 15 00:16:50 2014 +0200 Refreshed the patches --- debian/changelog | 2 +- debian/patches/02-builddir.patch | 2 +- debian/patches/03-dynlink-and-cflags.patch | 10 ++--- debian/patches/05-support-gnu-kfreebsd.patch | 4 +- .../06-remove-gjdoc-inexistent-options.patch | 2 +- debian/patches/07-include-platform-jar.patch | 52 ---------------------- debian/patches/08-multiarch-support.patch | 2 +- debian/patches/09-javadoc.patch | 2 +- debian/patches/series | 1 - 9 files changed, 12 insertions(+), 65 deletions(-) diff --git a/debian/changelog b/debian/changelog index b20d23f..1d160aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libjna-java (3.4.1-1) UNRELEASED; urgency=low +libjna-java (3.4.2-1) UNRELEASED; urgency=low [ Andrew Ross ] * New upstream release (Closes: #733488) diff --git a/debian/patches/02-builddir.patch b/debian/patches/02-builddir.patch index 927cd2f..f4cd481 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 -@@ -136,7 +136,7 @@ +@@ -140,7 +140,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 f6afd08..24cbd1f 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 -@@ -487,6 +487,19 @@ +@@ -489,6 +489,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}" -@@ -498,15 +511,6 @@ +@@ -500,15 +513,6 @@ <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/> </copy> @@ -36,6 +36,6 @@ Description: dynlink and cflags - <attribute name="Specification-Version" value="${jni.version}"/> - </manifest> - </jar> - </target> - - <target name="compile-tests" depends="compile,native,jar" + <copy todir="${lib.native}"> + <fileset dir="${build}" includes="${native.jar}"/> + </copy> diff --git a/debian/patches/05-support-gnu-kfreebsd.patch b/debian/patches/05-support-gnu-kfreebsd.patch index 0297733..aa47326 100644 --- a/debian/patches/05-support-gnu-kfreebsd.patch +++ b/debian/patches/05-support-gnu-kfreebsd.patch @@ -3,7 +3,7 @@ Subject: patch build.xml and native/Makefile to support Debian GNU/kFreeBSD --- a/native/Makefile +++ b/native/Makefile -@@ -37,6 +37,7 @@ +@@ -32,6 +32,7 @@ OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \ -e 's/MINGW32.*/win32/g' \ -e 's/SunOS.*/solaris/g' \ @@ -13,7 +13,7 @@ Subject: patch build.xml and native/Makefile to support Debian GNU/kFreeBSD -e 's/OpenBSD/openbsd/g' \ --- a/build.xml +++ b/build.xml -@@ -169,6 +169,9 @@ +@@ -173,6 +173,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 91439e1..ce2beeb 100644 --- a/debian/patches/06-remove-gjdoc-inexistent-options.patch +++ b/debian/patches/06-remove-gjdoc-inexistent-options.patch @@ -3,7 +3,7 @@ Subject: disable javadoc options that are not supported by gjdoc --- a/build.xml +++ b/build.xml -@@ -704,7 +704,7 @@ +@@ -712,7 +712,7 @@ <group title="Platform Utilities" packages="com.sun.jna.platform,com.sun.jna.platform.dnd"/> <group title="Platform Specific" packages="com.sun.jna.platform.*"/> diff --git a/debian/patches/07-include-platform-jar.patch b/debian/patches/07-include-platform-jar.patch deleted file mode 100644 index f84bce4..0000000 --- a/debian/patches/07-include-platform-jar.patch +++ /dev/null @@ -1,52 +0,0 @@ -Include a simple ant build file for the platform.jar part of the source. The next -upstream version should already include this. - ---- /dev/null -+++ b/contrib/platform/build.xml -@@ -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}/jna-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}/jna-platform.jar"/> -+ </target> -+</project> -+ ---- a/build.xml -+++ b/build.xml -@@ -291,9 +291,6 @@ - <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/> - <zipfileset dir="${contrib}/platform" includes="**/*.java"/> - </zip> -- <jar jarfile="${platform-javadoc-jar}"> -- <fileset dir="${javadoc}" /> -- </jar> - </target> - - <target name="contrib-jars" depends="platform-jar" description="Build contrib jars"> diff --git a/debian/patches/08-multiarch-support.patch b/debian/patches/08-multiarch-support.patch index 1e11822..0628cce 100644 --- a/debian/patches/08-multiarch-support.patch +++ b/debian/patches/08-multiarch-support.patch @@ -2,7 +2,7 @@ Support all Debian multi-arch directories in library lookups. --- a/build.xml +++ b/build.xml -@@ -210,6 +210,8 @@ +@@ -214,6 +214,8 @@ <echo>java.home=${java.home}</echo> <echo>java.library.path=${java.library.path}</echo> <echo>os.prefix=${os.prefix}</echo> diff --git a/debian/patches/09-javadoc.patch b/debian/patches/09-javadoc.patch index bb99829..030186d 100644 --- a/debian/patches/09-javadoc.patch +++ b/debian/patches/09-javadoc.patch @@ -2,7 +2,7 @@ Link javadoc to the default-jdk javadoc. --- a/build.xml +++ b/build.xml -@@ -686,7 +686,7 @@ +@@ -697,7 +697,7 @@ <doctitle>JNA API Documentation</doctitle> <header>${header}</header> <bottom>${footer}</bottom> diff --git a/debian/patches/series b/debian/patches/series index e1b1a5d..b7299b0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,5 @@ 04-load-native-code-from-fs.patch 05-support-gnu-kfreebsd.patch 06-remove-gjdoc-inexistent-options.patch -07-include-platform-jar.patch 08-multiarch-support.patch 09-javadoc.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjna-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
