[libjna-java] 02/04: 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 76e33f2d180a72cdd1937f77e4e1168b6d70bb01
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 3 23:28:13 2015 +0100

    Refreshed the patches
---
 debian/changelog                                        | 8 ++++++++
 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                | 4 ++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb90358..808b9a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libjna-java (4.2.1-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 03 Nov 2015 23:27:46 +0100
+
 libjna-java (4.2.0-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/03-dynlink-and-cflags.patch b/debian/patches/03-dynlink-and-cflags.patch
index e74dede..2392ec8 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
-@@ -814,6 +814,19 @@
+@@ -827,6 +827,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}"
-@@ -825,15 +838,6 @@
+@@ -838,15 +851,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 3b62ade..35c05ae 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
-@@ -1092,7 +1092,7 @@
+@@ -1105,7 +1105,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 31ed72b..ba9ba4a 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
-@@ -1075,7 +1075,7 @@
+@@ -1088,7 +1088,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 4295584..ae8d637 100644
--- a/debian/patches/10-disable-full-jar.patch
+++ b/debian/patches/10-disable-full-jar.patch
@@ -11,7 +11,7 @@ Forwarded: not-needed
          <attribute name="Bundle-NativeCode"
                     value="
  com/sun/jna/win32-x86/jnidispatch.dll;
-@@ -435,10 +436,12 @@
+@@ -437,10 +438,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"/>
-@@ -505,6 +508,7 @@
+@@ -510,6 +513,7 @@
        <zipfileset src="${lib.native}/w32ce-arm.jar"
                    includes="*jnidispatch*"
                    prefix="com/sun/jna/w32ce-arm"/>

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