[libjna-java] 04/05: Removed the contradicting javadoc 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 c25e08b0ef5f94a80bfc04dc3ca9e78d7e1a73c0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 10 00:32:45 2018 +0100

    Removed the contradicting javadoc patches
---
 debian/changelog                                        |  1 +
 debian/patches/06-remove-gjdoc-inexistent-options.patch | 14 --------------
 debian/patches/13-reproducible-javadoc.patch            | 15 ---------------
 debian/patches/series                                   |  2 --
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aad4471..0bc83d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libjna-java (4.5.1-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Removed the contradicting javadoc 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/06-remove-gjdoc-inexistent-options.patch b/debian/patches/06-remove-gjdoc-inexistent-options.patch
deleted file mode 100644
index 1e3adfe..0000000
--- a/debian/patches/06-remove-gjdoc-inexistent-options.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Jan Dittberner <jandd at debian.org>
-Subject: disable javadoc options that are not supported by gjdoc
-
---- a/build.xml
-+++ b/build.xml
-@@ -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.*"/>
- 
--      <arg value="-notimestamp"/>
-+      <!--<arg value="-notimestamp"/>-->
-     </javadoc>
-     <jar jarfile="${platform-javadoc-jar}">
-       <fileset dir="${javadoc}" />
diff --git a/debian/patches/13-reproducible-javadoc.patch b/debian/patches/13-reproducible-javadoc.patch
deleted file mode 100644
index bd2fbcf..0000000
--- a/debian/patches/13-reproducible-javadoc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Set the locale and remove the timestamps when generating the javadoc to make it reproducible
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/build.xml
-+++ b/build.xml
-@@ -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"
--             additionalparam="${javadoc.opts}"
-+             additionalparam="${javadoc.opts} -notimestamp"
-+             locale="en"
-              destdir="${javadoc}">
-       <!-- stylesheetfile="${stylesheet}" -->
-       <doctitle>JNA API Documentation</doctitle>
diff --git a/debian/patches/series b/debian/patches/series
index 8c1e29f..3d63c0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,8 @@
 #01-nbproject.patch
 03-dynlink-and-cflags.patch
 04-load-native-code-from-fs.patch
-06-remove-gjdoc-inexistent-options.patch
 09-javadoc.patch
 10-disable-full-jar.patch
 12-structure-backward-compatibility.patch
-13-reproducible-javadoc.patch
 14-rename-native-library.patch
 15-java9-compatibility.patch

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