The following commit has been merged in the master branch:
commit f9a75cdc9e07756e56f0836806ff0675a9a2d7af
Author: James Page <james.p...@canonical.com>
Date: Wed Sep 28 09:48:00 2011 +0100
Fix FTBFS with asm3 >= 3.3 (LP: #851659):
* Fix FTBFS with asm3 >= 3.3 (LP: #851659):
- d/maven.rules: Use asm-all instead of asm to align to restructure
of jar files.
* Fix FTBFS due to changes to maven-compiler-plugin (Closes: #643495):
- d/control: Added libmaven-plugin-tools-java to Build-Deps-Indep.
* debian/copyright: Tidied new lintian warnings.
diff --git a/debian/changelog b/debian/changelog
index 56a8233..9ec2c9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bridge-method-injector (1.4-2) unstable; urgency=low
+
+ * Fix FTBFS with asm3 >= 3.3 (LP: #851659):
+ - d/maven.rules: Use asm-all instead of asm to align to restructure
+ of jar files.
+ * Fix FTBFS due to changes to maven-compiler-plugin (Closes: #643495):
+ - d/control: Added libmaven-plugin-tools-java to Build-Deps-Indep.
+ * debian/copyright: Tidied new lintian warnings.
+
+ -- James Page <james.p...@ubuntu.com> Wed, 28 Sep 2011 09:46:23 +0100
+
bridge-method-injector (1.4-1) unstable; urgency=low
* Initial Debian release (Closes: #629814)
diff --git a/debian/control b/debian/control
index b3b6882..6a471aa 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends-Indep:
libmaven-install-plugin-java,
libmaven-javadoc-plugin-java,
libmaven-scm-java,
+ libmaven-plugin-tools-java,
libmaven2-core-java,
libmaven2-core-java-doc
Standards-Version: 3.9.2
diff --git a/debian/maven.rules b/debian/maven.rules
index 2f19318..5c38abb 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,4 +17,5 @@
# junit junit jar s/3\\..*/3.x/
junit junit jar s/3\..*/3.x/ * *
-asm s/asm-debug-all/asm/ jar s/3\..*/3.x/* *
+asm s/asm-debug-all/asm-all/ jar s/3\..*/3.x/* *
+
--
bridge-method-injector packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
