[bridge-method-injector] 02/02: New upstream release (1.13)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository bridge-method-injector.

commit e2ddbadf9b0dcd9711898f2de020fc06e9213e45
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 15 09:01:55 2014 +0200

    New upstream release (1.13)
---
 debian/README.source                       |  2 +-
 debian/changelog                           |  6 ++++--
 debian/control                             |  2 +-
 debian/libbridge-method-injector-java.poms | 14 ++++++++++----
 debian/maven.ignoreRules                   |  1 +
 debian/maven.rules                         |  2 +-
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 7e8e8e1..e6ae407 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
 Information about bridge-method-injector
-------------------------------
+----------------------------------------
 
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
diff --git a/debian/changelog b/debian/changelog
index 65c0516..aeb405f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-bridge-method-injector (1.8-2) UNRELEASED; urgency=medium
+bridge-method-injector (1.13-1) unstable; urgency=medium
 
   * Team upload.
+  * New upstream release.
+    - Depend on libasm4-java instead of libasm3-java
   * debian/maven.rules: Fixed a typo causing a build failure (Closes: #761540)
   * Switch to debhelper level 9
   * debian/watch: Updated to match the versions >= 1.10
   * Use canonical URLs for the Vcs-* fields
 
- -- Emmanuel Bourg <ebourg at apache.org>  Sun, 14 Sep 2014 23:56:01 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 15 Sep 2014 08:47:24 +0200
 
 bridge-method-injector (1.8-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index aeb9057..7e6bd3b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends-Indep:
  default-jdk-doc,
  junit (>= 3.8.1),
  libannotation-indexer-java (>= 1.3),
- libasm3-java,
+ libasm4-java,
  libmaven-antrun-plugin-java,
  libmaven-install-plugin-java,
  libmaven-javadoc-plugin-java,
diff --git a/debian/libbridge-method-injector-java.poms b/debian/libbridge-method-injector-java.poms
index 9751c4f..3d263a8 100644
--- a/debian/libbridge-method-injector-java.poms
+++ b/debian/libbridge-method-injector-java.poms
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -11,14 +13,18 @@
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in /usr/share/java
 #   --usj-version=<version>: version to use when installing the library in /usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
-pom.xml 
+pom.xml
 annotation/pom.xml --java-lib
 injector/pom.xml --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 36f1aec..9acaeef 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -17,3 +17,4 @@
 com.sun tools * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.jvnet.wagon-svn wagon-svn * * * *
+org.sonatype.plugins nexus-staging-maven-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 3072672..3ceb9a4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -17,5 +17,5 @@
 #   junit junit jar s/3\\..*/3.x/
 
 junit junit jar s/3\..*/3.x/ * *
-asm s/asm-debug-all/asm-all/ jar s/3\..*/3.x/ * *
+org.ow2.asm s/asm-debug-all/asm-all/ * s/.*/4.x/ * *
 s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * *

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