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

[Emmanuel Bourg]

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 54b029d46536d85faab6554e57e5994bceb65a06
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 10 00:27:18 2018 +0100

    Refreshed the patches
---
 debian/changelog                                        | 4 +++-
 debian/patches/03-dynlink-and-cflags.patch              | 4 ++--
 debian/patches/06-remove-gjdoc-inexistent-options.patch | 2 +-
 debian/patches/09-javadoc.patch                         | 2 +-
 debian/patches/10-disable-full-jar.patch                | 6 +++---
 debian/patches/13-reproducible-javadoc.patch            | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9887110..aad4471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-libjna-java (4.5.0-3) UNRELEASED; urgency=medium
+libjna-java (4.5.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Standards-Version updated to 4.1.3
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 10 Jan 2018 00:20:00 +0100
diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch
index dc50378..c3f7567 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
-@@ -936,6 +936,19 @@
+@@ -946,6 +946,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}"
-@@ -947,15 +960,6 @@
+@@ -957,15 +970,6 @@
        <fileset dir="${build.native}"
                 includes="jnidispatch.dll,libjnidispatch.*"/>
      </copy>
diff --git a/debian/patches/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch
index 2c8d27f..1e3adfe 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
-@@ -1225,7 +1225,7 @@
+@@ -1235,7 +1235,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 e7a1b8a..cf23b13 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
-@@ -1208,7 +1208,7 @@
+@@ -1218,7 +1218,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 21c4f5d..07eb637 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
-@@ -414,6 +414,7 @@
+@@ -424,6 +424,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;
-@@ -478,10 +479,12 @@
+@@ -488,10 +489,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"/>
-@@ -560,6 +563,7 @@
+@@ -570,6 +573,7 @@
        <zipfileset src="${lib.native}/w32ce-arm.jar"
                    includes="*jnidispatch*"
                    prefix="com/sun/jna/w32ce-arm"/>
diff --git a/debian/patches/13-reproducible-javadoc.patch b/debian/patches/13-reproducible-javadoc.patch
index 2430b3c..bd2fbcf 100644
--- a/debian/patches/13-reproducible-javadoc.patch
+++ b/debian/patches/13-reproducible-javadoc.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -1206,7 +1206,8 @@
+@@ -1216,7 +1216,8 @@
               maxmemory="256m"
               packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.platform,com.sun.jna.platform.win32"
               overview="${src}/com/sun/jna/overview.html"

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