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 e1e03f90c1de9d948f6a5244a5f9167099fa80bd Author: Emmanuel Bourg <[email protected]> Date: Wed Oct 15 15:21:06 2014 +0200 Refreshed the patches --- debian/changelog | 2 +- debian/patches/02-builddir.patch | 2 +- debian/patches/03-dynlink-and-cflags.patch | 4 ++-- debian/patches/04-load-native-code-from-fs.patch | 20 ++++++++++---------- debian/patches/05-support-gnu-kfreebsd.patch | 2 +- .../patches/06-remove-gjdoc-inexistent-options.patch | 6 +++--- debian/patches/09-javadoc.patch | 2 +- debian/patches/10-disable-full-jar.patch | 8 ++++---- debian/rules | 3 ++- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a43ebb..5c84f4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libjna-java (3.5.0-1) UNRELEASED; urgency=low +libjna-java (3.5.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 8d71cd9..afb3f6f 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 -@@ -158,7 +158,7 @@ +@@ -169,7 +169,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 206d285..d32cdd5 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 -@@ -665,6 +665,19 @@ +@@ -672,6 +672,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}/${native.path}"/> <copy todir="${classes}/${native.path}"> <fileset dir="${build.native}" -@@ -676,15 +689,6 @@ +@@ -683,15 +696,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 7722330..2fe2c86 100644 --- a/debian/patches/04-load-native-code-from-fs.patch +++ b/debian/patches/04-load-native-code-from-fs.patch @@ -3,13 +3,13 @@ Subject: try to load native library from /usr/lib/jni if system Author: Jan Dittberner <[email protected]> --- a/src/com/sun/jna/Native.java +++ b/src/com/sun/jna/Native.java -@@ -649,6 +649,9 @@ - - String libName = System.getProperty("jna.boot.library.name", "jnidispatch"); - String bootPath = System.getProperty("jna.boot.library.path"); -+ if (bootPath == null) { -+ bootPath = "/usr/lib/jni"; -+ } - if (bootPath != null) { - // String.split not available in 1.4 - StringTokenizer dirs = new StringTokenizer(bootPath, File.pathSeparator); +@@ -678,6 +678,9 @@ + + String libName = System.getProperty("jna.boot.library.name", "jnidispatch"); + String bootPath = System.getProperty("jna.boot.library.path"); ++ if (bootPath == null) { ++ bootPath = "/usr/lib/jni"; ++ } + if (bootPath != null) { + // String.split not available in 1.4 + StringTokenizer dirs = new StringTokenizer(bootPath, File.pathSeparator); diff --git a/debian/patches/05-support-gnu-kfreebsd.patch b/debian/patches/05-support-gnu-kfreebsd.patch index d217938..d24b729 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/OpenBSD/openbsd/g' \ --- a/build.xml +++ b/build.xml -@@ -191,6 +191,9 @@ +@@ -202,6 +202,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 b921ea0..6cc4873 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 -@@ -900,7 +900,7 @@ +@@ -923,7 +923,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> - </target> - + <jar jarfile="${platform-javadoc-jar}"> + <fileset dir="${javadoc}" /> diff --git a/debian/patches/09-javadoc.patch b/debian/patches/09-javadoc.patch index 4a55247..e7f751a 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 -@@ -883,7 +883,7 @@ +@@ -906,7 +906,7 @@ <doctitle>JNA API Documentation</doctitle> <header>${header}</header> <bottom>${footer}</bottom> diff --git a/debian/patches/10-disable-full-jar.patch b/debian/patches/10-disable-full-jar.patch index 7943c5e..083f64a 100644 --- a/debian/patches/10-disable-full-jar.patch +++ b/debian/patches/10-disable-full-jar.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.xml +++ b/build.xml -@@ -315,6 +315,7 @@ +@@ -327,6 +327,7 @@ <!-- Note that no terminal "*" is included in this list, which will force failure on unsupported platforms. --> @@ -11,9 +11,9 @@ Forwarded: not-needed <attribute name="Bundle-NativeCode" value=" com/sun/jna/win32-x86/jnidispatch.dll; -@@ -361,10 +362,12 @@ +@@ -373,10 +374,12 @@ com/sun/jna/darwin/libjnidispatch.jnilib; - osname=macos + osname=macosx;processor=x86;processor=x86-64;processor=ppc "/> +--> </manifest> @@ -24,7 +24,7 @@ Forwarded: not-needed <zipfileset src="${lib.native}/win32-x86.jar" includes="*jnidispatch*" prefix="com/sun/jna/win32-x86"/> -@@ -422,6 +425,7 @@ +@@ -434,6 +437,7 @@ <zipfileset src="${lib.native}/w32ce-arm.jar" includes="*jnidispatch*" prefix="com/sun/jna/w32ce-arm"/> diff --git a/debian/rules b/debian/rules index adbbe2a..7e4f127 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') dh $@ override_dh_auto_clean: - ant -f build.xml clean + ant -f build.xml -Dmaven-release=true clean rm -f build.number rm -rf build doc rm -rf contrib/platform/build @@ -27,6 +27,7 @@ override_dh_auto_build: -Dnomixedjar.native=true \ -Djni.md5="" \ -Djar.compress=true \ + -Dmaven-release=true \ jar javadoc contrib-jars native # install. using platform.jar is a silly idea in /usr/share/java/ as it's bound to collide -- 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
