[libjna-java] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 15 15:42:12 BST 2014
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 025d6a82fc3dde1269c45ec5efbf7c7bcba3265f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Oct 15 16:39:42 2014 +0200
Refreshed the patches
---
debian/changelog | 6 ++--
debian/patches/03-dynlink-and-cflags.patch | 4 +--
debian/patches/04-load-native-code-from-fs.patch | 20 ++++++------
.../06-remove-gjdoc-inexistent-options.patch | 2 +-
debian/patches/09-javadoc.patch | 2 +-
debian/patches/10-disable-full-jar.patch | 6 ++--
.../patches/11-remove-non-ascii-from-javadoc.patch | 38 ++++++++++++++++++++++
debian/patches/series | 3 +-
8 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5c84f4d..41c03c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libjna-java (3.5.2-1) UNRELEASED; urgency=low
+libjna-java (4.0.0-1) UNRELEASED; urgency=low
[ Andrew Ross ]
* New upstream release (Closes: #733488)
@@ -10,8 +10,10 @@ libjna-java (3.5.2-1) UNRELEASED; urgency=low
* Update d/watch for new upstream location
[ Emmanuel Bourg ]
- * Refreshed the patches (up to version 3.5.0)
+ * Refreshed the patches (up to version 4.0.0)
* Removed 08-multiarch-support.patch (merged upstream since jna 3.5.0)
+ * Removed 02-builddir.patch (merged upstream since 4.0.0)
+ * Removed 05-support-gnu-kfreebsd.patch (merged upstream since 4.0.0)
* Moved libjnidispatch.so into its own new arch any libjna-jni package
* Install libjnidispatch.so in a multiarch path
* Install the Maven artifacts for the platform jar (Closes: #743732)
diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch
index d32cdd5..15b4ac0 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
-@@ -672,6 +672,19 @@
+@@ -735,6 +735,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}"
-@@ -683,15 +696,6 @@
+@@ -746,15 +759,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 2fe2c86..afaaf2a 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 <jandd at debian.org>
--- a/src/com/sun/jna/Native.java
+++ b/src/com/sun/jna/Native.java
-@@ -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);
+@@ -658,6 +658,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/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch
index 6cc4873..a43d47d 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
-@@ -923,7 +923,7 @@
+@@ -986,7 +986,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/09-javadoc.patch b/debian/patches/09-javadoc.patch
index e7f751a..5153b09 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
-@@ -906,7 +906,7 @@
+@@ -969,7 +969,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 083f64a..8ee6fcf 100644
--- a/debian/patches/10-disable-full-jar.patch
+++ b/debian/patches/10-disable-full-jar.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -327,6 +327,7 @@
+@@ -364,6 +364,7 @@
<!-- Note that no terminal "*" is included in this list,
which will force failure on unsupported platforms.
-->
@@ -11,7 +11,7 @@ Forwarded: not-needed
<attribute name="Bundle-NativeCode"
value="
com/sun/jna/win32-x86/jnidispatch.dll;
-@@ -373,10 +374,12 @@
+@@ -412,10 +413,12 @@
com/sun/jna/darwin/libjnidispatch.jnilib;
osname=macosx;processor=x86;processor=x86-64;processor=ppc
"/>
@@ -24,7 +24,7 @@ Forwarded: not-needed
<zipfileset src="${lib.native}/win32-x86.jar"
includes="*jnidispatch*"
prefix="com/sun/jna/win32-x86"/>
-@@ -434,6 +437,7 @@
+@@ -476,6 +479,7 @@
<zipfileset src="${lib.native}/w32ce-arm.jar"
includes="*jnidispatch*"
prefix="com/sun/jna/w32ce-arm"/>
diff --git a/debian/patches/11-remove-non-ascii-from-javadoc.patch b/debian/patches/11-remove-non-ascii-from-javadoc.patch
new file mode 100644
index 0000000..1d9344c
--- /dev/null
+++ b/debian/patches/11-remove-non-ascii-from-javadoc.patch
@@ -0,0 +1,38 @@
+From 91a9bd6ab3110841597cd0cad5ff4e0f97bc4b4d Mon Sep 17 00:00:00 2001
+From: Timothy Wall <twalljava at java.net>
+Date: Sat, 6 Jul 2013 09:16:27 -0400
+Subject: [PATCH] remove non-ascii from javadoc
+
+---
+ contrib/platform/src/com/sun/jna/platform/win32/Shell32.java | 2 +-
+ contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java b/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java
+index b62c8d6..b9df1e7 100644
+--- a/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java
++++ b/contrib/platform/src/com/sun/jna/platform/win32/Shell32.java
+@@ -181,7 +181,7 @@ INT_PTR ShellExecute(HWND hwnd, String lpOperation, String lpFile, String lpPara
+ * {@link ShellAPI#ABM_QUERYPOS} Requests a size and screen position for an appbar.
+ * {@link ShellAPI#ABM_SETPOS} Sets the size and screen position of an appbar.
+ * {@link ShellAPI#ABM_GETSTATE} Retrieves the autohide and always-on-top states of the Windows taskbar.
+- * {@link ShellAPI#ABM_GETTASKBARPOS} Retrieves the bounding rectangle of the Windows taskbar. Note that this applies only to the system taskbar. Other objects, particularly toolbars supplied with third-party software, also can be present. As a result, some of the screen area not covered by the Windows taskbar might not be visible to the user. To retrieve the area of the screen not covered by both the taskbar and other app bars�the working area available to your application�, use [...]
++ * {@link ShellAPI#ABM_GETTASKBARPOS} Retrieves the bounding rectangle of the Windows taskbar. Note that this applies only to the system taskbar. Other objects, particularly toolbars supplied with third-party software, also can be present. As a result, some of the screen area not covered by the Windows taskbar might not be visible to the user. To retrieve the area of the screen not covered by both the taskbar and other app bars -- the working area available to your application -- [...]
+ * {@link ShellAPI#ABM_ACTIVATE} Notifies the system to activate or deactivate an appbar. The lParam member of the APPBARDATA pointed to by pData is set to TRUE to activate or FALSE to deactivate.
+ * {@link ShellAPI#ABM_GETAUTOHIDEBAR} Retrieves the handle to the autohide appbar associated with a particular edge of the screen.
+ * {@link ShellAPI#ABM_SETAUTOHIDEBAR} Registers or unregisters an autohide appbar for an edge of the screen.
+diff --git a/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java b/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java
+index 0ce4611..fcfd56e 100644
+--- a/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java
++++ b/contrib/platform/src/com/sun/jna/platform/win32/ShellAPI.java
+@@ -149,8 +149,8 @@ public String encodePaths(String[] paths) {
+ * supplied with third-party software, also can be present. As a result,
+ * some of the screen area not covered by the Windows taskbar might not be
+ * visible to the user. To retrieve the area of the screen not covered by
+- * both the taskbar and other app bars�the working area available to your
+- * application�, use the GetMonitorInfo function.
++ * both the taskbar and other app bars -- the working area available to your
++ * application --, use the GetMonitorInfo function.
+ */
+ int ABM_ACTIVATE = 0x00000006;
+ /**
diff --git a/debian/patches/series b/debian/patches/series
index 4d77cc5..c5e6801 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
#01-nbproject.patch
-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
09-javadoc.patch
10-disable-full-jar.patch
+11-remove-non-ascii-from-javadoc.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjna-java.git
More information about the pkg-java-commits
mailing list