[pkg-java] r17161 - in trunk/libjoda-time-java/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Aug 22 20:49:22 UTC 2013
Author: ebourg-guest
Date: 2013-08-22 20:49:22 +0000 (Thu, 22 Aug 2013)
New Revision: 17161
Added:
trunk/libjoda-time-java/debian/patches/
trunk/libjoda-time-java/debian/patches/01-maven2-compatibility.patch
trunk/libjoda-time-java/debian/patches/series
Removed:
trunk/libjoda-time-java/debian/libjoda-time-java-doc.lintian-overrides
Modified:
trunk/libjoda-time-java/debian/README.source
trunk/libjoda-time-java/debian/changelog
trunk/libjoda-time-java/debian/control
trunk/libjoda-time-java/debian/copyright
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/orig-tar.sh
trunk/libjoda-time-java/debian/rules
Log:
New upstream release (2.3)
Added a patch to remove the prerequisite on Maven 3
Ignore the Github's site-maven-plugin
Updated the Homepage field
Removed libclirr-maven-plugin-java from the build dependencies and added clirr-maven-plugin to the list of ignored plugins
Use canonical URLs for the Vcs-* fields
Improved the package description
debian/rules: Install the upstream changelog
debian/copyright: Updated the copyright year
debian/orig-tar.sh: Fixed a warning when building the tarball
Removed the unused lintian overrides
Modified: trunk/libjoda-time-java/debian/README.source
===================================================================
--- trunk/libjoda-time-java/debian/README.source 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/README.source 2013-08-22 20:49:22 UTC (rev 17161)
@@ -1,5 +1,5 @@
Information about libjoda-time-java
-------------------------------
+-----------------------------------
This package was debianized using the mh_make command
from the maven-debian-helper package.
Modified: trunk/libjoda-time-java/debian/changelog
===================================================================
--- trunk/libjoda-time-java/debian/changelog 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/changelog 2013-08-22 20:49:22 UTC (rev 17161)
@@ -1,6 +1,23 @@
+libjoda-time-java (2.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #667724)
+ * Added a patch to remove the prerequisite on Maven 3
+ * Ignore the Github's site-maven-plugin
+ * debian/control:
+ - Updated the Homepage field
+ - Removed libclirr-maven-plugin-java from the build dependencies
+ and added clirr-maven-plugin to the list of ignored plugins
+ - Use canonical URLs for the Vcs-* fields
+ - Improved the package description
+ * debian/rules: Install the upstream changelog
+ * debian/copyright: Updated the copyright year
+ * debian/orig-tar.sh: Fixed a warning when building the tarball
+ * Removed the unused lintian overrides
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 22 Aug 2013 15:54:58 +0200
+
libjoda-time-java (2.2-1) unstable; urgency=low
- * Team upload.
* New upstream release
* Added a build dependency on libmaven-exec-plugin-java
(required to compile the timezone data)
Modified: trunk/libjoda-time-java/debian/control
===================================================================
--- trunk/libjoda-time-java/debian/control 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/control 2013-08-22 20:49:22 UTC (rev 17161)
@@ -6,12 +6,11 @@
Emmanuel Bourg <ebourg at apache.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, libclirr-maven-plugin-java, libjoda-convert-java,
- libmaven-exec-plugin-java
+ junit, default-jdk-doc, ant, libjoda-convert-java, libmaven-exec-plugin-java
Standards-Version: 3.9.4
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjoda-time-java
+Vcs-Svn: svn://anonscm.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
+Homepage: http://www.joda.org/joda-time
Package: libjoda-time-java
Architecture: all
@@ -23,9 +22,8 @@
classes. The design allows for multiple calendar systems, while still
providing a simple API. The 'default' calendar is the ISO8601 standard
which is used by XML. The Gregorian, Julian, Buddhist, Coptic, Ethiopic
- and Islamic systems are also included, and we welcome further
- additions. Supporting classes include time zone, duration, format and
- parsing.
+ and Islamic systems are also included. Supporting classes include time
+ zone, duration, format and parsing.
Package: libjoda-time-java-doc
Architecture: all
@@ -38,6 +36,7 @@
classes. The design allows for multiple calendar systems, while still
providing a simple API. The 'default' calendar is the ISO8601 standard
which is used by XML. The Gregorian, Julian, Buddhist, Coptic, Ethiopic
- and Islamic systems are also included, and we welcome further
- additions. Supporting classes include time zone, duration, format and
- parsing.
+ and Islamic systems are also included. Supporting classes include time
+ zone, duration, format and parsing.
+ .
+ This package contains the developer documentation.
Modified: trunk/libjoda-time-java/debian/copyright
===================================================================
--- trunk/libjoda-time-java/debian/copyright 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/copyright 2013-08-22 20:49:22 UTC (rev 17161)
@@ -1,27 +1,27 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Joda time
-Upstream-Contact: Stephen Colebourne <> as Lead developer
- Brian S O'Neill <> as Senior Developer
- Guy Allard as
- Fredrik Borgh as
- Jeroen van Erp as
- Gwyn Evans as
- Sean Geoghegan as
- Ashish Katyal as
- Antonio Leitao as
- Kostas Maistrelis as
- Al Major as
- Blair Martin as
- Julen Parra as
- Mike Schrag as
- Kandarp Shah as
- Francois Staes as
- Maxim Zhao as
- Ryan Propper as
-Source: http://joda-time.sourceforge.net
+Upstream-Contact: Stephen Colebourne as Lead developer
+ Brian S O'Neill as Senior Developer
+ Guy Allard
+ Fredrik Borgh
+ Jeroen van Erp
+ Gwyn Evans
+ Sean Geoghegan
+ Ashish Katyal
+ Antonio Leitao
+ Kostas Maistrelis
+ Al Major
+ Blair Martin
+ Julen Parra
+ Mike Schrag
+ Kandarp Shah
+ Francois Staes
+ Maxim Zhao
+ Ryan Propper
+Source: http://www.joda.org/joda-time
Files: *
-Copyright: 2002-2010, Joda.org
+Copyright: 2002-2013, Joda.org
License: Apache-2.0
Files: debian/*
Deleted: trunk/libjoda-time-java/debian/libjoda-time-java-doc.lintian-overrides
===================================================================
--- trunk/libjoda-time-java/debian/libjoda-time-java-doc.lintian-overrides 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/libjoda-time-java-doc.lintian-overrides 2013-08-22 20:49:22 UTC (rev 17161)
@@ -1 +0,0 @@
-libjoda-time-java-doc: codeless-jar usr/share/maven-repo/joda-time/joda-time/2.1/joda-time-2.1-javadoc.jar
Modified: trunk/libjoda-time-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libjoda-time-java/debian/maven.cleanIgnoreRules 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/maven.cleanIgnoreRules 2013-08-22 20:49:22 UTC (rev 17161)
@@ -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/libjoda-time-java/debian/maven.ignoreRules
===================================================================
--- trunk/libjoda-time-java/debian/maven.ignoreRules 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/maven.ignoreRules 2013-08-22 20:49:22 UTC (rev 17161)
@@ -1,19 +1,5 @@
-# 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 * * * *
@@ -22,3 +8,4 @@
org.apache.maven.plugins maven-repository-plugin * * * *
org.apache.maven.plugins maven-source-plugin * * * *
org.apache.maven.plugins maven-toolchains-plugin * * * *
+org.codehaus.mojo clirr-maven-plugin * * * *
Modified: trunk/libjoda-time-java/debian/maven.publishedRules
===================================================================
--- trunk/libjoda-time-java/debian/maven.publishedRules 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/maven.publishedRules 2013-08-22 20:49:22 UTC (rev 17161)
@@ -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/
+joda-time joda-time jar s/.*/debian/ * *
Modified: trunk/libjoda-time-java/debian/maven.rules
===================================================================
--- trunk/libjoda-time-java/debian/maven.rules 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/maven.rules 2013-08-22 20:49:22 UTC (rev 17161)
@@ -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/
joda-time joda-time jar s/.*/debian/ * *
junit junit jar s/3\..*/3.x/ * *
Modified: trunk/libjoda-time-java/debian/orig-tar.sh
===================================================================
--- trunk/libjoda-time-java/debian/orig-tar.sh 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/orig-tar.sh 2013-08-22 20:49:22 UTC (rev 17161)
@@ -7,7 +7,7 @@
# clean up the upstream tarball
tar zxvf $3
-mv joda-time-$VERSION $DIR
+rm $3
GZIP=--best tar -czf $TAR --exclude '*.jar' $DIR
rm -rf $DIR
Added: trunk/libjoda-time-java/debian/patches/01-maven2-compatibility.patch
===================================================================
--- trunk/libjoda-time-java/debian/patches/01-maven2-compatibility.patch (rev 0)
+++ trunk/libjoda-time-java/debian/patches/01-maven2-compatibility.patch 2013-08-22 20:49:22 UTC (rev 17161)
@@ -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
+@@ -510,7 +510,7 @@
+
+ <!-- ==================================================================== -->
+ <prerequisites>
+- <maven>3.0.4</maven>
++ <maven>2.2.1</maven>
+ </prerequisites>
+ <dependencies>
+ <dependency>
Added: trunk/libjoda-time-java/debian/patches/series
===================================================================
--- trunk/libjoda-time-java/debian/patches/series (rev 0)
+++ trunk/libjoda-time-java/debian/patches/series 2013-08-22 20:49:22 UTC (rev 17161)
@@ -0,0 +1 @@
+01-maven2-compatibility.patch
Modified: trunk/libjoda-time-java/debian/rules
===================================================================
--- trunk/libjoda-time-java/debian/rules 2013-08-21 18:46:57 UTC (rev 17160)
+++ trunk/libjoda-time-java/debian/rules 2013-08-22 20:49:22 UTC (rev 17161)
@@ -5,5 +5,7 @@
JAVA_HOME := /usr/lib/jvm/default-java
+DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list