This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository findbugs.
commit eca9949b99fd745c152792e7cccd61fdb68079c9
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Thu Dec 10 15:23:07 2015 +0100
Depend on bcel instead of findbugs-bcel
---
debian/changelog | 1 +
debian/control | 4 ++--
.../0001-FixLibraryDependency-RemoveAppleGUI.patch | 16 ++++++++--------
debian/patches/0002-FixJnlpLibraryDir.patch | 4 ++--
debian/patches/0004-FixLibraryInScriptProperties.patch | 2 +-
debian/patches/0006-FixLibraryPathInJavaDoc.patch | 4 ++--
debian/patches/0007-FixManifest.patch | 16 ++++++----------
7 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 534e366..d88f27c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ findbugs (2.0.3+repack-2) UNRELEASED; urgency=medium
* Team upload.
* Fixed the compilation failure with BCEL 6.0 RC3 (Closes: #796430)
* Depend on default-jre | java5-runtime (Closes: #793860)
+ * Depend on bcel instead of findbugs-bcel
-- Emmanuel Bourg <ebo...@apache.org> Thu, 10 Dec 2015 15:09:26 +0100
diff --git a/debian/control b/debian/control
index fd2f310..f9eb970 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9.0.0), default-jdk, ant,
libsaxon-java,
libasm3-java (>= 3.3), libjaxen-java (>= 1.1.1), libjsr305-java,
libcommons-lang-java (>= 2.4), libjcip-annotations-java,
libjdepend-java (>= 2.9), ant-optional,
- libfindbugs-bcel-java (>= 6.0~20130831),
+ libbcel-java (>= 6.0~rc3),
libjformatstring-java (>= 0.10~20081016-2), help2man, java-wrappers,
maven-repo-helper
Standards-Version: 3.9.5
@@ -22,7 +22,7 @@ Depends: ${misc:Depends}, libdom4j-java (>= 1.6.1), junit4,
libasm3-java (>= 3.3), libjaxen-java (>= 1.1.1),
libcommons-lang-java (>= 2.4), libjdepend-java (>= 2.9),
libjcip-annotations-java, java-wrappers,
- libfindbugs-bcel-java (>= 6.0~20130831),
+ libbcel-java (>= 6.0~rc3),
libjsr305-java, libjformatstring-java (>= 0.10~20081016-2),
default-jre | java5-runtime
Description: Static java code analyzer to find bugs
diff --git a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
index c6f8afc..3b11561 100644
--- a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
+++ b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
@@ -45,7 +45,7 @@ Index: findbugs-2.0.3/build.xml
- <pathelement location="${jar.dir}/jFormatString.jar"/>
- <pathelement location="${jar.dir}/commons-lang-2.6.jar"/>
- <pathelement location="${jar.dir}/jcip-annotations.jar"/>
-+ <pathelement location="${sys.jar.dir}/findbugs-bcel.jar"/>
++ <pathelement location="${sys.jar.dir}/bcel.jar"/>
+ <pathelement location="${sys.jar.dir}/dom4j.jar"/>
+ <pathelement location="${sys.jar.dir}/junit4.jar"/>
+ <pathelement location="${sys.jar.dir}/asm3.jar"/>
@@ -81,7 +81,7 @@ Index: findbugs-2.0.3/build.xml
- <zipfileset src="${jar.dir}/jsr305.jar"/>
- <zipfileset src="${jar.dir}/jFormatString.jar"/>
- <zipfileset src="${jar.dir}/commons-lang-2.6.jar"/>
-+ <zipfileset src="${sys.jar.dir}/findbugs-bcel.jar"/>
++ <zipfileset src="${sys.jar.dir}/bcel.jar"/>
+ <zipfileset src="${sys.jar.dir}/dom4j.jar"/>
+ <zipfileset src="${sys.jar.dir}/junit4.jar"/>
+ <zipfileset src="${sys.jar.dir}/asm3.jar"/>
@@ -110,7 +110,7 @@ Index: findbugs-2.0.3/build.xml
</fileset>
- <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/findbugs-bcel.jar"
excludes="META-INF/**"/>
++ <zipfileset src="${sys.jar.dir}/bcel.jar" excludes="META-INF/**"/>
- <zipfileset src="${jar.dir}/asm-3.3.jar" excludes="META-INF/**"/>
- <zipfileset src="${jar.dir}/asm-analysis-3.3.jar"
excludes="META-INF/**"/>
@@ -144,7 +144,7 @@ Index: findbugs-2.0.3/build.xml
outputFile="${sampleoutput.dir}/bcel.xml"
>
- <class location="${jar.dir}/bcel.jar" />
-+ <class location="${sys.jar.dir}/findbugs-bcel.jar" />
++ <class location="${sys.jar.dir}/bcel.jar" />
</findbugs>
<findbugs home="."
output="xml:withMessages"
@@ -153,7 +153,7 @@ Index: findbugs-2.0.3/build.xml
projectName="Byte code Engineering Library (BCEL)"
outputFile="${sampleoutput.dir}/bcel-cloud-appengine.xml" >
- <class location="${jar.dir}/bcel.jar" />
-+ <class location="${jar.dir}/findbugs-bcel.jar" />
++ <class location="${jar.dir}/bcel.jar" />
</findbugs>
<!--
<findbugs home="."
@@ -171,7 +171,7 @@ Index: findbugs-2.0.3/build.xml
- <copy todir="${jnlp.dir}" file="${jar.dir}/jFormatString.jar"/>
- <copy todir="${jnlp.dir}" file="${jar.dir}/commons-lang-2.6.jar"/>
- <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/>
-+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/findbugs-bcel.jar"/>
++ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/bcel.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/>
@@ -188,7 +188,7 @@ Index: findbugs-2.0.3/build.xml
<target name="annotationJavadoc">
<javadoc access="public"
-
classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
-+
classpath="${sys.jar.dir}/findbugs-bcel.jar:${sys.jar.dir}/junit4.jar:${sys.jar.dir}/dom4j.jar:${sys.jar.dir}/jsr305.jar"
++
classpath="${sys.jar.dir}/bcel.jar:${sys.jar.dir}/junit4.jar:${sys.jar.dir}/dom4j.jar:${sys.jar.dir}/jsr305.jar"
destdir="${annotationDoc.dir}"
packagenames="edu.umd.cs.findbugs.annotations"
doctitle="FindBugs Annotation Documentation"
@@ -230,7 +230,7 @@ Index: findbugs-2.0.3/.classpath
+ <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/asm3.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/asm3-tree.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/findbugs-bcel.jar"/>
++ <classpathentry kind="lib" path="/usr/share/java/bcel.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/dom4j.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/asm3-commons.jar"/>
+ <classpathentry kind="lib" path="/usr/share/java/jaxen.jar"/>
diff --git a/debian/patches/0002-FixJnlpLibraryDir.patch
b/debian/patches/0002-FixJnlpLibraryDir.patch
index c93aa22..9a17a99 100644
--- a/debian/patches/0002-FixJnlpLibraryDir.patch
+++ b/debian/patches/0002-FixJnlpLibraryDir.patch
@@ -13,7 +13,7 @@ Index: findbugs-2.0.3/jnlp/core.jnlp
- <jar href="asm-tree-3.3.jar"/>
- <jar href="asm-commons-3.3.jar"/>
- <jar href="jaxen-1.1.6.jar"/>
-+ <jar href="findbugs-bcel.jar"/>
++ <jar href="bcel.jar"/>
+ <jar href="dom4j.jar"/>
+ <jar href="asm3.jar"/>
+ <jar href="asm3-tree.jar"/>
@@ -40,7 +40,7 @@ Index: findbugs-2.0.3/jnlp/findbugs.jnlp
- <jar href="asm-tree-3.3.jar"/>
- <jar href="asm-commons-3.3.jar"/>
- <jar href="jaxen-1.1.6.jar"/>
-+ <jar href="findbugs-bcel.jar"/>
++ <jar href="bcel.jar"/>
+ <jar href="dom4j.jar"/>
+ <jar href="asm3.jar"/>
+ <jar href="asm3-tree.jar"/>
diff --git a/debian/patches/0004-FixLibraryInScriptProperties.patch
b/debian/patches/0004-FixLibraryInScriptProperties.patch
index 2bd8b64..32c3be6 100644
--- a/debian/patches/0004-FixLibraryInScriptProperties.patch
+++ b/debian/patches/0004-FixLibraryInScriptProperties.patch
@@ -7,7 +7,7 @@ Index: findbugs-2.0.3/etc/script.properties
# could override fb_javacmd.
script.set.default.java=\
+ . /usr/lib/java-wrappers/java-wrappers.sh\n\
-+ find_jars dom4j junit4 commons-lang jaxen jdepend asm3 asm3-commons
asm3-tree ant jcip jsr305 jFormatString findbugs-bcel\n\
++ find_jars dom4j junit4 commons-lang jaxen jdepend asm3 asm3-commons
asm3-tree ant jcip jsr305 jFormatString bcel\n\
+ export CLASSPATH=$JAVA_CLASSPATH\n\
# Choose default java binary\n\
fb_javacmd=java\n\
diff --git a/debian/patches/0006-FixLibraryPathInJavaDoc.patch
b/debian/patches/0006-FixLibraryPathInJavaDoc.patch
index cfda6d8..6a4a6c9 100644
--- a/debian/patches/0006-FixLibraryPathInJavaDoc.patch
+++ b/debian/patches/0006-FixLibraryPathInJavaDoc.patch
@@ -7,7 +7,7 @@ Index: findbugs-2.0.3/apiJavadoc.xml
<project default="javadoc">
<target name="javadoc">
-<javadoc access="protected" author="true"
classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-full.jar:lib/AppleJavaExtensions.jar"
destdir="doc/apiDoc" doctitle="FindBugs API Documentation"
nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false"
packagenames="edu.umd.cs.findbugs.detect,edu.umd.cs.findbugs.visitclass,edu.umd.cs.findbugs.ba.vna,edu.umd.cs.findbugs.ba.bcp,edu.umd.cs.findbugs.graph,edu.umd.cs.findbugs.ba.ch,edu.umd.cs.findbugs.ba.obl,edu.u
[...]
-+ <javadoc access="protected" author="true"
classpath="/usr/share/java/findbugs-bcel.jar:/usr/share/java/junit4.jar:/usr/share/java/dom4j.jar"
destdir="doc/apiDoc" doctitle="FindBugs API Documentation"
nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false"
packagenames="edu.umd.cs.findbugs.detect,edu.umd.cs.findbugs.visitclass,edu.umd.cs.findbugs.ba.vna,edu.umd.cs.findbugs.ba.bcp,edu.umd.cs.findbugs.graph,edu.umd.cs.findbugs.ba.ch,edu.umd.cs.find
[...]
++ <javadoc access="protected" author="true"
classpath="/usr/share/java/bcel.jar:/usr/share/java/junit4.jar:/usr/share/java/dom4j.jar"
destdir="doc/apiDoc" doctitle="FindBugs API Documentation"
nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false"
packagenames="edu.umd.cs.findbugs.detect,edu.umd.cs.findbugs.visitclass,edu.umd.cs.findbugs.ba.vna,edu.umd.cs.findbugs.ba.bcp,edu.umd.cs.findbugs.graph,edu.umd.cs.findbugs.ba.ch,edu.umd.cs.findbugs.ba.o
[...]
</target>
</project>
Index: findbugs-2.0.3/annotationJavadoc.xml
@@ -19,6 +19,6 @@ Index: findbugs-2.0.3/annotationJavadoc.xml
<project default="javadoc">
<target name="javadoc">
-<javadoc access="public" author="true"
classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-full.jar:lib/AppleJavaExtensions.jar"
destdir="doc/annotationDoc" doctitle="FindBugs Annotation Documentation"
nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false" packagenames="edu.umd.cs.findbugs.annotations" source="1.5"
sourcepath="src/tools:src/java:src/junit" splitindex="true" use="true"
version="true"/>
-+ <javadoc access="public" author="true"
classpath="/usr/share/java/findbugs-bcel.jar:/usr/share/java/junit4.jar:/usr/share/java/dom4j.jar"
destdir="doc/annotationDoc" doctitle="FindBugs Annotation Documentation"
nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false" packagenames="edu.umd.cs.findbugs.annotations" source="1.5"
sourcepath="src/tools:src/java:src/junit" splitindex="true" use="true"
version="true"/>
++ <javadoc access="public" author="true"
classpath="/usr/share/java/bcel.jar:/usr/share/java/junit4.jar:/usr/share/java/dom4j.jar"
destdir="doc/annotationDoc" doctitle="FindBugs Annotation Documentation"
nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false"
notree="false" packagenames="edu.umd.cs.findbugs.annotations" source="1.5"
sourcepath="src/tools:src/java:src/junit" splitindex="true" use="true"
version="true"/>
</target>
</project>
diff --git a/debian/patches/0007-FixManifest.patch
b/debian/patches/0007-FixManifest.patch
index da3cc93..eeb8422 100644
--- a/debian/patches/0007-FixManifest.patch
+++ b/debian/patches/0007-FixManifest.patch
@@ -1,18 +1,14 @@
-Index: findbugs-2.0.3/etc/MANIFEST-findbugsGUI.MF
-===================================================================
---- findbugs-2.0.3.orig/etc/MANIFEST-findbugsGUI.MF 2013-12-17
17:59:30.606249086 +0800
-+++ findbugs-2.0.3/etc/MANIFEST-findbugsGUI.MF 2013-12-17 21:13:58.894157860
+0800
+--- 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.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar
asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar
commons-lang-2.6.jar plastic.jar
-+Class-Path: findbugs-bcel.jar dom4j.jar jaxen.jar asm3.jar asm3-tree.jar
asm3-commons.jar jsr305.jar jFormatString.jar commons-lang.jar plastic.jar
-Index: findbugs-2.0.3/etc/MANIFEST-findbugs.MF
-===================================================================
---- findbugs-2.0.3.orig/etc/MANIFEST-findbugs.MF 2013-12-17
17:59:30.606249086 +0800
-+++ findbugs-2.0.3/etc/MANIFEST-findbugs.MF 2013-12-17 21:14:54.954157423
+0800
++Class-Path: bcel.jar dom4j.jar jaxen.jar asm3.jar asm3-tree.jar
asm3-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.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar
asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar
commons-lang-2.6.jar
-+Class-Path: findbugs-bcel.jar dom4j.jar jaxen.jar asm3.jar asm3-tree.jar
asm3-commons.jar jsr305.jar jFormatString.jar commons-lang.jar
++Class-Path: bcel.jar dom4j.jar jaxen.jar asm3.jar asm3-tree.jar
asm3-commons.jar jsr305.jar jFormatString.jar commons-lang.jar
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/findbugs.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
