[libcofoja-java] 05/09: Depend on ASM instead of embedding the library

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Oct 4 09:45:02 UTC 2016


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 1f0f23a44254cb7f5eb1674a6ed30cf37dab4f1e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 4 11:18:54 2016 +0200

    Depend on ASM instead of embedding the library
---
 debian/changelog | 1 +
 debian/control   | 3 +--
 debian/rules     | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d3f757..fd7ff51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ cofoja (1.3-1) UNRELEASED; urgency=medium
   * New upstream release
     - Removed 02-java8-compatibility.patch (fixed upstream)
     - Replaced 01-remove-version-from-generated-jar.patch with a build parameter
+    - Depend on ASM instead of embedding the library
   * Standards-Version updated to 3.9.8
   * Updated the Homepage field
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index ef40a63..956cf6c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,7 @@ Homepage: https://github.com/nhatminhle/cofoja
 
 Package: libcofoja-java
 Architecture: all
-Depends: ${misc:Depends}
-Built-Using: libasm4-java (= ${asm:Version})
+Depends: ${misc:Depends}, libasm4-java
 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/rules b/debian/rules
index 93ce810..b88ee25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,9 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-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 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/asm4-all.jar \

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



More information about the pkg-java-commits mailing list