[Git][java-team/maven-repo-helper][master] 8 commits: Standards-Version updated to 4.1.4

Emmanuel Bourg gitlab at salsa.debian.org
Wed Jun 13 12:42:08 BST 2018 

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / maven-repo-helper


Commits:
41744646 by Emmanuel Bourg at 2018-06-13T12:06:03+02:00
Standards-Version updated to 4.1.4

- - - - -
be635dc9 by Emmanuel Bourg at 2018-06-13T12:25:31+02:00
Ignore the --relocate option with mh_installsite and mh_linkjar (Closes: #891695)

- - - - -
76dd0949 by Emmanuel Bourg at 2018-06-13T12:25:31+02:00
Removed Damien Raude-Morvan from the uploaders (Closes: #889347)

- - - - -
7a1711e4 by Emmanuel Bourg at 2018-06-13T12:28:08+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
2f03f715 by Emmanuel Bourg at 2018-06-13T12:28:52+02:00
Use secure URLs

- - - - -
d3455c65 by Emmanuel Bourg at 2018-06-13T12:30:36+02:00
Trimmed trailing spaces

- - - - -
79eae5c3 by Emmanuel Bourg at 2018-06-13T13:40:25+02:00
Overwrite the relocation pom instead of appending to it

- - - - -
6108ef29 by Emmanuel Bourg at 2018-06-13T13:40:42+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- src/main/bin/mh_installpom
- src/main/bin/mh_installsite
- src/main/bin/mh_linkjar


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-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 at debian.org>  Tue, 23 Aug 2016 22:26:59 -0700
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 13 Jun 2018 13:40:38 +0200
 
 maven-repo-helper (1.9.2) unstable; urgency=medium
 
@@ -185,7 +193,7 @@ maven-repo-helper (1.7) unstable; urgency=low
   * update the version in the POM and in the documentation
     (Closes: #644258)
   * run the unit tests when building the package, fix broken tests after the
-    introduction of relativePath on the parent element of cleaned POM files. 
+    introduction of relativePath on the parent element of cleaned POM files.
   * d/control: add ant-optional, junit, libxmlunit-java, libcommons-io-java to
     Build-Depend-Indep
   * d/copyright: update fields to match latest DEP5 spec.
@@ -384,7 +392,7 @@ maven-repo-helper (1.0) unstable; urgency=low
   * Add more unit tests
   * maven.ignoreRules now supports eliminating some plugins from the build
   * maven.rules can be used to repair missing version numbers for
-    plugins and extensions as well as dependencies (Closes: #561420) 
+    plugins and extensions as well as dependencies (Closes: #561420)
   * If a pom file is followed by the --ignore option in the file
     <package>.poms, then it is ignored from the build and all operations
     (cleaning, patching)
@@ -439,9 +447,9 @@ maven-repo-helper (0.7) unstable; urgency=low
     in a XML catalog.
   * By default, remove the test dependencies from cleaned POMs (except for
     multi-module POM) as they are not useful outside building the project
-    itself most of the time and they make checking consistency in the 
+    itself most of the time and they make checking consistency in the
     Maven repository harder.
-  * mh_cleanpom, mh_installpom(s) and mh_transformpoms can remove 
+  * mh_cleanpom, mh_installpom(s) and mh_transformpoms can remove
     dependencies from the POM files
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Jul 2009 10:09:26 +0100


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders:
  Ludovic Claude <ludovic.claude at laposte.net>,
- Damien Raude-Morvan <drazzib at debian.org>,
  Thomas Koch <thomas at koch.ro>,
  Emmanuel Bourg <ebourg at 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
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-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 at laposte.net>
 Source: https://launchpad.net/maven-packaging-support/


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ debian/.mh/doc:
 	rst2html --title="Maven Repo Helper reference" --stylesheet-path=doc/style.css debian/.mh/doc/reference.rst debian/.mh/doc/reference.html
 	rst2html --title="Maven Repo Helper repository specification" --stylesheet-path=doc/style.css doc/repository.rst debian/.mh/doc/repository.html
 
-debian/.mh/doc/mh_%.1 : debian/.mh/mh_% 
+debian/.mh/doc/mh_%.1 : debian/.mh/mh_%
 	help2man -N -n $(mh_$*_description) -o $@ $<
 man-pages: debian/.mh/doc $(MAN_PAGES)
 
@@ -66,11 +66,10 @@ binary-post-install/$(PACKAGE)::
 	dh_installman $(MAN_PAGES)
 	mkdir -p debian/.mh
 	java -cp build/$(PACKAGE)-debian.jar:$(CLASSPATH) $(JAVA_OPTIONS) org.debian.maven.repo.POMCleaner --no-parent --has-package-version --rules=debian/maven.rules pom.xml \
-		debian/.mh/$(PACKAGE)-debian.pom debian/.mh/pom.properties 
+		debian/.mh/$(PACKAGE)-debian.pom debian/.mh/pom.properties
 	dh_install -p$(PACKAGE) --sourcedir=debian/.mh $(PACKAGE)-debian.pom \
 		usr/share/maven-repo/org/debian/maven/$(PACKAGE)/debian
 	dh_install -p$(PACKAGE) --sourcedir=debian/.mh/doc tutorial.html reference.html repository.html usr/share/doc/maven-repo-helper
 
 clean::
 	-rm -rf debian/.mh
-


=====================================
src/main/bin/mh_installpom
=====================================
--- a/src/main/bin/mh_installpom
+++ b/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
=====================================
--- a/src/main/bin/mh_installsite
+++ b/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
=====================================
--- a/src/main/bin/mh_linkjar
+++ b/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



View it on GitLab: https://salsa.debian.org/java-team/maven-repo-helper/compare/12bb817eb583a6401fd8ea9f8a146bcfeabd8037...6108ef2975dbdcc464df3597e9726f34da57e426

-- 
View it on GitLab: https://salsa.debian.org/java-team/maven-repo-helper/compare/12bb817eb583a6401fd8ea9f8a146bcfeabd8037...6108ef2975dbdcc464df3597e9726f34da57e426
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180613/86ef03f9/attachment.html>

More information about the pkg-java-commits mailing list