[libcofoja-java] 03/06: Replaced the dependency on libasm3-java with 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 libcofoja-java.

commit 424858cf18569ca907d4ae76f9d51e1cd678d9ee
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 15 09:55:53 2014 +0200

    Replaced the dependency on libasm3-java with libasm4-java
---
 debian/changelog               |  1 +
 debian/control                 |  4 ++--
 debian/libcofoja-java.manifest |  2 +-
 debian/rules                   | 20 ++++++++++----------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2bee740..14999ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ cofoja (1.1~r150-1) UNRELEASED; urgency=medium
   * New upstream release
     - Removed the patch setting the source encoding for javac (fixed upstream)
     - Refreshed 01-remove-version-from-generated-jar.patch
+    - Replaced the dependency on libasm3-java with libasm4-java
   * Compile Cofoja's own contracts
   * Enabled the unit tests
   * Removed debian/local.properties, use Ant command line arguments instead
diff --git a/debian/control b/debian/control
index f558f45..a0ad8a4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Olivier Sallou <osallou at debian.org>,
            Andreas Tille <tille at debian.org>,
            Diane Trout <diane at ghic.org>
-Build-Depends: debhelper (>= 9), default-jdk, libasm3-java,
+Build-Depends: debhelper (>= 9), default-jdk, libasm4-java,
  javahelper (>=0.25), junit4, ant
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/libcofoja-java.git
@@ -15,7 +15,7 @@ Homepage: https://code.google.com/p/cofoja/
 Package: libcofoja-java
 Architecture: all
 Depends: ${misc:Depends}
-Built-Using: libasm3-java (= ${libasm3-java:Version})
+Built-Using: libasm4-java (= ${asm:Version})
 Description: Java API for annotating code with contracts
  Contracts for Java is a contract programming framework for Java, which
  uses annotation processing and bytecode instrumentation to provide
diff --git a/debian/libcofoja-java.manifest b/debian/libcofoja-java.manifest
index 2d7a167..19cdc39 100644
--- a/debian/libcofoja-java.manifest
+++ b/debian/libcofoja-java.manifest
@@ -1,2 +1,2 @@
 usr/share/java/cofoja.jar:
- Class-Path: /usr/share/java/asm3-all.jar
+ Class-Path: /usr/share/java/asm4-all.jar
diff --git a/debian/rules b/debian/rules
index 555a41b..3743231 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,26 +2,26 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm3-java)
+ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm4-java)
 
 %:
 	dh $@  --with javahelper --buildsystem ant
 
 override_dh_gencontrol:
-	# Add a variable with the libasm3-java version for the Built-Using field
-	dh_gencontrol -- -Vlibasm3-java:Version=${ASM_VERSION}
+	# Add a variable with the libasm4-java version for the Built-Using field
+	dh_gencontrol -- -Vasm:Version=${ASM_VERSION}
 
 override_dh_auto_build:
 	# build unannotated cofoja library
-	dh_auto_build -- -Dasm.jar=/usr/share/java/asm3-all.jar \
+	dh_auto_build -- -Dasm.jar=/usr/share/java/asm4-all.jar \
                          -Djunit.jar=/usr/share/java/junit4.jar
 
 	# rebuild using the library.
 	mv dist/cofoja.jar build/bootstrap.jar
-	dh_auto_build -- -Dasm.jar=/usr/share/java/asm3-all.jar \
+	dh_auto_build -- -Dasm.jar=/usr/share/java/asm4-all.jar \
                          -Djunit.jar=/usr/share/java/junit4.jar \
-                         -Dant.build.javac.source=1.6 \
-                         -Dant.build.javac.target=1.6 \
+                         -Dant.build.javac.source=1.7 \
+                         -Dant.build.javac.target=1.7 \
                          clean bootstrap
 	mv dist/ccofoja.jar dist/cofoja.jar
 
@@ -30,10 +30,10 @@ override_dh_auto_clean:
 	dh_auto_clean
 
 override_dh_auto_test:
-	ant -Dasm.jar=/usr/share/java/asm3-all.jar \
+	ant -Dasm.jar=/usr/share/java/asm4-all.jar \
 	    -Djunit.jar=/usr/share/java/junit4.jar \
-	    -Dant.build.javac.source=1.6 \
-	    -Dant.build.javac.target=1.6 \
+	    -Dant.build.javac.source=1.7 \
+	    -Dant.build.javac.target=1.7 \
 	    test
 
 get-orig-source:

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