[knopflerfish-osgi] 03/12: Depend on libasm-java (>= 5.0) instead of libasm4-java

[Emmanuel Bourg]

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

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

commit 1a1de706d3bdf0347f246f0ed7ff4860eff63ca6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 15:23:16 2016 +0200

    Depend on libasm-java (>= 5.0) instead of libasm4-java
---
 debian/changelog                  | 1 +
 debian/control                    | 2 +-
 debian/patches/10_build_asm.patch | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b9141e..f9fe3b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 knopflerfish-osgi (5.1.0+dfsg1-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index bb383ab..f4942d6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Felix Natter <fnatter at gmx.net>
-Build-Depends-Indep: libasm4-java, default-jdk
+Build-Depends-Indep: libasm-java (>= 5.0), default-jdk
 Build-Depends: cdbs, debhelper (>= 9), ant
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/knopflerfish-osgi.git
diff --git a/debian/patches/10_build_asm.patch b/debian/patches/10_build_asm.patch
index 4dab258..d703652 100644
--- a/debian/patches/10_build_asm.patch
+++ b/debian/patches/10_build_asm.patch
@@ -1,7 +1,6 @@
-Description: Use Debian's version of asm3
+Description: Use Debian's version of asm
 Author: Felix Natter <fnatter at gmx.net>
 Forwarded: not-needed
-Last-Update: 2015-02-21
 --- a/osgi/framework/build.xml
 +++ b/osgi/framework/build.xml
 @@ -81,7 +81,7 @@
@@ -9,7 +8,7 @@ Last-Update: 2015-02-21
    <path id="compile.path">
      <pathelement location="${topdir}/framework/resources"/>
 -    <pathelement location="libs/asm-3.2.jar"/>
-+    <pathelement location="/usr/share/java/asm4.jar"/>
++    <pathelement location="/usr/share/java/asm.jar"/>
    </path>
  
    <path id="empty.path">

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