[pkg-java] r15898 - trunk/libjoda-time-java/debian

Mathieu Malaterre malat at alioth.debian.org
Thu Apr 5 07:37:42 UTC 2012 

Author: malat
Date: 2012-04-05 07:37:41 +0000 (Thu, 05 Apr 2012)
New Revision: 15898

Modified:
   trunk/libjoda-time-java/debian/changelog
   trunk/libjoda-time-java/debian/control
   trunk/libjoda-time-java/debian/copyright
   trunk/libjoda-time-java/debian/libjoda-time-java.poms
   trunk/libjoda-time-java/debian/maven.cleanIgnoreRules
   trunk/libjoda-time-java/debian/maven.ignoreRules
   trunk/libjoda-time-java/debian/maven.publishedRules
   trunk/libjoda-time-java/debian/maven.rules
   trunk/libjoda-time-java/debian/watch
Log:
Push changes, until joda-convert enter sid

Modified: trunk/libjoda-time-java/debian/changelog
===================================================================
--- trunk/libjoda-time-java/debian/changelog	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/changelog	2012-04-05 07:37:41 UTC (rev 15898)
@@ -1,3 +1,10 @@
+libjoda-time-java (2.1-1) UNRELEASED; urgency=low
+
+  * New upstream. Closes: #667516
+   - add dep to libclirr-maven-plugin-java & libjoda-convert-java
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 04 Apr 2012 17:49:16 +0200
+
 libjoda-time-java (1.6.2-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/libjoda-time-java/debian/control
===================================================================
--- trunk/libjoda-time-java/debian/control	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/control	2012-04-05 07:37:41 UTC (rev 15898)
@@ -2,13 +2,13 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>, Mathieu Malaterre <malat at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java,
- junit, default-jdk-doc, ant
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjoda-time-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjoda-time-java
+ junit, default-jdk-doc, ant, libclirr-maven-plugin-java, libjoda-convert-java
+Standards-Version: 3.9.3
+Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjoda-time-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjoda-time-java/
 Homepage: http://joda-time.sourceforge.net
 
 Package: libjoda-time-java

Modified: trunk/libjoda-time-java/debian/copyright
===================================================================
--- trunk/libjoda-time-java/debian/copyright	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/copyright	2012-04-05 07:37:41 UTC (rev 15898)
@@ -1,4 +1,4 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
+Format-Specification: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Name: Joda time
 Maintainer:  Stephen Colebourne <> as Lead developer 
              Brian S O'Neill <> as Senior Developer 

Modified: trunk/libjoda-time-java/debian/libjoda-time-java.poms
===================================================================
--- trunk/libjoda-time-java/debian/libjoda-time-java.poms	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/libjoda-time-java.poms	2012-04-05 07:37:41 UTC (rev 15898)
@@ -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 --has-package-version

Modified: trunk/libjoda-time-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libjoda-time-java/debian/maven.cleanIgnoreRules	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/maven.cleanIgnoreRules	2012-04-05 07:37:41 UTC (rev 15898)
@@ -13,5 +13,5 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., this dependency is then removed
 # from the POM before mvn clean is called
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 

Modified: trunk/libjoda-time-java/debian/maven.ignoreRules
===================================================================
--- trunk/libjoda-time-java/debian/maven.ignoreRules	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/maven.ignoreRules	2012-04-05 07:37:41 UTC (rev 15898)
@@ -12,7 +12,7 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., this dependency is then removed
 # from the POM
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-checkstyle-plugin * * * *

Modified: trunk/libjoda-time-java/debian/maven.publishedRules
===================================================================
--- trunk/libjoda-time-java/debian/maven.publishedRules	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/maven.publishedRules	2012-04-05 07:37:41 UTC (rev 15898)
@@ -15,5 +15,5 @@
 # All elements much match before a rule can be applied
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 

Modified: trunk/libjoda-time-java/debian/maven.rules
===================================================================
--- trunk/libjoda-time-java/debian/maven.rules	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/maven.rules	2012-04-05 07:37:41 UTC (rev 15898)
@@ -14,7 +14,8 @@
 # All elements much match before a rule can be applied
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
-#   junit junit jar s/3\\..*/3.x/
+#   junit junit jar s/3\..*/3.x/
 
 joda-time joda-time jar s/.*/debian/ * *
 junit junit jar s/3\..*/3.x/ * *
+org.joda joda-convert jar s/1\..*/1.x/ * *

Modified: trunk/libjoda-time-java/debian/watch
===================================================================
--- trunk/libjoda-time-java/debian/watch	2012-04-04 21:08:49 UTC (rev 15897)
+++ trunk/libjoda-time-java/debian/watch	2012-04-05 07:37:41 UTC (rev 15898)
@@ -1,4 +1,2 @@
 version=3
-opts="uversionmangle=s/(\d)_(\d)_(\d)\d\d/$1.$2.$3/" \
-  http://joda-time.svn.sourceforge.net/svnroot/joda-time/tags/ \
-  v(.*)/ debian debian/orig-tar.sh
+http://sf.net/joda-time/joda-time-([\d\.]+)-dist.tar.gz

More information about the pkg-java-commits mailing list