[maven-debian-helper] 01/01: Touch debian/stamp-poms-patched after mh_patchpoms is run

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository maven-debian-helper.

commit bc8309cce2579a95e1841642fd261c93665ba0c5
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jun 26 19:22:16 2013 +0200

    Touch debian/stamp-poms-patched after mh_patchpoms is run
    
    When POMs are in patched state, there has to be debian/stamp-poms-patched
    file existing. It is expected by mh_resolve_dependencies, which otherwise
    deletes debian/[package].poms and regenerates it from scratch, discarding
    any user specified parameters.
    
    Patch mirrors this cdbs behavior into dh, where it was missing.
---
 debian/changelog    |    5 +++++
 share/perl/maven.pm |    2 ++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 64be51b..364b79c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 maven-debian-helper (1.6.4) unstable; urgency=low
 
+  [ Emmanuel Bourg ]
   * Don't install the documentation jar by default (Closes: #711852)
   * Generate canonical URLs for the Vcs-* fields
   * Refer to "Debian systems" instead of "Debian GNU/Linux system"
@@ -12,6 +13,10 @@ maven-debian-helper (1.6.4) unstable; urgency=low
   * Added rat-maven-plugin to the list of the ignored plugins
   * Code clean up and minor syntax changes
 
+  [ Jakub Adam ]
+  * dh build: Touch debian/stamp-poms-patched after mh_patchpoms is run
+    (Closes: #714189)
+
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 07 Aug 2013 13:00:25 +0200
 
 maven-debian-helper (1.6.3) unstable; urgency=low
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index c535d37..ec9ac19 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -62,6 +62,7 @@ sub configure {
 	$this->doit_in_sourcedir("mh_patchpoms", "-p$this->{package}",
 		"--debian-build", "--keep-pom-version",
 		"--maven-repo=$this->{cwd}/debian/maven-repo", @patch_args);
+	doit("touch", "debian/stamp-poms-patched");
 }
 
 sub build {
@@ -119,6 +120,7 @@ sub clean {
 		doit("rm", "-r", "$this->{cwd}/debian/maven-repo");
 	}
 	$this->doit_in_sourcedir("mh_unpatchpoms", "-p$this->{package}");
+	doit("rm", "-f", "debian/stamp-poms-patched");
 	doit("mh_clean");
 }
 

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