debian/changelog

-maven-repo-helper (1.9.3) UNRELEASED; urgency=medium
+maven-repo-helper (1.9.3) unstable; urgency=medium
 
   * Team upload.
 
@@ -6,12 +6,20 @@ maven-repo-helper (1.9.3) UNRELEASED; urgency=medium
   * Apply patch for mh_patchpoms to honor the --verbose option.
     Thank you to Christopher Hoskin for the patch. (Closes: #835042)
 
+  [ Giovanni Mascellani ]
+  * Document the fact that more than one relocation can be specified.
+
   [ Emmanuel Bourg ]
+  * Ignore the --relocate option with mh_installsite and mh_linkjar
+    (Closes: #891695)
+  * Overwrite the relocation pom instead of appending to it
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889347)
   * Removed the dependency on libstax-java
-  * Standards-Version updated to 4.1.1
+  * Standards-Version updated to 4.1.4
   * Switch to debhelper level 10
+  * Use salsa.debian.org Vcs-* URLs
 
- -- tony mancill <tmancill@debian.org>  Tue, 23 Aug 2016 22:26:59 -0700
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 13 Jun 2018 13:40:38 +0200
 
 maven-repo-helper (1.9.2) unstable; urgency=medium
 

debian/control

@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders:
  Ludovic Claude <ludovic.claude@laposte.net>,
- Damien Raude-Morvan <drazzib@debian.org>,
  Thomas Koch <thomas@koch.ro>,
  Emmanuel Bourg <ebourg@apache.org>
 Build-Depends:
@@ -18,10 +17,10 @@ Build-Depends:
  libcommons-io-java,
  libxmlunit-java,
  python-docutils
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-repo-helper.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-repo-helper.git
-Homepage: http://wiki.debian.org/Java/MavenRepoSpec
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/maven-repo-helper.git
+Vcs-Browser: https://salsa.debian.org/java-team/maven-repo-helper
+Homepage: https://wiki.debian.org/Java/MavenRepoSpec
 
 Package: maven-repo-helper
 Architecture: all

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Maven Repo support
 Upstream-Contact: Ludovic Claude <ludovic.claude@laposte.net>
 Source: https://launchpad.net/maven-packaging-support/

debian/rules

@@ -73,4 +73,3 @@ binary-post-install/$(PACKAGE)::
 
 clean::
 	-rm -rf debian/.mh
-

src/main/bin/mh_installpom

@@ -195,7 +195,7 @@ if [[ ! -z "$RELOCATE" ]]; then
 
         mkdir -p ${relocatedPomPath}
 
-        cat >> ${relocatedPom} << EOF
+        cat > ${relocatedPom} << EOF
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>${relocatedGroupId}</groupId>

src/main/bin/mh_installsite

@@ -51,7 +51,7 @@ syntax()
 }
 
 # The following elements are options which just need to be ignored: no-parent has-package-version keep-elements ignore-pom classifier
-ARGS="p package e set-version r rules l java-lib n usj-name i usj-version s no-usj-versionless d dest-jar c classifier v verbose n no-act skip-clean-pom no-parent has-package-version keep-elements ignore-pom classifier" parseargs "$@"
+ARGS="p package e set-version r rules l java-lib n usj-name i usj-version s no-usj-versionless d dest-jar c classifier v verbose n no-act skip-clean-pom no-parent has-package-version keep-elements ignore-pom relocate classifier" parseargs "$@"
 
 if [ "$ARGC" -lt "2" ]; then
    syntax

src/main/bin/mh_linkjar

@@ -73,7 +73,7 @@ syntax()
    exit 1
 }
 
-ARGS="p package e set-version r rules l java-lib n usj-name j usj-version s no-usj-versionless c classifier v verbose n no-act skip-clean-pom no-parent has-package-version keep-elements ignore-pom" parseargs "$@"
+ARGS="p package e set-version r rules l java-lib n usj-name j usj-version s no-usj-versionless c classifier v verbose n no-act skip-clean-pom no-parent has-package-version keep-elements ignore-pom relocate" parseargs "$@"
 
 if [ "$ARGC" -lt "2" ]; then
    syntax