[pkg-java] r17361 - trunk/plexus-interpolation/debian

Fri Oct 18 23:21:07 UTC 2013

Author: ebourg-guest
Date: 2013-10-18 23:21:07 +0000 (Fri, 18 Oct 2013)
New Revision: 17361

Removed:
   trunk/plexus-interpolation/debian/orig-tar.sh
Modified:
   trunk/plexus-interpolation/debian/changelog
   trunk/plexus-interpolation/debian/compat
   trunk/plexus-interpolation/debian/control
   trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms
   trunk/plexus-interpolation/debian/watch
Log:
debian/watch: Updated to catch the new versions on Github
Updated Standards-Version to 3.9.4 (no changes)
Use canonical URLs for the Vcs-* fields



Modified: trunk/plexus-interpolation/debian/changelog
===================================================================

--- trunk/plexus-interpolation/debian/changelog	2013-10-18 22:33:08 UTC (rev 17360)
+++ trunk/plexus-interpolation/debian/changelog	2013-10-18 23:21:07 UTC (rev 17361)
@@ -1,3 +1,13 @@
+plexus-interpolation (1.11-4) UNRELEASED; urgency=low
+
+  * Team upload.
+  * debian/control:
+    - Updated Standards-Version to 3.9.4 (no changes)
+    - Use canonical URLs for the Vcs-* fields
+  * debian/watch: Updated to catch the new versions on Github
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sat, 19 Oct 2013 01:08:57 +0200
+
 plexus-interpolation (1.11-3) unstable; urgency=low
 
   * Switch to source format 3.0.

Modified: trunk/plexus-interpolation/debian/compat
===================================================================
--- trunk/plexus-interpolation/debian/compat	2013-10-18 22:33:08 UTC (rev 17360)
+++ trunk/plexus-interpolation/debian/compat	2013-10-18 23:21:07 UTC (rev 17361)
@@ -1 +1 @@
-7
+9

Modified: trunk/plexus-interpolation/debian/control
===================================================================
--- trunk/plexus-interpolation/debian/control	2013-10-18 22:33:08 UTC (rev 17360)
+++ trunk/plexus-interpolation/debian/control	2013-10-18 23:21:07 UTC (rev 17361)
@@ -2,17 +2,18 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Uploaders: Torsten Werner <twerner at debian.org>,
+           Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-interpolation
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-interpolation/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/plexus-interpolation
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-interpolation/
 Homepage: http://plexus.codehaus.org/plexus-components/plexus-interpolation/
 
 Package: libplexus-interpolation-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libplexus-interpolation-java-doc
 Description: Plexus Interpolation API
@@ -32,7 +33,7 @@
      * Auto-wiring
      * Component dependencies, and
      * Various dependency injection techniques including constructor injection,
-       setter injection, and private field injection. 
+       setter injection, and private field injection.
  .
  Plexus interpolator is focused on providing a more modular, flexible
  interpolation framework for the expression language style commonly seen in
@@ -41,7 +42,7 @@
 Package: libplexus-interpolation-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
 Suggests: libplexus-interpolation-java
 Description: Documentation for Plexus Interpolation API
@@ -61,7 +62,7 @@
      * Auto-wiring
      * Component dependencies, and
      * Various dependency injection techniques including constructor injection,
-       setter injection, and private field injection. 
+       setter injection, and private field injection.
  .
  Plexus interpolator is focused on providing a more modular, flexible
  interpolation framework for the expression language style commonly seen in

Modified: trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms
===================================================================
--- trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms	2013-10-18 22:33:08 UTC (rev 17360)
+++ trunk/plexus-interpolation/debian/libplexus-interpolation-java.poms	2013-10-18 23:21:07 UTC (rev 17361)
@@ -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,16 +13,16 @@
 #   --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
-#   it will be installed with mh_install.
+#   --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.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
 pom.xml --no-parent --has-package-version

Deleted: trunk/plexus-interpolation/debian/orig-tar.sh
===================================================================
--- trunk/plexus-interpolation/debian/orig-tar.sh	2013-10-18 22:33:08 UTC (rev 17360)
+++ trunk/plexus-interpolation/debian/orig-tar.sh	2013-10-18 23:21:07 UTC (rev 17361)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../plexus-interpolation_$VERSION.orig.tar.gz
-DIR=plexus-interpolation-$VERSION
-TAG=$(echo "plexus-interpolation-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export http://svn.codehaus.org/plexus/plexus-components/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi

Modified: trunk/plexus-interpolation/debian/watch
===================================================================
--- trunk/plexus-interpolation/debian/watch	2013-10-18 22:33:08 UTC (rev 17360)
+++ trunk/plexus-interpolation/debian/watch	2013-10-18 23:21:07 UTC (rev 17361)
@@ -1,4 +1,3 @@
 version=3
 opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  http://svn.codehaus.org/plexus/plexus-components/tags/ \
-  plexus-interpolation-(\d.*)/ debian debian/orig-tar.sh
+https://github.com/sonatype/plexus-interpolation/releases .*/plexus-interpolation-(\d.*).tar.gz


