[pkg-java] r17158 - in trunk/joda-convert/debian: . patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Wed Aug 21 13:14:07 UTC 2013 

Author: ebourg-guest
Date: 2013-08-21 13:14:06 +0000 (Wed, 21 Aug 2013)
New Revision: 17158

Added:
   trunk/joda-convert/debian/patches/
   trunk/joda-convert/debian/patches/01-maven2-compatibility.patch
   trunk/joda-convert/debian/patches/series
Modified:
   trunk/joda-convert/debian/changelog
   trunk/joda-convert/debian/control
   trunk/joda-convert/debian/copyright
   trunk/joda-convert/debian/maven.cleanIgnoreRules
   trunk/joda-convert/debian/maven.ignoreRules
   trunk/joda-convert/debian/maven.publishedRules
   trunk/joda-convert/debian/maven.rules
Log:
New upstream release (1.4)
Added a patch to remove the prerequisite on Maven 3
Ignore the maven-checkstyle-plugin and the Github's site-maven-plugin
Use canonical URLs for the Vcs-* fields
Updated the homepage
Improved the package description
debian/copyright: Updated the copyright year




Modified: trunk/joda-convert/debian/changelog
===================================================================
--- trunk/joda-convert/debian/changelog	2013-08-20 21:19:07 UTC (rev 17157)
+++ trunk/joda-convert/debian/changelog	2013-08-21 13:14:06 UTC (rev 17158)
@@ -1,3 +1,16 @@
+joda-convert (1.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Added a patch to remove the prerequisite on Maven 3
+  * Ignore the maven-checkstyle-plugin and the Github's site-maven-plugin
+  * debian/control:
+    - Use canonical URLs for the Vcs-* fields
+    - Updated the homepage
+    - Improved the package description
+  * debian/copyright: Updated the copyright year
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 21 Aug 2013 15:13:41 +0200
+
 joda-convert (1.3.1-1) unstable; urgency=low
 
   * Team upload.

Modified: trunk/joda-convert/debian/control
===================================================================
--- trunk/joda-convert/debian/control	2013-08-20 21:19:07 UTC (rev 17157)
+++ trunk/joda-convert/debian/control	2013-08-21 13:14:06 UTC (rev 17158)
@@ -6,17 +6,21 @@
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: libmaven-javadoc-plugin-java, default-jdk-doc, junit
 Standards-Version: 3.9.4
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/joda-convert
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/joda-convert
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/joda-convert/
-Homepage: http://joda-convert.sourceforge.net
+Homepage: http://www.joda.org/joda-convert/
 
 Package: libjoda-convert-java
 Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libjoda-convert-java-doc
-Description: Joda convert
- Library to convert Objects to and from String
+Description: Joda Convert - Java API to convert Objects to and from Strings
+ Joda-Convert provides a small set of classes to aid conversion between Objects
+ and Strings. It is not intended to tackle the wider problem of Object to
+ Object transformation. Joda-Convert supports two mechanisms of extending the
+ list of supported conversions. The first is to write your own converter
+ implementing an interface. The second is to use annotations.
 
 Package: libjoda-convert-java-doc
 Architecture: all
@@ -24,7 +28,11 @@
 Depends: ${misc:Depends}, ${maven:DocDepends}
 Recommends: ${maven:DocOptionalDepends}
 Suggests: libjoda-convert-java
-Description: Documentation for Joda convert
- Library to convert Objects to and from String
+Description: Documentation for Joda Convert
+ Joda-Convert provides a small set of classes to aid conversion between Objects
+ and Strings. It is not intended to tackle the wider problem of Object to
+ Object transformation. Joda-Convert supports two mechanisms of extending the
+ list of supported conversions. The first is to write your own converter
+ implementing an interface. The second is to use annotations.
  .
  This package contains the API documentation of libjoda-convert-java.

Modified: trunk/joda-convert/debian/copyright
===================================================================
--- trunk/joda-convert/debian/copyright	2013-08-20 21:19:07 UTC (rev 17157)
+++ trunk/joda-convert/debian/copyright	2013-08-21 13:14:06 UTC (rev 17158)
@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Joda convert
-Source: http://joda-convert.sourceforge.net
+Upstream-Name: Joda Convert
+Source: http://www.joda.org/joda-convert/
 
 Files: *
-Copyright: 2010-2012, Stephen Colebourne
+Copyright: 2010-2013, Stephen Colebourne
 License: Apache-2.0
 
 Files: debian/*

Modified: trunk/joda-convert/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/joda-convert/debian/maven.cleanIgnoreRules	2013-08-20 21:19:07 UTC (rev 17157)
+++ trunk/joda-convert/debian/maven.cleanIgnoreRules	2013-08-21 13:14:06 UTC (rev 17158)
@@ -1,17 +1 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# 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/
 

Modified: trunk/joda-convert/debian/maven.ignoreRules
===================================================================
--- trunk/joda-convert/debian/maven.ignoreRules	2013-08-20 21:19:07 UTC (rev 17157)
+++ trunk/joda-convert/debian/maven.ignoreRules	2013-08-21 13:14:06 UTC (rev 17158)
@@ -1,20 +1,7 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# 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/
 
+com.github.github site-maven-plugin * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
 org.apache.maven.plugins maven-deploy-plugin * * * *
 org.apache.maven.plugins maven-repository-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *

Modified: trunk/joda-convert/debian/maven.publishedRules
===================================================================
--- trunk/joda-convert/debian/maven.publishedRules	2013-08-20 21:19:07 UTC (rev 17157)
+++ trunk/joda-convert/debian/maven.publishedRules	2013-08-21 13:14:06 UTC (rev 17158)
@@ -1,19 +1,2 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# 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/
 
+org.joda joda-convert jar s/1\..*/1.x/ * *

Modified: trunk/joda-convert/debian/maven.rules
===================================================================
--- trunk/joda-convert/debian/maven.rules	2013-08-20 21:19:07 UTC (rev 17157)
+++ trunk/joda-convert/debian/maven.rules	2013-08-21 13:14:06 UTC (rev 17158)
@@ -1,20 +1,3 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# 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/
 
-org.joda joda-convert jar s/1\..*/1.x/ * *
 junit junit jar s/4\..*/4.x/ * *
+org.joda joda-convert jar s/1\..*/1.x/ * *

Added: trunk/joda-convert/debian/patches/01-maven2-compatibility.patch
===================================================================
--- trunk/joda-convert/debian/patches/01-maven2-compatibility.patch	                        (rev 0)
+++ trunk/joda-convert/debian/patches/01-maven2-compatibility.patch	2013-08-21 13:14:06 UTC (rev 17158)
@@ -0,0 +1,14 @@
+Description: Removes the prerequisite on Maven 3 since the project builds fine with Maven 2
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -345,7 +345,7 @@
+ 
+   <!-- ==================================================================== -->
+   <prerequisites>
+-    <maven>3.0.4</maven>
++    <maven>2.2.1</maven>
+   </prerequisites>
+   <dependencies>
+     <dependency>

Added: trunk/joda-convert/debian/patches/series
===================================================================
--- trunk/joda-convert/debian/patches/series	                        (rev 0)
+++ trunk/joda-convert/debian/patches/series	2013-08-21 13:14:06 UTC (rev 17158)
@@ -0,0 +1 @@
+01-maven2-compatibility.patch

More information about the pkg-java-commits mailing list