[findbugs] 08/18: Depend on libasm-java (>= 5.0) instead of libasm4-java
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 95937a60324e8ea2185df7b0c674c7dfdd8e8812
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Aug 10 10:37:41 2016 +0200
Depend on libasm-java (>= 5.0) instead of libasm4-java
---
debian/changelog | 1 +
debian/control | 4 ++--
.../patches/0001-FixLibraryDependency-RemoveAppleGUI.patch | 12 ++++++------
debian/patches/0002-FixJnlpLibraryDir.patch | 12 ++++++------
debian/patches/0004-FixLibraryInScriptProperties.patch | 2 +-
debian/patches/0007-FixManifest.patch | 4 ++--
6 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 94a6128..4639c4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ findbugs (3.1.0~preview2-1) UNRELEASED; urgency=medium
- Refreshed the patches
- Depend on Java 8
- Depend on libbcel-java (>= 6.0) (Closes: #832842)
+ * Depend on libasm-java (>= 5.0) instead of libasm4-java
* debian/watch: Track the release tags on GitHub
* Standards-Version updated to 3.9.8
* Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index 56806fa..4db2737 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: ant,
help2man,
java-wrappers,
junit4,
- libasm4-java,
+ libasm-java (>= 5.0),
libbcel-java (>= 6.0),
libcommons-lang-java (>= 2.4),
libdom4j-java (>= 1.6.1),
@@ -32,7 +32,7 @@ Architecture: all
Depends: default-jre (>= 2:1.8) | java8-runtime,
java-wrappers,
junit4,
- libasm4-java,
+ libasm-java (>= 5.0),
libbcel-java (>= 6.0),
libcommons-lang-java (>= 2.4),
libdom4j-java (>= 1.6.1),
diff --git a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
index 6da9273..7a749a6 100644
--- a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
+++ b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
@@ -37,9 +37,9 @@ unchanged:
+ <pathelement location="${sys.jar.dir}/dom4j.jar"/>
+ <pathelement location="${sys.jar.dir}/jdepend.jar"/>
+ <pathelement location="${sys.jar.dir}/jFormatString.jar"/>
-+ <pathelement location="${sys.jar.dir}/asm4.jar"/>
-+ <pathelement location="${sys.jar.dir}/asm4-commons.jar"/>
-+ <pathelement location="${sys.jar.dir}/asm4-tree.jar"/>
++ <pathelement location="${sys.jar.dir}/asm.jar"/>
++ <pathelement location="${sys.jar.dir}/asm-commons.jar"/>
++ <pathelement location="${sys.jar.dir}/asm-tree.jar"/>
+ <pathelement location="${sys.jar.dir}/jcip.jar"/>
+ <pathelement location="${sys.jar.dir}/ant.jar"/>
</path>
@@ -95,9 +95,9 @@ unchanged:
- <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.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}/asm4.jar"/>
-+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4-commons.jar"/>
-+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4-tree.jar"/>
++ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm.jar"/>
++ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm-commons.jar"/>
++ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm-tree.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/dom4j.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jaxen.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jFormatString.jar"/>
diff --git a/debian/patches/0002-FixJnlpLibraryDir.patch b/debian/patches/0002-FixJnlpLibraryDir.patch
index 7a07f24..e4c098b 100644
--- a/debian/patches/0002-FixJnlpLibraryDir.patch
+++ b/debian/patches/0002-FixJnlpLibraryDir.patch
@@ -12,9 +12,9 @@
- <jar href="asm-commons-3.3.jar"/>
- <jar href="jaxen-1.1.6.jar"/>
+ <jar href="dom4j.jar"/>
-+ <jar href="asm4.jar"/>
-+ <jar href="asm4-tree.jar"/>
-+ <jar href="asm4-commons.jar"/>
++ <jar href="asm.jar"/>
++ <jar href="asm-tree.jar"/>
++ <jar href="asm-commons.jar"/>
+ <jar href="jaxen.jar"/>
<jar href="jFormatString.jar"/>
- <jar href="commons-lang-2.6.jar"/>
@@ -36,9 +36,9 @@
- <jar href="asm-commons-3.3.jar"/>
- <jar href="jaxen-1.1.6.jar"/>
+ <jar href="dom4j.jar"/>
-+ <jar href="asm4.jar"/>
-+ <jar href="asm4-tree.jar"/>
-+ <jar href="asm4-commons.jar"/>
++ <jar href="asm.jar"/>
++ <jar href="asm-tree.jar"/>
++ <jar href="asm-commons.jar"/>
+ <jar href="jaxen.jar"/>
<jar href="jFormatString.jar"/>
- <jar href="commons-lang-2.6.jar"/>
diff --git a/debian/patches/0004-FixLibraryInScriptProperties.patch b/debian/patches/0004-FixLibraryInScriptProperties.patch
index f72e98e..5f8720f 100644
--- a/debian/patches/0004-FixLibraryInScriptProperties.patch
+++ b/debian/patches/0004-FixLibraryInScriptProperties.patch
@@ -5,7 +5,7 @@
# could override fb_javacmd.
script.set.default.java=\
+ . /usr/lib/java-wrappers/java-wrappers.sh\n\
-+ find_jars dom4j junit4 commons-lang jaxen jdepend asm4 asm4-commons asm4-tree ant jcip jsr305 jFormatString bcel\n\
++ find_jars dom4j junit4 commons-lang jaxen jdepend asm asm-commons asm-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/0007-FixManifest.patch b/debian/patches/0007-FixManifest.patch
index 42183fa..4c4569a 100644
--- a/debian/patches/0007-FixManifest.patch
+++ b/debian/patches/0007-FixManifest.patch
@@ -4,11 +4,11 @@
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
++Class-Path: bcel.jar dom4j.jar jaxen.jar asm.jar asm-tree.jar asm-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-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
++Class-Path: bcel.jar dom4j.jar jaxen.jar asm.jar asm-tree.jar asm-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
More information about the pkg-java-commits
mailing list