[maven-repo-helper] 01/03: Insert mh_install after dh_install

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-repo-helper.

commit 3b34a86cac06dc30a26238f56a57842de366fa1b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jun 10 12:47:16 2015 +0200

    Insert mh_install after dh_install
---
 debian/changelog                    | 9 +++++++++
 src/main/share/maven_repo_helper.pm | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 71cea25..a432428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+maven-repo-helper (1.8.11) UNRELEASED; urgency=medium
+
+  * Insert mh_install after dh_install and not before dh_compress to ensure
+    the jars are always installed before running dh_strip_nondeterminism,
+    jh_classpath and jh_manifest. This fixes a build failure with libjdom2-java
+    and javahelper >= 0.49.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 10 Jun 2015 12:45:22 +0200
+
 maven-repo-helper (1.8.10) experimental; urgency=medium
 
   * Fixed a bug preventing rules like 's/org.foo/org.bar/ * * s/.*/debian/ * *'
diff --git a/src/main/share/maven_repo_helper.pm b/src/main/share/maven_repo_helper.pm
index 4af7182..d69b387 100644
--- a/src/main/share/maven_repo_helper.pm
+++ b/src/main/share/maven_repo_helper.pm
@@ -5,7 +5,7 @@ use Debian::Debhelper::Dh_Lib;
 
 # dh $@ --with maven_repo_helper
 
-insert_before("dh_compress", "mh_install");
+insert_after("dh_install", "mh_install");
 insert_before("dh_clean", "mh_clean");
 
 1;

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