[rhino] 07/09: Removed the build.xml patches (not required)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jan 20 10:09:25 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository rhino.

commit 0de5e05a9831ff8a7e04c15b9aed41d07ad40684
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 20 10:25:26 2017 +0100

    Removed the build.xml patches (not required)
---
 debian/patches/01_rhino-nowarn.patch  | 20 --------------------
 debian/patches/02_exclude-jdk15.patch | 12 ------------
 debian/patches/series                 |  2 --
 3 files changed, 34 deletions(-)

diff --git a/debian/patches/01_rhino-nowarn.patch b/debian/patches/01_rhino-nowarn.patch
deleted file mode 100644
index 9cb3a45..0000000
--- a/debian/patches/01_rhino-nowarn.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Pass "nowarn" to javac ant task to disable printing of warning
- during compilation.
---- a/src/build.xml
-+++ b/src/build.xml
-@@ -32,6 +32,7 @@
-            includes="org/**/*.java"
-            excludes="org/**/jdk15/*.java"
-            deprecation="on"
-+           nowarn="true"
-            debug="${debug}"
-            includeAntRuntime="false"
-            encoding="UTF-8"
-@@ -51,6 +52,7 @@
-            destdir="${classes}"
-            includes="org/**/jdk15/*.java"
-            deprecation="on"
-+           nowarn="true"
-            debug="${debug}"
-            includeAntRuntime="false"
-            encoding="UTF-8"
diff --git a/debian/patches/02_exclude-jdk15.patch b/debian/patches/02_exclude-jdk15.patch
deleted file mode 100644
index 8727805..0000000
--- a/debian/patches/02_exclude-jdk15.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Exclude everything except "jdk1.5/**" when building
- 1.5 specific source code.
---- a/src/build.xml
-+++ b/src/build.xml
-@@ -50,6 +50,7 @@
-   <target name="compile-jdk15" if="jdk15">
-     <javac srcdir="src"
-            destdir="${classes}"
-+           excludes="org/**/*.java"
-            includes="org/**/jdk15/*.java"
-            deprecation="on"
-            nowarn="true"
diff --git a/debian/patches/series b/debian/patches/series
index 6552ab8..49135c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-01_rhino-nowarn.patch
-02_exclude-jdk15.patch
 03_public_getSourcePositionFromStack.patch
 05_modify-usage.patch
 06_preserve-backward-compatibility.patch

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



More information about the pkg-java-commits mailing list