[sisu-guice] 03/05: 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 sisu-guice.

commit 9ffd821438d528f359e451e71b7bb5d500aaf79e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 4 14:29:34 2016 +0200

    Depend on libasm-java (>= 5.0) instead of libasm4-java
---
 debian/changelog   | 1 +
 debian/control     | 4 ++--
 debian/copyright   | 6 +++---
 debian/maven.rules | 2 --
 debian/rules       | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8febdc4..6e7a942 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sisu-guice (3.2.6-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index fcbebe8..6d6a436 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Eugene Zhukov <jevgeni.zh at g
 Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: glassfish-javaee,
                      libaopalliance-java,
-                     libasm4-java,
+                     libasm-java (>= 5.0),
                      libatinject-jsr330-api-java,
                      libcglib-java (>= 3.2),
                      libguava-java,
@@ -25,7 +25,7 @@ Homepage: https://github.com/sonatype/sisu-guice
 Package: libsisu-guice-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
-Built-Using: libasm4-java (= ${asm:Version}), cglib (= ${cglib:Version})
+Built-Using: libasm-java (= ${asm:Version}), cglib (= ${cglib:Version})
 Recommends: ${maven:OptionalDepends}
 Description: Patched build of Google Guice for Sisu-IoC
  Google Guice is a lightweight dependency injection framework
diff --git a/debian/copyright b/debian/copyright
index c03f400..4fa7c80 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Sisu Guice
 Source: https://github.com/sonatype/sisu-guice/
 Comment:
- This project incorporates classes from the libasm4-java and libcglib-java
+ This project incorporates classes from the libasm-java and libcglib-java
  packages (versions listed in the Built-Using field in debian/control).
  under a different package to avoid classpath conflicts. 
 
@@ -22,8 +22,8 @@ Files: src/org/objectweb/asm/*
 Copyright: 2004-2008 Eric Bruneton, Eugene Kuleshov
 Comment:
  Class files incorporated in sisu-guice via jarjar.
- The filespec is relative to the libasm4-java source package.
- See the libasm4-java source package for more information.
+ The filespec is relative to the libasm-java source package.
+ See the libasm-java source package for more information.
 License: BSD-3-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/debian/maven.rules b/debian/maven.rules
index 3645209..229a05b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -3,7 +3,6 @@ com.google.guava guava bundle s/.*/debian/ * *
 com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/ * *
 junit junit jar s/4\..*/4.x/ * *
-org.ow2.asm asm jar s/.*/4.x/ * *
 org.sonatype.sisu sisu-guice jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-assistedinject jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-extensions pom s/.*/debian/ * *
@@ -18,7 +17,6 @@ org.sonatype.sisu.inject guice-spring jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-struts2 jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-throwingproviders jar s/.*/debian/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
-org.ow2.asm * * s/.*/4.x/ * *
 org.springframework * * s/3\..*/3.x/ * *
 s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
 s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index adb6a5e..3d6e6be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Variables for the Built-Using field in the control file
-ASM_VERSION   := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java)
+ASM_VERSION   := $(shell dpkg-query -f '$${source:Version}' --show libasm-java)
 CGLIB_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libcglib-java)
 
 %:

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