[libjna-java] 02/05: Refreshed the patches

Fri Oct 2 23:00:53 UTC 2015

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 b4678289e24cf8d06aa4b4bba0fd715112599196
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Oct 3 00:25:45 2015 +0200

    Refreshed the patches
---
 debian/changelog                                         | 7 +++++++
 debian/patches/03-dynlink-and-cflags.patch               | 4 ++--
 debian/patches/04-load-native-code-from-fs.patch         | 4 ++--
 debian/patches/06-remove-gjdoc-inexistent-options.patch  | 2 +-
 debian/patches/09-javadoc.patch                          | 4 ++--
 debian/patches/10-disable-full-jar.patch                 | 6 +++---
 debian/patches/12-structure-backward-compatibility.patch | 4 ++--
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c22fb1b..91bd3ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjna-java (4.2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 03 Oct 2015 00:25:19 +0200
+
 libjna-java (4.1.0-1) unstable; urgency=low
 
   * Team upload
diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch
index bf17e3c..e74dede 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
-@@ -743,6 +743,19 @@
+@@ -814,6 +814,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}"
-@@ -754,15 +767,6 @@
+@@ -825,15 +838,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 3845b98..16fbfbe 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
-@@ -641,6 +641,30 @@
+@@ -731,6 +731,30 @@
      }
  
      /**
@@ -34,7 +34,7 @@ Author: Jan Dittberner <jandd at debian.org>
       * Loads the JNA stub library.
       * First tries jna.boot.library.path, then the system path, then from the
       * jar file.
-@@ -658,6 +682,9 @@
+@@ -748,6 +772,9 @@
  
          String libName = System.getProperty("jna.boot.library.name", "jnidispatch");
          String bootPath = System.getProperty("jna.boot.library.path");
diff --git a/debian/patches/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch
index de98997..3b62ade 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
-@@ -1008,7 +1008,7 @@
+@@ -1092,7 +1092,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 4d97063..31ed72b 100644
--- a/debian/patches/09-javadoc.patch
+++ b/debian/patches/09-javadoc.patch
@@ -2,11 +2,11 @@ Link javadoc to the default-jdk javadoc.
 
 --- a/build.xml
 +++ b/build.xml
-@@ -991,7 +991,7 @@
+@@ -1075,7 +1075,7 @@
        <doctitle>JNA API Documentation</doctitle>
        <header>${header}</header>
        <bottom>${footer}</bottom>
--      <link href="http://download.oracle.com/javase/1.4.2/docs/api/"/>
+-      <link href="http://download.oracle.com/javase/${compatibility}/docs/api/"/>
 +      <link href="/usr/share/doc/default-jdk-doc/api/"/>
  
        <packageset dir="${src}" defaultexcludes="yes">
diff --git a/debian/patches/10-disable-full-jar.patch b/debian/patches/10-disable-full-jar.patch
index 8ee6fcf..4295584 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
-@@ -364,6 +364,7 @@
+@@ -379,6 +379,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;
-@@ -412,10 +413,12 @@
+@@ -435,10 +436,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"/>
-@@ -476,6 +479,7 @@
+@@ -505,6 +508,7 @@
        <zipfileset src="${lib.native}/w32ce-arm.jar"
                    includes="*jnidispatch*"
                    prefix="com/sun/jna/w32ce-arm"/>
diff --git a/debian/patches/12-structure-backward-compatibility.patch b/debian/patches/12-structure-backward-compatibility.patch
index 559e2f5..c2dbb7a 100644
--- a/debian/patches/12-structure-backward-compatibility.patch
+++ b/debian/patches/12-structure-backward-compatibility.patch
@@ -40,9 +40,9 @@ Forwarded: not-needed
      /** Use the platform default alignment. */
      public static final int ALIGN_DEFAULT = 0;
      /** No alignment, place all fields on nearest 1-byte boundary */
-@@ -831,7 +859,32 @@
-      * field order as returned by {@link Class#getFields()} is not
+@@ -874,7 +902,32 @@
       * guaranteed to be predictable.
+      * @return ordered list of field names
       */
 -    protected abstract List getFieldOrder();
 +    protected List getFieldOrder() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjna-java.git

