[findbugs] 05/18: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Aug 10 17:55:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository findbugs.
commit 196a310322318f6bbfc889cee17a2becc3380d71
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Aug 10 09:54:39 2016 +0200
Refreshed the patches
---
debian/changelog | 4 +++-
.../patches/0001-FixLibraryDependency-RemoveAppleGUI.patch | 12 ++++++------
debian/patches/0007-FixManifest.patch | 10 +++++-----
debian/patches/0010-bcel-for-version3.patch | 11 -----------
debian/patches/0012-verbose-tests.patch | 4 ++--
debian/patches/0013-dont-fetch-external-libraries.patch | 14 ++++++++++++++
debian/patches/0014-asm-compatibility.patch | 13 +++++++++++++
debian/patches/series | 2 ++
8 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 515418d..1d978d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-findbugs (3.0.1-3) UNRELEASED; urgency=medium
+findbugs (3.1.0~preview2-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed the patches
* debian/watch: Track the release tags on GitHub
* Standards-Version updated to 3.9.8
* Use secure Vcs-* URLs
diff --git a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
index 239c7b1..6da9273 100644
--- a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
+++ b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
@@ -26,7 +26,7 @@ unchanged:
# is installed. (Note: this is disabled for now.)
--- a/build.xml
+++ b/build.xml
-@@ -60,12 +60,24 @@
+@@ -61,12 +61,24 @@
<path id="findbugs.classpath">
<fileset dir="${jar.dir}" includes="*.jar"/>
@@ -52,7 +52,7 @@ unchanged:
<path refid="findbugs.classpath"/>
</path>
-@@ -298,8 +310,8 @@
+@@ -302,8 +314,8 @@
<fileset dir="${src.dir}">
<include name="**/annotations/*.java"/>
</fileset>
@@ -61,9 +61,9 @@ unchanged:
+ <zipfileset src="${sys.jar.dir}/jcip.jar" excludes="META-INF/**,**/*.html"/>
+ <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
</jar>
- </target>
-@@ -645,14 +657,12 @@
+ <!-- FindBugs only annotations jar file. -->
+@@ -659,14 +671,12 @@
</target>
@@ -79,7 +79,7 @@ unchanged:
</java>
<loadproperties srcfile="${version.props.file}"/>
-@@ -943,16 +953,15 @@
+@@ -957,16 +967,15 @@
<!-- Generate jnlp jars -->
<target name="jnlp" depends="jars">
<copy todir="${jnlp.dir}" file="${engine.jar}"/>
@@ -105,7 +105,7 @@ unchanged:
<copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>
<copy todir="${jnlp.dir}">
<fileset refid="plugin.jars"/>
-@@ -1212,7 +1221,7 @@
+@@ -1226,7 +1235,7 @@
<target name="annotationJavadoc">
<javadoc access="public"
diff --git a/debian/patches/0007-FixManifest.patch b/debian/patches/0007-FixManifest.patch
index 4d7f525..42183fa 100644
--- a/debian/patches/0007-FixManifest.patch
+++ b/debian/patches/0007-FixManifest.patch
@@ -1,14 +1,14 @@
--- a/etc/MANIFEST-findbugsGUI.MF
+++ b/etc/MANIFEST-findbugsGUI.MF
@@ -1,3 +1,3 @@
- Manifest-Version: 1.0
- Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
--Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
-+Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar plastic.jar
+ Manifest-Version: 1.0
+ Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
+-Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
++Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar plastic.jar
--- a/etc/MANIFEST-findbugs.MF
+++ b/etc/MANIFEST-findbugs.MF
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
--Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
+-Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-6.0-SNAPSHOT.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
+Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar
diff --git a/debian/patches/0010-bcel-for-version3.patch b/debian/patches/0010-bcel-for-version3.patch
index ba4100f..ec72d47 100644
--- a/debian/patches/0010-bcel-for-version3.patch
+++ b/debian/patches/0010-bcel-for-version3.patch
@@ -1,14 +1,3 @@
---- a/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-+++ b/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-@@ -50,7 +50,7 @@
- * @see Frame
- * @see DataflowAnalysis
- */
--public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements VisitorSupportsInvokeDynamic {
-+public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements Visitor {
- private FrameType frame;
-
- private Location location;
--- a/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
+++ b/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
@@ -50,6 +50,7 @@
diff --git a/debian/patches/0012-verbose-tests.patch b/debian/patches/0012-verbose-tests.patch
index 1adadf0..2de8cb4 100644
--- a/debian/patches/0012-verbose-tests.patch
+++ b/debian/patches/0012-verbose-tests.patch
@@ -1,6 +1,6 @@
--- a/build.xml
+++ b/build.xml
-@@ -78,6 +78,7 @@
+@@ -79,6 +79,7 @@
<pathelement location="${classes.dir}"/>
<pathelement location="${jar.dir}/findbugs.jar"/>
<pathelement location="${sys.jar.dir}/jdepend.jar"/>
@@ -8,7 +8,7 @@
<path refid="findbugs.classpath"/>
</path>
-@@ -597,7 +598,7 @@
+@@ -611,7 +612,7 @@
<echo>Running JUnit test cases for FindBugs, results will be in: ${junit.dir}</echo>
<delete dir="${junit.dir}"/>
<mkdir dir="${junit.dir}"/>
diff --git a/debian/patches/0013-dont-fetch-external-libraries.patch b/debian/patches/0013-dont-fetch-external-libraries.patch
new file mode 100644
index 0000000..4fb4418
--- /dev/null
+++ b/debian/patches/0013-dont-fetch-external-libraries.patch
@@ -0,0 +1,14 @@
+Description: Do not download ASM 6 and BCEL 6
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -1190,7 +1190,7 @@
+ </delete>
+ </target>
+
+- <target name="init" depends="properties,getasm6,getbcel6">
++ <target name="init" depends="properties">
+ <mkdir dir="${scripts.dir}"/>
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${doc.dir}"/>
diff --git a/debian/patches/0014-asm-compatibility.patch b/debian/patches/0014-asm-compatibility.patch
new file mode 100644
index 0000000..c5586f3
--- /dev/null
+++ b/debian/patches/0014-asm-compatibility.patch
@@ -0,0 +1,13 @@
+Description: Fixes the compatibility with the version of ASM in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
++++ b/src/java/edu/umd/cs/findbugs/classfile/engine/asm/FindBugsASM.java
+@@ -26,6 +26,6 @@
+ */
+ public class FindBugsASM {
+
+- public static final int ASM_VERSION = Opcodes.ASM6;
++ public static final int ASM_VERSION = Opcodes.ASM5;
+
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 62c2859..85b4226 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,5 @@
0010-bcel-for-version3.patch
0011-typecast.patch
0012-verbose-tests.patch
+0013-dont-fetch-external-libraries.patch
+0014-asm-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/findbugs.git
More information about the pkg-java-commits
mailing list