[pkg-java] r17356 - trunk/maven-plugin-tools/debian
Author: ebourg-guest Date: 2013-10-18 15:27:36 + (Fri, 18 Oct 2013) New Revision: 17356 Modified: trunk/maven-plugin-tools/debian/changelog trunk/maven-plugin-tools/debian/orig-tar.sh Log: Use XZ compression for the upstream tarball Modified: trunk/maven-plugin-tools/debian/changelog === --- trunk/maven-plugin-tools/debian/changelog 2013-10-18 15:25:49 UTC (rev 17355) +++ trunk/maven-plugin-tools/debian/changelog 2013-10-18 15:27:36 UTC (rev 17356) @@ -1,3 +1,10 @@ +maven-plugin-tools (2.8-4) UNRELEASED; urgency=low + + * Team upload. + * Use XZ compression for the upstream tarball + + -- Emmanuel Bourg Fri, 18 Oct 2013 17:27:06 +0200 + maven-plugin-tools (2.8-3) unstable; urgency=low * Team upload. Modified: trunk/maven-plugin-tools/debian/orig-tar.sh === --- trunk/maven-plugin-tools/debian/orig-tar.sh 2013-10-18 15:25:49 UTC (rev 17355) +++ trunk/maven-plugin-tools/debian/orig-tar.sh 2013-10-18 15:27:36 UTC (rev 17356) @@ -1,11 +1,11 @@ #!/bin/sh -e -TAR=../maven-plugin-tools_$2.orig.tar.gz +TAR=../maven-plugin-tools_$2.orig.tar.xz DIR=maven-plugin-tools-$2 TAG=maven-plugin-tools-$2 svn export http://svn.apache.org/repos/asf/maven/plugin-tools/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +tar -c -J -f $TAR $DIR rm -rf $DIR ../$TAG # move to directory 'tarballs' ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17357 - trunk/maven2/debian
Author: ebourg-guest Date: 2013-10-18 15:53:20 + (Fri, 18 Oct 2013) New Revision: 17357 Modified: trunk/maven2/debian/changelog trunk/maven2/debian/compat trunk/maven2/debian/control Log: Rebuild with libmaven2-core-java 2.2.1-11 (Updates maven-javadoc-plugin, maven-jar-plugin and maven-dependency-plugin) Modified: trunk/maven2/debian/changelog === --- trunk/maven2/debian/changelog 2013-10-18 15:27:36 UTC (rev 17356) +++ trunk/maven2/debian/changelog 2013-10-18 15:53:20 UTC (rev 17357) @@ -1,3 +1,12 @@ +maven2 (2.2.1-15) unstable; urgency=low + + * Team upload. + * Rebuild with libmaven2-core-java 2.2.1-11 (Updates maven-javadoc-plugin, +maven-jar-plugin and maven-dependency-plugin) + * Build depend on debhelper >= 9 + + -- Emmanuel Bourg Fri, 18 Oct 2013 17:52:29 +0200 + maven2 (2.2.1-14) unstable; urgency=low * Team upload. Modified: trunk/maven2/debian/compat === --- trunk/maven2/debian/compat 2013-10-18 15:27:36 UTC (rev 17356) +++ trunk/maven2/debian/compat 2013-10-18 15:53:20 UTC (rev 17357) @@ -1 +1 @@ -7 +9 Modified: trunk/maven2/debian/control === --- trunk/maven2/debian/control 2013-10-18 15:27:36 UTC (rev 17356) +++ trunk/maven2/debian/control 2013-10-18 15:53:20 UTC (rev 17357) @@ -7,8 +7,8 @@ Build-Depends-Indep: maven-repo-helper, ant-optional, junit, libmaven-clean-plugin-java, libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java, libmaven-resources-plugin-java, libmaven-shade-plugin-java, - libmaven2-core-java (>= 2.2.1-10~), maven-ant-helper -Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk, ant + libmaven2-core-java (>= 2.2.1-11~), maven-ant-helper +Build-Depends: debhelper (>= 9), cdbs (>= 0.4.5.3), default-jdk, ant Standards-Version: 3.9.4 Homepage: http://maven.apache.org Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven2 ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17358 - trunk/maven-dependency-analyzer/debian
Author: ebourg-guest
Date: 2013-10-18 21:33:45 + (Fri, 18 Oct 2013)
New Revision: 17358
Modified:
trunk/maven-dependency-analyzer/debian/changelog
trunk/maven-dependency-analyzer/debian/compat
trunk/maven-dependency-analyzer/debian/control
trunk/maven-dependency-analyzer/debian/copyright
trunk/maven-dependency-analyzer/debian/rules
Log:
Fixed the Vcs-* fields
Updated Standards-Version to 3.9.4 (no changes)
Modified the Homepage field
Switch to debhelper compat level 9
debian/copyright: Updated to the Copyright Format 1.0
debian/rules: Improved the clean target
Modified: trunk/maven-dependency-analyzer/debian/changelog
===
--- trunk/maven-dependency-analyzer/debian/changelog2013-10-18 15:53:20 UTC
(rev 17357)
+++ trunk/maven-dependency-analyzer/debian/changelog2013-10-18 21:33:45 UTC
(rev 17358)
@@ -1,3 +1,16 @@
+maven-dependency-analyzer (1.2-2) unstable; urgency=low
+
+ * Team upload.
+ * debian/control:
+- Fixed the Vcs-* fields
+- Updated Standards-Version to 3.9.4 (no changes)
+- Modified the Homepage field
+ * Switch to debhelper compat level 9
+ * debian/copyright: Updated to the Copyright Format 1.0
+ * debian/rules: Improved the clean target
+
+ -- Emmanuel Bourg Fri, 18 Oct 2013 21:50:51 +0200
+
maven-dependency-analyzer (1.2-1) unstable; urgency=low
* Team upload.
Modified: trunk/maven-dependency-analyzer/debian/compat
===
--- trunk/maven-dependency-analyzer/debian/compat 2013-10-18 15:53:20 UTC
(rev 17357)
+++ trunk/maven-dependency-analyzer/debian/compat 2013-10-18 21:33:45 UTC
(rev 17358)
@@ -1 +1 @@
-7
+9
Modified: trunk/maven-dependency-analyzer/debian/control
===
--- trunk/maven-dependency-analyzer/debian/control 2013-10-18 15:53:20 UTC
(rev 17357)
+++ trunk/maven-dependency-analyzer/debian/control 2013-10-18 21:33:45 UTC
(rev 17358)
@@ -3,18 +3,27 @@
Priority: optional
Maintainer: Debian Java Maintainers
Uploaders: Ludovic Claude
-Build-Depends: ant, debhelper (>= 7), cdbs, default-jdk, libjaxp1.3-java
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant-optional,
- junit, libmaven-plugin-tools-java, libplexus-component-metadata-java (>=
1.0~beta3.0.7),
- libmaven2-core-java, libasm3-java, libplexus-utils-java
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-plugin-tools
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-plugin-tools/
-Homepage: http://maven.apache.org
+Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, libjaxp1.3-java
+Build-Depends-Indep: ant-optional,
+ junit,
+ libasm3-java,
+ libmaven-plugin-tools-java,
+ libmaven2-core-java,
+ libplexus-component-metadata-java (>= 1.0~beta3.0.7),
+ libplexus-utils-java,
+ maven-ant-helper (>> 4),
+ maven-repo-helper
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-dependency-analyzer
+Vcs-Browser:
http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-dependency-analyzer
+Homepage: http://maven.apache.org/shared/maven-dependency-analyzer/
Package: libmaven-dependency-analyzer-java
Architecture: all
-Depends: ${misc:Depends}, libmaven2-core-java, libasm3-java,
libplexus-utils-java
+Depends: libasm3-java,
+ libmaven2-core-java,
+ libplexus-utils-java,
+ ${misc:Depends}
Description: Maven Dependency Analyzer
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
Modified: trunk/maven-dependency-analyzer/debian/copyright
===
--- trunk/maven-dependency-analyzer/debian/copyright2013-10-18 15:53:20 UTC
(rev 17357)
+++ trunk/maven-dependency-analyzer/debian/copyright2013-10-18 21:33:45 UTC
(rev 17358)
@@ -1,7 +1,7 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Maven Dependency Analyzer
-Maintainer: Apache Maven team
-Source: http://maven.apache.org/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Maven Dependency Analyzer
+Upstream-Contact: Apache Maven team
+Source: http://maven.apache.org
Files: *
Copyright: 2001-2009, The Apache Software Foundation.
@@ -15,8 +15,7 @@
On Debian GNU/Linux system you can find the complete text of the
Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
-License: GPL-3
+License: GPL-3+
On Debian GNU/Linux system you can find the complete text of the
- GNU General Public License version 3 license in
+ GNU General Public License version 3 licens
[pkg-java] r17359 - trunk/maven-resources-plugin/debian
Author: ebourg-guest
Date: 2013-10-18 22:20:51 + (Fri, 18 Oct 2013)
New Revision: 17359
Modified:
trunk/maven-resources-plugin/debian/README.source
trunk/maven-resources-plugin/debian/changelog
trunk/maven-resources-plugin/debian/control
trunk/maven-resources-plugin/debian/copyright
trunk/maven-resources-plugin/debian/libmaven-resources-plugin-java.poms
trunk/maven-resources-plugin/debian/orig-tar.sh
Log:
Updated Standards-Version to 3.9.4 (no changes)
Use canonical URLs for the Vcs-* fields
debian/copyright: Updated to the Copyright Format 1.0
Build depend on debhelper >= 9
Use XZ compression for the upstream tarball
Documented the procedure to update the core Maven plugins in README.source
Modified: trunk/maven-resources-plugin/debian/README.source
===
--- trunk/maven-resources-plugin/debian/README.source 2013-10-18 21:33:45 UTC
(rev 17358)
+++ trunk/maven-resources-plugin/debian/README.source 2013-10-18 22:20:51 UTC
(rev 17359)
@@ -1,6 +1,13 @@
Information about maven-resources-plugin
---
+
+This plugin is a core Maven plugin, if you update it to a new upstream release
+the superpom in the maven2-core package must be updated to specify the new
+version of the plugin. This pom is bundled in a jar built by the maven2
package,
+so the maven2 package has to be rebuilt after installing the updated
maven2-core
+package.
+
+
This package was debianized using the mh_make command
from the maven-debian-helper package.
Modified: trunk/maven-resources-plugin/debian/changelog
===
--- trunk/maven-resources-plugin/debian/changelog 2013-10-18 21:33:45 UTC
(rev 17358)
+++ trunk/maven-resources-plugin/debian/changelog 2013-10-18 22:20:51 UTC
(rev 17359)
@@ -1,3 +1,16 @@
+maven-resources-plugin (2.3-8) UNRELEASED; urgency=low
+
+ * Team upload.
+ * debian/control:
+- Updated Standards-Version to 3.9.4 (no changes)
+- Use canonical URLs for the Vcs-* fields
+ * debian/copyright: Updated to the Copyright Format 1.0
+ * Build depend on debhelper >= 9
+ * Use XZ compression for the upstream tarball
+ * Documented the procedure to update the core Maven plugins in README.source
+
+ -- Emmanuel Bourg Fri, 18 Oct 2013 23:53:52 +0200
+
maven-resources-plugin (2.3-7) unstable; urgency=low
* Add missing Build-Depends-Indep: libmaven-plugin-tools-java.
Modified: trunk/maven-resources-plugin/debian/control
===
--- trunk/maven-resources-plugin/debian/control 2013-10-18 21:33:45 UTC (rev
17358)
+++ trunk/maven-resources-plugin/debian/control 2013-10-18 22:20:51 UTC (rev
17359)
@@ -3,19 +3,24 @@
Priority: optional
Maintainer: Debian Java Maintainers
Uploaders: Torsten Werner
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>=
1.4)
-Build-Depends-Indep: libmaven-filtering-java, libmaven2-core-java,
- libplexus-utils-java, libmaven-plugin-testing-java, default-jdk-doc,
- libmaven2-core-java-doc, libplexus-utils-java-doc,
- libmaven-javadoc-plugin-java, libmaven-plugin-tools-java
-Standards-Version: 3.9.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-resources-plugin
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-resources-plugin/
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>=
1.4)
+Build-Depends-Indep: default-jdk-doc,
+ libmaven-filtering-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-plugin-testing-java,
+ libmaven-plugin-tools-java,
+ libmaven2-core-java,
+ libmaven2-core-java-doc,
+ libplexus-utils-java,
+ libplexus-utils-java-doc
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-resources-plugin
+Vcs-Browser:
http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-resources-plugin/
Homepage: http://maven.apache.org/plugins/maven-resources-plugin/
Package: libmaven-resources-plugin-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
Suggests: libmaven-resources-plugin-java-doc
Description: Maven resources plugin
@@ -40,7 +45,7 @@
Package: libmaven-resources-plugin-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
Recommends: ${maven:DocOptionalDepends}
Suggests: libmaven-resources-plugin-java
Description: Documentation for Maven resources plugin
Modified: trunk/maven-resources-plugin/debian/copyright
===
--- trunk/maven-resources-plugin/debian/copyrigh
[pkg-java] r17360 - trunk/maven-filtering/debian
Author: ebourg-guest
Date: 2013-10-18 22:33:08 + (Fri, 18 Oct 2013)
New Revision: 17360
Modified:
trunk/maven-filtering/debian/changelog
trunk/maven-filtering/debian/compat
trunk/maven-filtering/debian/control
trunk/maven-filtering/debian/rules
Log:
Use canonical URLs for the Vcs-* fields
Updated Standards-Version to 3.9.4 (no changes)
debian/rules: Improved the clean target
Modified: trunk/maven-filtering/debian/changelog
===
--- trunk/maven-filtering/debian/changelog 2013-10-18 22:20:51 UTC (rev
17359)
+++ trunk/maven-filtering/debian/changelog 2013-10-18 22:33:08 UTC (rev
17360)
@@ -1,3 +1,13 @@
+maven-filtering (1.0~beta-2-6) UNRELEASED; urgency=low
+
+ * Team upload.
+ * debian/control
+- Use canonical URLs for the Vcs-* fields
+- Updated Standards-Version to 3.9.4 (no changes)
+ * debian/rules: Improved the clean target
+
+ -- Emmanuel Bourg Sat, 19 Oct 2013 00:29:45 +0200
+
maven-filtering (1.0~beta-2-5) unstable; urgency=low
* Add myself to Uploaders.
Modified: trunk/maven-filtering/debian/compat
===
--- trunk/maven-filtering/debian/compat 2013-10-18 22:20:51 UTC (rev 17359)
+++ trunk/maven-filtering/debian/compat 2013-10-18 22:33:08 UTC (rev 17360)
@@ -1 +1 @@
-7
+9
Modified: trunk/maven-filtering/debian/control
===
--- trunk/maven-filtering/debian/control2013-10-18 22:20:51 UTC (rev
17359)
+++ trunk/maven-filtering/debian/control2013-10-18 22:33:08 UTC (rev
17360)
@@ -2,21 +2,30 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
-Uploaders: Torsten Werner , Damien Raude-Morvan
-Build-Depends: default-jdk, debhelper (>= 7), cdbs
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
ant-optional,
- junit,
- libmaven2-core-java, libplexus-container-default-java,
- libplexus-interpolation-java (>= 1.6), libplexus-utils-java (>= 1.5.6),
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-filtering
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-filtering/
+Uploaders: Torsten Werner ,
+ Damien Raude-Morvan
+Build-Depends: cdbs, debhelper (>= 9), default-jdk
+Build-Depends-Indep: ant,
+ ant-optional,
+ junit,
+ libmaven2-core-java,
+ libplexus-container-default-java,
+ libplexus-interpolation-java (>= 1.6),
+ libplexus-utils-java (>= 1.5.6),
+ maven-ant-helper (>> 4),
+ maven-repo-helper
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-filtering
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-filtering/
Homepage: http://maven.apache.org/shared/maven-filtering/
Package: libmaven-filtering-java
Architecture: all
-Depends: ${misc:Depends}, libmaven2-core-java,
libplexus-container-default-java,
- libplexus-interpolation-java (>= 1.6), libplexus-utils-java (>= 1.5.6)
+Depends: libmaven2-core-java,
+ libplexus-container-default-java,
+ libplexus-interpolation-java (>= 1.6),
+ libplexus-utils-java (>= 1.5.6),
+ ${misc:Depends}
Description: Maven Filtering
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
Modified: trunk/maven-filtering/debian/rules
===
--- trunk/maven-filtering/debian/rules 2013-10-18 22:20:51 UTC (rev 17359)
+++ trunk/maven-filtering/debian/rules 2013-10-18 22:33:08 UTC (rev 17360)
@@ -26,6 +26,7 @@
clean::
mh_clean
+ mh_unpatchpoms -plib$(PACKAGE)-java
# Extract generated plexus components.xml files from a standard Maven build
copy-plexus-components: target/classes/META-INF/plexus/components.xml
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17361 - trunk/plexus-interpolation/debian
Author: ebourg-guest
Date: 2013-10-18 23:21:07 + (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 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/compat2013-10-18 22:33:08 UTC (rev
17360)
+++ trunk/plexus-interpolation/debian/compat2013-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
-Uploaders: Torsten Werner , Ludovic Claude
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>=
1.4)
+Uploaders: Torsten Werner ,
+ Ludovic Claude
+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:
# [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 tag from the POM
# --package=: an alternative package to use whe
[pkg-java] r17362 - trunk/plexus-interpolation/debian
Author: ebourg-guest Date: 2013-10-18 23:36:17 + (Fri, 18 Oct 2013) New Revision: 17362 Removed: trunk/plexus-interpolation/debian/patches/ Modified: trunk/plexus-interpolation/debian/changelog trunk/plexus-interpolation/debian/maven.properties Log: New upstream release (1.19) Modified: trunk/plexus-interpolation/debian/changelog === --- trunk/plexus-interpolation/debian/changelog 2013-10-18 23:21:07 UTC (rev 17361) +++ trunk/plexus-interpolation/debian/changelog 2013-10-18 23:36:17 UTC (rev 17362) @@ -1,9 +1,13 @@ -plexus-interpolation (1.11-4) UNRELEASED; urgency=low +plexus-interpolation (1.19-1) unstable; urgency=low * Team upload. + * New upstream release: +- Set source/target level to 1.6 +- Removed 0001-add-test-dependency-junit.patch * debian/control: - Updated Standards-Version to 3.9.4 (no changes) - Use canonical URLs for the Vcs-* fields + * Build depend on debhelper >= 9 * debian/watch: Updated to catch the new versions on Github -- Emmanuel Bourg Sat, 19 Oct 2013 01:08:57 +0200 Modified: trunk/plexus-interpolation/debian/maven.properties === --- trunk/plexus-interpolation/debian/maven.properties 2013-10-18 23:21:07 UTC (rev 17361) +++ trunk/plexus-interpolation/debian/maven.properties 2013-10-18 23:36:17 UTC (rev 17362) @@ -2,3 +2,5 @@ # For example: # maven.test.skip=true +maven.compiler.source=1.6 +maven.compiler.target=1.6 ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17364 - trunk/maven-plugin-tools/debian
Author: ebourg-guest Date: 2013-10-19 16:57:41 + (Sat, 19 Oct 2013) New Revision: 17364 Modified: trunk/maven-plugin-tools/debian/build.xml Log: Fixed the indentation of debian/build.xml Modified: trunk/maven-plugin-tools/debian/build.xml === --- trunk/maven-plugin-tools/debian/build.xml 2013-10-19 14:57:48 UTC (rev 17363) +++ trunk/maven-plugin-tools/debian/build.xml 2013-10-19 16:57:41 UTC (rev 17364) @@ -2,37 +2,37 @@ - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + @@ -55,29 +55,29 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 02/09: sisu-ioc/2.3.0-4 hasn't been uploaded yet
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit cba3b1d862580816d49893e68efef8d94e16ff39 Author: Emmanuel Bourg Date: Mon Oct 21 10:41:19 2013 +0200 sisu-ioc/2.3.0-4 hasn't been uploaded yet --- debian/changelog | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index ddc1393..5993ca2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,12 @@ -sisu-ioc (2.3.0-5) UNRELEASED; urgency=low +sisu-ioc (2.3.0-4) UNRELEASED; urgency=low * Team upload. + + [ Emmanuel Bourg ] * debian/control: - Use canonical URLs for the Vcs-* fields - -- Emmanuel Bourg Mon, 21 Oct 2013 10:34:13 +0200 - -sisu-ioc (2.3.0-4) unstable; urgency=low - - * Team upload. + [ Eugene Zhukov ] * add patch to remove jdk15 classifier from testng dependency from pom.xml * fix testng version handling in d/maven.rules -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 07/09: Build depend on debhelper >= 9
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit db44be89bc141174c5b45d014f799c6c063f0d4f Author: Emmanuel Bourg Date: Mon Oct 21 11:28:03 2013 +0200 Build depend on debhelper >= 9 --- debian/changelog |1 + debian/compat|2 +- debian/control |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d98446a..12fc9aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low * debian/copyright: Merged the duplicate Copyright fields * Updated the override for the Lintian codeless-jar warning * Removed the now unnecessary patch testng_classifier.diff + * Build depend on debhelper >= 9 [ Eugene Zhukov ] * Fix testng version handling in d/maven.rules diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 78861f9..666e8f0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: Damien Raude-Morvan -Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4) +Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: default-jdk-doc, junit4, junit4-doc, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 01/09: Use canonical URLs for the Vcs-* fields
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit b59edf456f9c351825af746535f5256aa982e350 Author: Emmanuel Bourg Date: Mon Oct 21 10:37:49 2013 +0200 Use canonical URLs for the Vcs-* fields --- debian/changelog |8 debian/control |6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9da136b..ddc1393 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sisu-ioc (2.3.0-5) UNRELEASED; urgency=low + + * Team upload. + * debian/control: +- Use canonical URLs for the Vcs-* fields + + -- Emmanuel Bourg Mon, 21 Oct 2013 10:34:13 +0200 + sisu-ioc (2.3.0-4) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index a9a79c1..dac27d8 100644 --- a/debian/control +++ b/debian/control @@ -27,9 +27,9 @@ Build-Depends-Indep: default-jdk-doc, libsisu-guice-java, testng Standards-Version: 3.9.3.1 -Vcs-Git: git://git.debian.org/git/pkg-java/sisu-ioc.git -Vcs-Browser: http://git.debian.org/?p=pkg-java/sisu-ioc.git -Homepage: http://sisu.sonatype.org/ +Vcs-Git: git://anonscm.debian.org/pkg-java/sisu-ioc.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sisu-ioc.git +Homepage: http://sisu.sonatype.org Package: libsisu-ioc-java Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 03/09: Updated Standards-Version to 3.9.4 (no changes)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit 4e7ae152416accf78fbd8236cb168408f831fcd7 Author: Emmanuel Bourg Date: Mon Oct 21 10:45:40 2013 +0200 Updated Standards-Version to 3.9.4 (no changes) --- debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5993ca2..765d6f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low [ Emmanuel Bourg ] * debian/control: - Use canonical URLs for the Vcs-* fields +- Updated Standards-Version to 3.9.4 (no changes) [ Eugene Zhukov ] * add patch to remove jdk15 classifier from testng dependency from pom.xml diff --git a/debian/control b/debian/control index dac27d8..78861f9 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends-Indep: default-jdk-doc, libplexus-utils2-java-doc, libsisu-guice-java, testng -Standards-Version: 3.9.3.1 +Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-java/sisu-ioc.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sisu-ioc.git Homepage: http://sisu.sonatype.org -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 06/09: Removed the opposite patches testng_classifier.diff and pom_testng_classifier.patch
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit 9d162a969dae62c14d4f8213ddffe647674e0def Author: Emmanuel Bourg Date: Mon Oct 21 11:04:38 2013 +0200 Removed the opposite patches testng_classifier.diff and pom_testng_classifier.patch --- debian/changelog |4 +-- debian/patches/pom_testng_classifier.patch | 35 debian/patches/series |2 -- debian/patches/testng_classifier.diff | 41 4 files changed, 2 insertions(+), 80 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d8f45d..d98446a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,10 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low - Updated Standards-Version to 3.9.4 (no changes) * debian/copyright: Merged the duplicate Copyright fields * Updated the override for the Lintian codeless-jar warning + * Removed the now unnecessary patch testng_classifier.diff [ Eugene Zhukov ] - * add patch to remove jdk15 classifier from testng dependency from pom.xml - * fix testng version handling in d/maven.rules + * Fix testng version handling in d/maven.rules -- Eugene Zhukov Fri, 04 Oct 2013 07:52:09 + diff --git a/debian/patches/pom_testng_classifier.patch b/debian/patches/pom_testng_classifier.patch deleted file mode 100644 index c427cb7..000 --- a/debian/patches/pom_testng_classifier.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: removes jdk15 classifier from testng dependency - * remove jdk15 classifier from testng dependency in pom.xml -Author: Eugene Zhukov -Last-Update: 2013-10-04 - a/pom.xml -+++ b/pom.xml -@@ -185,7 +185,6 @@ - org.testng - testng - 6.2 -- jdk15 - - - a/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml -+++ b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml -@@ -70,7 +70,6 @@ - org.testng - testng - true -- jdk15 - - - org.sonatype.sisu.inject a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -+++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -@@ -81,7 +81,6 @@ - org.testng - testng - true -- jdk15 - - - diff --git a/debian/patches/series b/debian/patches/series index 92bacb4..f89ca17 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,5 @@ fix_osgi43.diff version_plexus.diff -testng_classifier.diff guice_classifier.diff modules.diff javac_apt_scanner.diff -pom_testng_classifier.patch diff --git a/debian/patches/testng_classifier.diff b/debian/patches/testng_classifier.diff deleted file mode 100644 index 506bcd2..000 --- a/debian/patches/testng_classifier.diff +++ /dev/null @@ -1,41 +0,0 @@ -Description: Add jdk15 to testng - dependency (default in Debian). -Author: Damien Raude-Morvan -Forwarded: not-needed - -Index: b/pom.xml -=== a/pom.xml -+++ b/pom.xml -@@ -185,6 +185,7 @@ - org.testng - testng - 6.2 -+ jdk15 - - - -Index: b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml -=== a/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml -+++ b/sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml -@@ -70,6 +70,7 @@ - org.testng - testng - true -+ jdk15 - - - org.sonatype.sisu.inject -Index: b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -=== a/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -+++ b/sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml -@@ -77,6 +77,7 @@ - org.testng - testng - true -+ jdk15 - - - -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 05/09: Updated the override for the Lintian codeless-jar warning
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit 6b798f5ab48a3faf6e3b7673196de1d412decfe4 Author: Emmanuel Bourg Date: Mon Oct 21 11:00:33 2013 +0200 Updated the override for the Lintian codeless-jar warning --- debian/changelog |1 + debian/libsisu-ioc-java.lintian-overrides |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a36d8e6..1d8f45d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low - Use canonical URLs for the Vcs-* fields - Updated Standards-Version to 3.9.4 (no changes) * debian/copyright: Merged the duplicate Copyright fields + * Updated the override for the Lintian codeless-jar warning [ Eugene Zhukov ] * add patch to remove jdk15 classifier from testng dependency from pom.xml diff --git a/debian/libsisu-ioc-java.lintian-overrides b/debian/libsisu-ioc-java.lintian-overrides index 8b13a9b..c880e60 100644 --- a/debian/libsisu-ioc-java.lintian-overrides +++ b/debian/libsisu-ioc-java.lintian-overrides @@ -1,3 +1,3 @@ # Upstream also ship those JAR without any .class -libsisu-ioc-java binary: codeless-jar usr/share/maven-repo/org/sonatype/sisu/sisu-osgi-registry/*/sisu-osgi-registry-*.jar -libsisu-ioc-java binary: codeless-jar usr/share/maven-repo/org/sonatype/sisu/sisu-spi-registry/*/sisu-spi-registry-*.jar \ No newline at end of file +libsisu-ioc-java binary: codeless-jar */sisu-osgi-registry*.jar +libsisu-ioc-java binary: codeless-jar */sisu-spi-registry*.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] branch master updated (d5d5a4b -> 0f8fdf1)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository sisu-ioc. from d5d5a4b TestNG dependency update new b59edf4 Use canonical URLs for the Vcs-* fields new cba3b1d sisu-ioc/2.3.0-4 hasn't been uploaded yet new 4e7ae15 Updated Standards-Version to 3.9.4 (no changes) new c21a992 debian/copyright: Merged the duplicate Copyright fields new 6b798f5 Updated the override for the Lintian codeless-jar warning new 9d162a9 Removed the opposite patches testng_classifier.diff and pom_testng_classifier.patch new db44be8 Build depend on debhelper >= 9 new 7ee1a3e Ignore the sisu-eclipse-registry module with a flag in libsisu-ioc-java.poms instead of a patch new 0f8fdf1 Use XZ compression for the upstream tarball The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 19 +++-- debian/compat |2 +- debian/control | 10 +++ debian/copyright |8 +++--- debian/libsisu-ioc-java.lintian-overrides |4 +-- debian/libsisu-ioc-java.poms | 14 ++ debian/orig-tar.sh |4 +-- debian/patches/modules.diff| 18 debian/patches/pom_testng_classifier.patch | 35 debian/patches/series |3 -- debian/patches/testng_classifier.diff | 41 11 files changed, 38 insertions(+), 120 deletions(-) delete mode 100644 debian/patches/modules.diff delete mode 100644 debian/patches/pom_testng_classifier.patch delete mode 100644 debian/patches/testng_classifier.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 09/09: Use XZ compression for the upstream tarball
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit 0f8fdf1723adbc79874eac6379341eec6d2f309a Author: Emmanuel Bourg Date: Mon Oct 21 11:38:46 2013 +0200 Use XZ compression for the upstream tarball --- debian/changelog |1 + debian/orig-tar.sh |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e8b30d2..682b79b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low * Build depend on debhelper >= 9 * Ignore the sisu-eclipse-registry module with a flag in libsisu-ioc-java.poms instead of a patch + * Use XZ compression for the upstream tarball [ Eugene Zhukov ] * Fix testng version handling in d/maven.rules diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 447ee63..8b691c3 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,10 +1,10 @@ #!/bin/sh -e VERSION=$2 -TAR=../sisu-ioc_$VERSION.orig.tar.gz +TAR=../sisu-ioc_$VERSION.orig.tar.xz DIR=sisu-ioc-$VERSION tar xzf $3 mv sonatype-sisu-* $DIR -GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR +XZ_OPT=--best tar cJf $TAR -X debian/orig-tar.exclude $DIR rm -rf $DIR -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 04/09: debian/copyright: Merged the duplicate Copyright fields
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit c21a9923af26c444ef4b61a5c1df977a4e008178 Author: Emmanuel Bourg Date: Mon Oct 21 10:50:47 2013 +0200 debian/copyright: Merged the duplicate Copyright fields --- debian/changelog |1 + debian/copyright |8 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 765d6f7..a36d8e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low * debian/control: - Use canonical URLs for the Vcs-* fields - Updated Standards-Version to 3.9.4 (no changes) + * debian/copyright: Merged the duplicate Copyright fields [ Eugene Zhukov ] * add patch to remove jdk15 classifier from testng dependency from pom.xml diff --git a/debian/copyright b/debian/copyright index 3d862d0..c88a458 100644 --- a/debian/copyright +++ b/debian/copyright @@ -129,12 +129,12 @@ Files: sisu-inject/containers/guice-plexus/guice-plexus-binders/pom.xml sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/sonatype/guice/plexus/shim/PseudoPlexusContainer.java sisu-inject/containers/guice-plexus/pom.xml sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml -Copyright: Copyright (c) 2010-2011 Sonatype, Inc. +Copyright: 2010-2011, Sonatype, Inc. License: EPL Files: sisu-inject/containers/guice-plexus/guice-plexus-shim/src/test/java/org/codehaus/plexus/component/configurator/* sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/configurator/* -Copyright: Copyright (c) 2004, The Codehaus +Copyright: 2004, The Codehaus License: Expat Files: sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java @@ -147,8 +147,8 @@ Files: sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/c sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/component/MapOrientedComponent.java sisu-inject/containers/guice-plexus/guice-plexus-shim/src/main/java/org/codehaus/plexus/PlexusTestCase.java sisu-inject/containers/guice-plexus/guice-plexus-shim/src/test/* -Copyright: Copyright 2001-2005 The Apache Software Foundation -Copyright: Copyright 2001-2006 Codehaus Foundation +Copyright: 2001-2005, The Apache Software Foundation + 2001-2006, Codehaus Foundation License: Apache-2.0 Files: sisu-inject/containers/guice-bean/guice-bean-scanners/src/main/java/org/sonatype/guice/bean/scanners/asm/* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[sisu-ioc] 08/09: Ignore the sisu-eclipse-registry module with a flag in libsisu-ioc-java.poms instead of a patch
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sisu-ioc. commit 7ee1a3e59418e28e305e2f7f6dd7e5824a8db98a Author: Emmanuel Bourg Date: Mon Oct 21 11:33:44 2013 +0200 Ignore the sisu-eclipse-registry module with a flag in libsisu-ioc-java.poms instead of a patch --- debian/changelog |2 ++ debian/libsisu-ioc-java.poms | 14 -- debian/patches/modules.diff | 18 -- debian/patches/series|1 - 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 12fc9aa..e8b30d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low * Updated the override for the Lintian codeless-jar warning * Removed the now unnecessary patch testng_classifier.diff * Build depend on debhelper >= 9 + * Ignore the sisu-eclipse-registry module with a flag in +libsisu-ioc-java.poms instead of a patch [ Eugene Zhukov ] * Fix testng version handling in d/maven.rules diff --git a/debian/libsisu-ioc-java.poms b/debian/libsisu-ioc-java.poms index 9b702cf..507fac1 100644 --- a/debian/libsisu-ioc-java.poms +++ b/debian/libsisu-ioc-java.poms @@ -3,8 +3,8 @@ # [option]* # where option can be: # --ignore: ignore this POM and its artifact if any -# --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. +# --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 tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact @@ -13,15 +13,17 @@ # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: 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 to use when installing the library in /usr/share/java # --usj-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=: the destination for the real jar -# it will be installed with mh_install. +# --dest-jar=: the destination for the real jar. +# It will be installed with mh_install. [mh_install] # --classifier=: Optional, the classifier for the jar. Empty by default. +# --site-xml=: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] # pom.xml --no-parent --has-package-version sisu-inject/pom.xml --has-package-version --java-lib @@ -46,5 +48,5 @@ sisu-inject/containers/guice-plexus/guice-plexus-shim/pom.xml --has-package-vers sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml --has-package-version --java-lib sisu-inject/registries/pom.xml --has-package-version --java-lib sisu-inject/registries/sisu-osgi-registry/pom.xml --has-package-version --java-lib -sisu-inject/registries/sisu-eclipse-registry/pom.xml --has-package-version --java-lib +sisu-inject/registries/sisu-eclipse-registry/pom.xml --ignore sisu-inject/registries/sisu-spi-registry/pom.xml --has-package-version --java-lib diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff deleted file mode 100644 index e7de22f..000 --- a/debian/patches/modules.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: Remove sisu-eclipse-registry from build - since it depends on too many things from Eclipse. -Author: Damien Raude-Morvan -Forwarded: not-needed - -Index: b/sisu-inject/registries/pom.xml -=== a/sisu-inject/registries/pom.xml -+++ b/sisu-inject/registries/pom.xml -@@ -31,7 +31,7 @@ - - - sisu-osgi-registry --sisu-eclipse-registry -+ - sisu-spi-registry - - diff --git a/debian/patches/series b/debian/patches/series index f89ca17..fde8eb1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ fix_osgi43.diff version_plexus.diff guice_classifier.diff -modules.diff javac_apt_scanner.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-ioc.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] branch master updated (337905a -> d18d2bd)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository maven. from 337905a Updated modello.diff to use Guava instead of Google Collections (Closes: #725588) new 198a334 Updated maven-clean-plugin version from 2.3 to 2.5 new 8d15e6b debian/rules: Improved the clean target new d18d2bd Fetch the sources from the new Git repository The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog|6 ++ debian/control |2 +- debian/orig-tar.sh | 15 +++ debian/patches/plugins_version.diff |2 +- debian/rules|1 + debian/watch|5 ++--- 6 files changed, 22 insertions(+), 9 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 01/03: Updated maven-clean-plugin version from 2.3 to 2.5
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit 198a3340a02eaf2e547e1ab3d4bd0614dc5df454 Author: Emmanuel Bourg Date: Mon Oct 21 15:56:37 2013 +0200 Updated maven-clean-plugin version from 2.3 to 2.5 --- debian/changelog|1 + debian/control |2 +- debian/patches/plugins_version.diff |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a7ccda..87d9c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ maven (3.0.4-7) UNRELEASED; urgency=low * Team upload. * Updated modello.diff to use Guava instead of Google Collections (Closes: #725588) + * Updated maven-clean-plugin version from 2.3 to 2.5 -- Emmanuel Bourg Mon, 07 Oct 2013 18:16:18 +0200 diff --git a/debian/control b/debian/control index 0a5373b..798a566 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: ant-optional, libcommons-logging-java, libeasymock-java, libmaven-ant-tasks-java (>= 2.1.3-2), - libmaven-clean-plugin-java, + libmaven-clean-plugin-java (>= 2.5), libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java, diff --git a/debian/patches/plugins_version.diff b/debian/patches/plugins_version.diff index 11a0cf5..a8daff0 100644 --- a/debian/patches/plugins_version.diff +++ b/debian/patches/plugins_version.diff @@ -253,7 +253,7 @@ Forwarded: not-needed -org.apache.maven.plugins:maven-clean-plugin:2.4.1:clean -+org.apache.maven.plugins:maven-clean-plugin:2.3:clean ++org.apache.maven.plugins:maven-clean-plugin:2.5:clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 02/03: debian/rules: Improved the clean target
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit 8d15e6b1d08be09132e09e5e26df800bea8b0455 Author: Emmanuel Bourg Date: Mon Oct 21 16:26:14 2013 +0200 debian/rules: Improved the clean target --- debian/changelog |1 + debian/rules |1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 87d9c75..08edf77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ maven (3.0.4-7) UNRELEASED; urgency=low * Updated modello.diff to use Guava instead of Google Collections (Closes: #725588) * Updated maven-clean-plugin version from 2.3 to 2.5 + * debian/rules: Improved the clean target -- Emmanuel Bourg Mon, 07 Oct 2013 18:16:18 +0200 diff --git a/debian/rules b/debian/rules index 53c3cca..de2bba9 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,7 @@ binary-post-install/$(PACKAGE):: find $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven/man -type f | xargs gzip -9v -n clean:: + mh_clean mh_unpatchpoms -p$(PACKAGE) -rm -rf debian/tmp/mvn-repo -rm $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 03/03: Fetch the sources from the new Git repository
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit d18d2bd286a224d853716c7495bab78c70ce5649 Author: Emmanuel Bourg Date: Mon Oct 21 16:45:57 2013 +0200 Fetch the sources from the new Git repository --- debian/changelog |4 debian/orig-tar.sh | 15 +++ debian/watch |5 ++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08edf77..69e2124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ maven (3.0.4-7) UNRELEASED; urgency=low (Closes: #725588) * Updated maven-clean-plugin version from 2.3 to 2.5 * debian/rules: Improved the clean target + * debian/orig-tar.sh: +- Use XZ compression for the upstream tarball +- Reworked to pull the sources from the Apache Git repository + * debian/watch: Updated to watch the tags on the Github mirror -- Emmanuel Bourg Mon, 07 Oct 2013 18:16:18 +0200 diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 9f121b0..c189af9 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,10 +1,17 @@ #!/bin/sh -e VERSION=$2 -TAR=../maven_$VERSION.orig.tar.gz +TAR=../maven_$VERSION.orig.tar.xz DIR=maven-$VERSION -TAG=$(echo maven-$2 | sed s/~RC/-RC/ ) +TAG=$(echo maven-$VERSION | sed s/~RC/-RC/ ) -svn export http://svn.apache.org/repos/asf/maven/maven-3/tags/$TAG $DIR -GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +rm $3 + +git clone http://git.apache.org/maven.git $DIR +cd $DIR +git checkout tags/$TAG +cd .. +rm -Rf $DIR/.git + +XZ_OPT=--best tar -c -J -f $TAR -X debian/orig-tar.exclude $DIR rm -rf $DIR ../$TAG diff --git a/debian/watch b/debian/watch index a05af54..1583175 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=3 -opts=uversionmangle=s/-RC/~RC/ \ - http://svn.apache.org/repos/asf/maven/maven-3/tags/ \ - maven-(.*)/ debian debian/orig-tar.sh +opts=uversionmangle=s/-(RC|alpha|beta)/~$1/ \ +https://github.com/apache/maven/releases .*/maven-(.*).tar.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] branch master updated (d18d2bd -> d5a34ce)
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a change to branch master
in repository maven.
from d18d2bd Fetch the sources from the new Git repository
adds b82c56f Imported Upstream version 3.0.5
new 9b2f65a Merge tag 'upstream/3.0.5'
new 12ad030 New upstream release (3.0.5)
new d82887b Install generic 3.x artifacts in /usr/share/maven-repo
(Closes: #698975) Renamed the jars in /usr/share/java to maven3-xxx.jar to
avoid conflicts with Maven 2 Installed versionless jars in /usr/share/java
new 6342de0 debian/copyright: Year range update
new 5f7e2eb Build depend on debhelper >= 9
new d5a34ce Upload to unstable
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore|2 +-
apache-maven/pom.xml |2 +-
debian/changelog | 11 +++-
debian/compat |2 +-
debian/control|2 +-
debian/copyright | 19 +++---
debian/{maven.rules => maven.buildRules} | 26 -
debian/maven.links| 36
debian/maven.poms | 23
debian/maven.rules| 26 -
debian/mvn.1 |4 +-
debian/mvnDebug.1 |2 +-
debian/patches/add_dependencies.diff |2 +-
debian/patches/dep_versions.diff |2 +-
debian/patches/force_java15_compiler.diff |8 +--
debian/patches/no_maven_assembly.diff |4 +-
debian/patches/plugins_version.diff |2 +-
debian/rules | 17 +-
maven-aether-provider/pom.xml |2 +-
maven-artifact/pom.xml|2 +-
maven-compat/pom.xml |2 +-
maven-core/pom.xml| 89 -
maven-embedder/pom.xml|2 +-
maven-model-builder/pom.xml |2 +-
maven-model/pom.xml |2 +-
maven-plugin-api/pom.xml |2 +-
maven-repository-metadata/pom.xml |2 +-
maven-settings-builder/pom.xml|2 +-
maven-settings/pom.xml|2 +-
pom.xml | 31 +++---
30 files changed, 166 insertions(+), 164 deletions(-)
copy debian/{maven.rules => maven.buildRules} (56%)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/maven.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 04/06: debian/copyright: Year range update
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit 6342de0f8f0250f5f72eeda2280307845d41248e Author: Emmanuel Bourg Date: Mon Oct 21 22:46:29 2013 +0200 debian/copyright: Year range update --- debian/copyright | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/debian/copyright b/debian/copyright index 0b3e129..a6ed18d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,25 +1,22 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Maven Compiler Plugin Upstream-Contact: Apache Maven team -Source: http://maven.apache.org/ +Source: http://maven.apache.org Files: * -Copyright: - Copyright 2001-2011, The Apache Software Foundation. - Copyright 2001-2006 The Codehaus Foundation +Copyright: 2001-2013, The Apache Software Foundation. + 2001-2006, The Codehaus Foundation License: Apache-2.0 Files: debian/bash_completion.d/maven -Copyright: - Copyright 2006-2007, Shawn O. Pearce - Copyright 2009, Ludovic Claude +Copyright: 2006-2007, Shawn O. Pearce + 2009, Ludovic Claude License: GPL-2 Files: debian/* -Copyright: - Copyright 2007, Paul Cager - Copyright 2009, Ludovic Claude - Copyright 2011, Damien Raude-Morvan +Copyright: 2007, Paul Cager + 2009, Ludovic Claude + 2011, Damien Raude-Morvan License: GPL-2 License: Apache-2.0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 02/06: New upstream release (3.0.5)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit 12ad030fbdf0578491a8dcdfd9dfd8c9952f37a9 Author: Emmanuel Bourg Date: Mon Oct 21 17:13:31 2013 +0200 New upstream release (3.0.5) --- debian/changelog |4 +++- debian/maven.poms | 22 +++--- debian/maven.rules| 26 +- debian/mvn.1 |4 ++-- debian/mvnDebug.1 |2 +- debian/patches/add_dependencies.diff |2 +- debian/patches/dep_versions.diff |2 +- debian/patches/force_java15_compiler.diff |8 debian/patches/no_maven_assembly.diff |4 ++-- debian/patches/plugins_version.diff |2 +- 10 files changed, 39 insertions(+), 37 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69e2124..64a259e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -maven (3.0.4-7) UNRELEASED; urgency=low +maven (3.0.5-1) UNRELEASED; urgency=low * Team upload. + * New upstream release (Closes: #704261) +- Refreshed the patches * Updated modello.diff to use Guava instead of Google Collections (Closes: #725588) * Updated maven-clean-plugin version from 2.3 to 2.5 diff --git a/debian/maven.poms b/debian/maven.poms index 73c0468..b6f367b 100644 --- a/debian/maven.poms +++ b/debian/maven.poms @@ -1,15 +1,15 @@ pom.xml apache-maven/pom.xml -maven-aether-provider/pom.xml --artifact=maven-aether-provider/target/maven-aether-provider-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-artifact/pom.xml --artifact=maven-artifact/target/maven-artifact-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-compat/pom.xml --artifact=maven-compat/target/maven-compat-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-core/pom.xml --artifact=maven-core/target/maven-core-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-embedder/pom.xml --artifact=maven-embedder/target/maven-embedder-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-model/pom.xml --artifact=maven-model/target/maven-model-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-model-builder/pom.xml --artifact=maven-model-builder/target/maven-model-builder-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-plugin-api/pom.xml --artifact=maven-plugin-api/target/maven-plugin-api-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-repository-metadata/pom.xml --artifact=maven-repository-metadata/target/maven-repository-metadata-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-settings/pom.xml --artifact=maven-settings/target/maven-settings-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x -maven-settings-builder/pom.xml --artifact=maven-settings-builder/target/maven-settings-builder-3.0.4.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-aether-provider/pom.xml --artifact=maven-aether-provider/target/maven-aether-provider-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-artifact/pom.xml --artifact=maven-artifact/target/maven-artifact-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-compat/pom.xml --artifact=maven-compat/target/maven-compat-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-core/pom.xml --artifact=maven-core/target/maven-core-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-embedder/pom.xml --artifact=maven-embedder/target/maven-embedder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-model/pom.xml --artifact=maven-model/target/maven-model-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-model-builder/pom.xml --artifact=maven-model-builder/target/maven-model-builder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-plugin-api/pom.xml --artifact=maven-plugin-api/target/maven-plugin-api-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-repository-metadata/pom.xml --artifact=maven-repository-metadata/target/maven-repository-metadata-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-settings/pom.xml --artifact=maven-settings/target/maven-settings-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x +maven-settings-builder/pom.xml --artifact=maven-settings-builder/target/maven-settings-builder-3.0.5.jar --java-lib --no-usj-versionless --usj-version=3.x diff --git a/debian/maven.rules b/debian/maven.rules index c174037..0f42dae 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -20,16 +20,16 @@ org.apache.maven.plugins maven-surefire-plugin * s/.*/2.10/ * * org.apache.maven.plugins maven-jar-plugin * s/.*/2.2/ * * org.apache.maven.plugins maven-compiler-plugin * s/.*/2.0.2
[maven] 01/01: pristine-tar data for maven_3.0.5.orig.tar.xz
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch pristine-tar in repository maven. commit 2056f0f8037df850c90fb407005aec90579ff67b Author: Emmanuel Bourg Date: Mon Oct 21 16:47:34 2013 +0200 pristine-tar data for maven_3.0.5.orig.tar.xz --- maven_3.0.5.orig.tar.xz.delta | Bin 0 -> 110439 bytes maven_3.0.5.orig.tar.xz.id|1 + 2 files changed, 1 insertion(+) diff --git a/maven_3.0.5.orig.tar.xz.delta b/maven_3.0.5.orig.tar.xz.delta new file mode 100644 index 000..8841b8a Binary files /dev/null and b/maven_3.0.5.orig.tar.xz.delta differ diff --git a/maven_3.0.5.orig.tar.xz.id b/maven_3.0.5.orig.tar.xz.id new file mode 100644 index 000..310b55d --- /dev/null +++ b/maven_3.0.5.orig.tar.xz.id @@ -0,0 +1 @@ +c79038ab8421599fc35d44c7391ad6d7c1bada1b -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 06/06: Upload to unstable
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit d5a34ce7ba7fdc82a0a50fd2fb3423e39beeb6f6 Author: Emmanuel Bourg Date: Mon Oct 21 22:50:14 2013 +0200 Upload to unstable --- debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 098df71..07785b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -maven (3.0.5-1) UNRELEASED; urgency=low +maven (3.0.5-1) unstable; urgency=low * Team upload. * New upstream release (Closes: #704261) @@ -17,7 +17,7 @@ maven (3.0.5-1) UNRELEASED; urgency=low * debian/watch: Updated to watch the tags on the Github mirror * Build depend on debhelper >= 9 - -- Emmanuel Bourg Mon, 07 Oct 2013 18:16:18 +0200 + -- Emmanuel Bourg Mon, 21 Oct 2013 22:49:54 +0200 maven (3.0.4-6) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 03/06: Install generic 3.x artifacts in /usr/share/maven-repo (Closes: #698975) Renamed the jars in /usr/share/java to maven3-xxx.jar to avoid conflicts with Maven 2 Installed versionless jars
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven.
commit d82887bff5e95ca24eeb1f8ef2524d31c27f03ae
Author: Emmanuel Bourg
Date: Mon Oct 21 22:35:51 2013 +0200
Install generic 3.x artifacts in /usr/share/maven-repo (Closes: #698975)
Renamed the jars in /usr/share/java to maven3-xxx.jar to avoid conflicts
with Maven 2
Installed versionless jars in /usr/share/java
---
.gitignore |1 -
debian/changelog |4
debian/{maven.rules => maven.buildRules} |0
debian/maven.links | 36 --
debian/maven.poms| 23 +--
debian/maven.rules | 26 ++---
debian/rules | 17 --
7 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/.gitignore b/.gitignore
index ca5efa1..adc6c00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@ bin/
.idea
.DS_Store
-.pc
diff --git a/debian/changelog b/debian/changelog
index 64a259e..e7ec09d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ maven (3.0.5-1) UNRELEASED; urgency=low
* Updated modello.diff to use Guava instead of Google Collections
(Closes: #725588)
* Updated maven-clean-plugin version from 2.3 to 2.5
+ * Install generic 3.x artifacts in /usr/share/maven-repo (Closes: #698975)
+ * Renamed the jars in /usr/share/java to maven3-xxx.jar to avoid conflicts
+with Maven 2
+ * Installed versionless jars in /usr/share/java
* debian/rules: Improved the clean target
* debian/orig-tar.sh:
- Use XZ compression for the upstream tarball
diff --git a/debian/maven.rules b/debian/maven.buildRules
similarity index 100%
copy from debian/maven.rules
copy to debian/maven.buildRules
diff --git a/debian/maven.links b/debian/maven.links
index 312084a..f535f5d 100644
--- a/debian/maven.links
+++ b/debian/maven.links
@@ -23,18 +23,30 @@
/usr/share/java/sisu-inject-bean.jar /usr/share/maven/lib/sisu-inject-bean.jar
/usr/share/java/sisu-inject-plexus.jar
/usr/share/maven/lib/sisu-inject-plexus.jar
-/usr/share/java/maven-aether-provider-3.x.jar
/usr/share/maven/lib/maven-aether-provider-3.x.jar
-/usr/share/java/maven-artifact-3.x.jar
/usr/share/maven/lib/maven-artifact-3.x.jar
-/usr/share/java/maven-compat-3.x.jar /usr/share/maven/lib/maven-compat-3.x.jar
-/usr/share/java/maven-core-3.x.jar /usr/share/maven/lib/maven-core-3.x.jar
-/usr/share/java/maven-embedder-3.x.jar
/usr/share/maven/lib/maven-embedder-3.x.jar
-/usr/share/java/maven-model-builder-3.x.jar
/usr/share/maven/lib/maven-model-builder-3.x.jar
-/usr/share/java/maven-model-3.x.jar /usr/share/maven/lib/maven-model-3.x.jar
-/usr/share/java/maven-plugin-api-3.x.jar
/usr/share/maven/lib/maven-plugin-api-3.x.jar
-/usr/share/java/maven-repository-metadata-3.x.jar
/usr/share/maven/lib/maven-repository-metadata-3.x.jar
-/usr/share/java/maven-settings-builder-3.x.jar
/usr/share/maven/lib/maven-settings-builder-3.x.jar
-/usr/share/java/maven-settings-3.x.jar
/usr/share/maven/lib/maven-settings-3.x.jar
+/usr/share/java/maven3-aether-provider.jar
/usr/share/maven/lib/maven-aether-provider-3.x.jar
+/usr/share/java/maven3-artifact.jar /usr/share/maven/lib/maven-artifact-3.x.jar
+/usr/share/java/maven3-compat.jar /usr/share/maven/lib/maven-compat-3.x.jar
+/usr/share/java/maven3-core.jar /usr/share/maven/lib/maven-core-3.x.jar
+/usr/share/java/maven3-embedder.jar /usr/share/maven/lib/maven-embedder-3.x.jar
+/usr/share/java/maven3-model-builder.jar
/usr/share/maven/lib/maven-model-builder-3.x.jar
+/usr/share/java/maven3-model.jar /usr/share/maven/lib/maven-model-3.x.jar
+/usr/share/java/maven3-plugin-api.jar
/usr/share/maven/lib/maven-plugin-api-3.x.jar
+/usr/share/java/maven3-repository-metadata.jar
/usr/share/maven/lib/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-settings-builder.jar
/usr/share/maven/lib/maven-settings-builder-3.x.jar
+/usr/share/java/maven3-settings.jar /usr/share/maven/lib/maven-settings-3.x.jar
+
+/usr/share/java/maven3-aether-provider.jar
/usr/share/java/maven-aether-provider-3.x.jar
+/usr/share/java/maven3-artifact.jar /usr/share/java/maven-artifact-3.x.jar
+/usr/share/java/maven3-compat.jar /usr/share/java/maven-compat-3.x.jar
+/usr/share/java/maven3-core.jar /usr/share/java/maven-core-3.x.jar
+/usr/share/java/maven3-embedder.jar /usr/share/java/maven-embedder-3.x.jar
+/usr/share/java/maven3-model-builder.jar
/usr/share/java/maven-model-builder-3.x.jar
+/usr/share/java/maven3-model.jar /usr/share/java/maven-model-3.x.jar
+/usr/share/java/maven3-plugin-api.jar /usr/share/java/maven-plugin-api-3.x.jar
+/usr/share/java/maven3-repository-metadata.jar
/usr/share/java/maven-repository-metadata-3.x.jar
+/usr/share/java/maven3-settings-builder.jar
/usr/share/java/maven-settings-builder-3.x.jar
+/usr/sh
[maven] 05/06: Build depend on debhelper >= 9
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit 5f7e2ebd1f5d93a7011d83460d044d0f5dceedb5 Author: Emmanuel Bourg Date: Mon Oct 21 22:48:45 2013 +0200 Build depend on debhelper >= 9 --- debian/changelog |1 + debian/compat|2 +- debian/control |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7ec09d..098df71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ maven (3.0.5-1) UNRELEASED; urgency=low - Use XZ compression for the upstream tarball - Reworked to pull the sources from the Apache Git repository * debian/watch: Updated to watch the tags on the Github mirror + * Build depend on debhelper >= 9 -- Emmanuel Bourg Mon, 07 Oct 2013 18:16:18 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 798a566..19db487 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends-Indep: ant-optional, libxmlunit-java, maven-ant-helper, maven-repo-helper -Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk +Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk Standards-Version: 3.9.4 Homepage: http://maven.apache.org/ Vcs-Git: git://anonscm.debian.org/pkg-java/maven.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] branch pristine-tar updated (3eb9fb5 -> 2056f0f)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch pristine-tar in repository maven. from 3eb9fb5 pristine-tar data for maven_3.0.4.orig.tar.gz new 2056f0f pristine-tar data for maven_3.0.5.orig.tar.xz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: maven_3.0.5.orig.tar.xz.delta | Bin 0 -> 110439 bytes maven_3.0.5.orig.tar.xz.id|1 + 2 files changed, 1 insertion(+) create mode 100644 maven_3.0.5.orig.tar.xz.delta create mode 100644 maven_3.0.5.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[maven] 01/06: Merge tag 'upstream/3.0.5'
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven. commit 9b2f65a7e795e56f84f15fb3396e3b1572276f03 Merge: d18d2bd b82c56f Author: Emmanuel Bourg Date: Mon Oct 21 16:47:36 2013 +0200 Merge tag 'upstream/3.0.5' Upstream version 3.0.5 .gitignore|1 + apache-maven/pom.xml |2 +- maven-aether-provider/pom.xml |2 +- maven-artifact/pom.xml|2 +- maven-compat/pom.xml |2 +- maven-core/pom.xml| 89 +++-- maven-embedder/pom.xml|2 +- maven-model-builder/pom.xml |2 +- maven-model/pom.xml |2 +- maven-plugin-api/pom.xml |2 +- maven-repository-metadata/pom.xml |2 +- maven-settings-builder/pom.xml|2 +- maven-settings/pom.xml|2 +- pom.xml | 31 + 14 files changed, 59 insertions(+), 84 deletions(-) diff --cc .gitignore index 9339b64,adc6c00..ca5efa1 --- a/.gitignore +++ b/.gitignore @@@ -7,6 -7,6 +7,7 @@@ bin # Intellij *.ipr *.iml + .idea .DS_Store +.pc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[tomcat8] 02/02: New upstream release (8.0.0-RC5) Refreshed the patches
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 5abdac02e57a1e93f70aa8bba6198b0f38c2460b
Author: Emmanuel Bourg
Date: Tue Oct 22 10:22:00 2013 +0200
New upstream release (8.0.0-RC5)
Refreshed the patches
---
debian/changelog |4 ++--
...plit-deploy-webapps-target-from-deploy-target.patch |4 ++--
debian/patches/0005-skip-test-failures.patch |4 ++--
.../0006-add-JARs-below-var-to-class-loader.patch | 16
...-Use-java.security.policy-file-in-catalina.sh.patch |6 +++---
debian/patches/0010-debianize-build-xml.patch |4 ++--
...3-dont-look-for-build-properties-in-user-home.patch |2 +-
debian/patches/0018-fix-manager-webapp.patch |2 +-
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59d4f3d..9ee056f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat8 (8.0.0~RC3-1) UNRELEASED; urgency=low
+tomcat8 (8.0.0~RC5-1) UNRELEASED; urgency=low
* Team upload.
* New upstream release (Closes: #722675)
@@ -41,7 +41,7 @@ tomcat8 (8.0.0~RC3-1) UNRELEASED; urgency=low
* Removed 0011-fix-classpath-lintian-warnings.patch and specified
the classpath of jasper.jar in libtomcat8-java.manifest instead.
- -- Emmanuel Bourg Thu, 12 Sep 2013 16:10:10 +0200
+ -- Emmanuel Bourg Tue, 22 Oct 2013 10:11:08 +0200
tomcat7 (7.0.42-2) UNRELEASED; urgency=low
diff --git
a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
index 6a141c3..6e7987a 100644
--- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
+++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
@@ -3,7 +3,7 @@ Date: Mon, 28 Jun 2010 21:32:35 +0200
Subject: [PATCH] split deploy-webapps target from deploy target
--- a/build.xml
+++ b/build.xml
-@@ -931,7 +931,7 @@
+@@ -944,7 +944,7 @@
@@ -12,7 +12,7 @@ Subject: [PATCH] split deploy-webapps target from deploy
target
description="Default. Builds a working Tomcat instance">
diff --git a/debian/patches/0005-skip-test-failures.patch
b/debian/patches/0005-skip-test-failures.patch
index 2a85d55..84d7bcc 100644
--- a/debian/patches/0005-skip-test-failures.patch
+++ b/debian/patches/0005-skip-test-failures.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -1255,8 +1255,10 @@
+@@ -1268,8 +1268,10 @@
@@ -14,7 +14,7 @@ Forwarded: not-needed
diff --git a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
index 3c4e472..5e51241 100644
--- a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
+++ b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
@@ -3,16 +3,16 @@ Date: Mon, 28 Jun 2010 21:32:57 +0200
Subject: [PATCH] add JARs below /var to class loader
--- a/conf/catalina.properties
+++ b/conf/catalina.properties
-@@ -44,7 +44,7 @@
- # "foo/*.jar": Add all the JARs of the specified folder as class
- # repositories
- # "foo/bar.jar": Add bar.jar as a class repository
--common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
-+common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,${catalina.home}/common/classes,${catalina.home}/common/*.jar
+@@ -47,7 +47,7 @@
+ #
+ # Note: Values are enclosed in double quotes ("...") in case either the
+ # ${catalina.base} path or the ${catalina.home} path contains a comma.
+-common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar"
++common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","${catalina.home}/common/classes","${catalina.home}/common/*.jar"
#
# List of comma-separated paths defining the contents of the "server"
-@@ -57,7 +57,7 @@
+@@ -60,7 +60,7 @@
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
@@ -21,7 +21,7 @@ Subject: [PATCH] add JARs below /var to class loader
#
# List of comma-separated paths defining the contents of the "shared"
-@@ -71,7 +71,7 @@
+@@ -74,7 +74,7 @@
# "foo/bar.jar": Add bar.jar as a class repository
# Please note that for single jars, e.g. bar.jar, you need the URL form
#
[tomcat8] 01/02: Merge tag 'upstream/8.0.0_RC5'
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat8. commit 532c5d6ca115596f1759a0d365f53d9016dd5610 Merge: 18ee3b2 c354e8d Author: Emmanuel Bourg Date: Tue Oct 22 10:10:38 2013 +0200 Merge tag 'upstream/8.0.0_RC5' Upstream version 8.0.0~RC5 bin/catalina.bat | 19 +- bin/catalina.sh| 16 +- build.properties.default | 10 +- build.xml | 25 +- conf/catalina.policy |9 +- conf/catalina.properties |5 +- conf/context.xml |4 +- conf/web.xml |4 + java/org/apache/catalina/Lifecycle.java|4 +- .../apache/catalina/core/AprLifecycleListener.java |6 +- .../org/apache/catalina/core/AsyncContextImpl.java | 20 +- .../apache/catalina/core/StandardWrapperValve.java |4 +- .../apache/catalina/ha/session/BackupManager.java | 17 +- .../apache/catalina/ha/session/DeltaManager.java |4 +- .../catalina/ha/session/mbeans-descriptors.xml |5 - .../apache/catalina/ha/tcp/SimpleTcpCluster.java |6 +- .../apache/catalina/loader/LocalStrings.properties |5 + .../apache/catalina/loader/WebappClassLoader.java | 233 +- .../catalina/manager/StatusManagerServlet.java | 12 +- java/org/apache/catalina/realm/CombinedRealm.java | 14 + .../catalina/security/SecurityClassLoad.java |3 +- .../apache/catalina/servlets/DefaultServlet.java | 74 +- java/org/apache/catalina/startup/Bootstrap.java| 47 +- .../storeconfig/ConnectorStoreAppender.java|5 - .../storeconfig/GlobalNamingResourcesSF.java |2 +- .../catalina/storeconfig/StandardContextSF.java| 25 +- .../apache/catalina/storeconfig/StoreAppender.java |9 +- .../catalina/storeconfig/server-registry.xml | 29 +- java/org/apache/catalina/util/ParameterMap.java| 11 +- java/org/apache/catalina/util/TomcatCSS.java |2 +- .../apache/catalina/valves/ErrorReportValve.java | 20 +- .../apache/catalina/webresources/StandardRoot.java |2 +- .../TomcatURLStreamHandlerFactory.java | 77 +- .../catalina/webresources/WarURLStreamHandler.java |2 +- java/org/apache/coyote/AbstractProtocol.java | 15 +- java/org/apache/coyote/ActionCode.java | 10 +- java/org/apache/coyote/AsyncStateMachine.java |1 + .../apache/coyote/ajp/AbstractAjpProcessor.java|4 +- .../coyote/http11/AbstractHttp11Processor.java |2 + .../apache/coyote/http11/Http11AprProcessor.java | 12 +- java/org/apache/coyote/http11/Http11Processor.java |8 +- .../http11/upgrade/AprServletInputStream.java | 17 +- .../http11/upgrade/AprServletOutputStream.java | 20 +- .../coyote/http11/upgrade/LocalStrings.properties |7 +- .../http11/upgrade/NioServletOutputStream.java |1 + java/org/apache/jasper/JspC.java |5 +- java/org/apache/jasper/compiler/Node.java |3 +- .../apache/jasper/compiler/TagFileProcessor.java |2 +- java/org/apache/jasper/servlet/TldScanner.java | 20 +- java/org/apache/juli/ClassLoaderLogManager.java|6 +- .../apache/tomcat/InstrumentableClassLoader.java | 79 ++ java/org/apache/tomcat/buildutil/Txt2Html.java | 80 +- java/org/apache/tomcat/jni/Poll.java | 22 +- .../tomcat/util/descriptor/tld/TldParser.java |4 + .../util/descriptor/tld/TldResourcePath.java |7 +- java/org/apache/tomcat/util/http/Parameters.java |6 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 44 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 394 +++--- java/org/apache/tomcat/util/net/JIoEndpoint.java | 73 +- java/org/apache/tomcat/util/net/NioChannel.java| 32 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 65 +- java/org/apache/tomcat/util/net/SocketWrapper.java | 38 +- .../tomcat/util/net/res/LocalStrings.properties| 15 +- java/org/apache/tomcat/util/scan/FileUrlJar.java |9 + .../apache/tomcat/util/scan/FileUrlNestedJar.java |9 + java/org/apache/tomcat/util/scan/Jar.java |6 + java/org/apache/tomcat/util/scan/JarFactory.java | 16 + java/org/apache/tomcat/util/scan/UrlJar.java |5 + java/org/apache/tomcat/websocket/WsFrameBase.java | 11 +- .../org/apache/tomcat/websocket/WsFrameClient.java |9 +- .../tomcat/websocket/WsRemoteEndpointImplBase.java | 14 +- java/org/apache/tomcat/websocket/WsSession.java| 12 +- .../websocket/server/WsHttpUpgradeHandler.java |3 + .../server/WsRemoteEndpointImplServer.java |4 +- .../javax.websocket.server.ServerContainerProvider |
[tomcat8] 01/01: pristine-tar data for tomcat8_8.0.0~RC5.orig.tar.xz
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch pristine-tar in repository tomcat8. commit 4e281a5b7ad9bee29fc97cebf446d37e632ed87a Author: Emmanuel Bourg Date: Tue Oct 22 10:10:38 2013 +0200 pristine-tar data for tomcat8_8.0.0~RC5.orig.tar.xz --- tomcat8_8.0.0~RC5.orig.tar.xz.delta | Bin 0 -> 153279 bytes tomcat8_8.0.0~RC5.orig.tar.xz.id|1 + 2 files changed, 1 insertion(+) diff --git a/tomcat8_8.0.0~RC5.orig.tar.xz.delta b/tomcat8_8.0.0~RC5.orig.tar.xz.delta new file mode 100644 index 000..7c20a77 Binary files /dev/null and b/tomcat8_8.0.0~RC5.orig.tar.xz.delta differ diff --git a/tomcat8_8.0.0~RC5.orig.tar.xz.id b/tomcat8_8.0.0~RC5.orig.tar.xz.id new file mode 100644 index 000..3191ffd --- /dev/null +++ b/tomcat8_8.0.0~RC5.orig.tar.xz.id @@ -0,0 +1 @@ +e1c009282595c16d547eb2cfee06ced4edff62de -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[tomcat8] branch pristine-tar updated (b42da82 -> 4e281a5)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch pristine-tar in repository tomcat8. from b42da82 pristine-tar data for tomcat8_8.0.0~RC3.orig.tar.xz new 4e281a5 pristine-tar data for tomcat8_8.0.0~RC5.orig.tar.xz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: tomcat8_8.0.0~RC5.orig.tar.xz.delta | Bin 0 -> 153279 bytes tomcat8_8.0.0~RC5.orig.tar.xz.id|1 + 2 files changed, 1 insertion(+) create mode 100644 tomcat8_8.0.0~RC5.orig.tar.xz.delta create mode 100644 tomcat8_8.0.0~RC5.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[tomcat8] branch master updated (18ee3b2 -> 5abdac0)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository tomcat8. from 18ee3b2 New upstream release (8.0.0-RC3) Refreshed the patches adds c354e8d Imported Upstream version 8.0.0~RC5 new 532c5d6 Merge tag 'upstream/8.0.0_RC5' new 5abdac0 New upstream release (8.0.0-RC5) Refreshed the patches The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/catalina.bat | 19 +- bin/catalina.sh| 16 +- build.properties.default | 10 +- build.xml | 25 +- conf/catalina.policy |9 +- conf/catalina.properties |5 +- conf/context.xml |4 +- conf/web.xml |4 + debian/changelog |4 +- ...-deploy-webapps-target-from-deploy-target.patch |4 +- debian/patches/0005-skip-test-failures.patch |4 +- .../0006-add-JARs-below-var-to-class-loader.patch | 16 +- ...-java.security.policy-file-in-catalina.sh.patch |6 +- debian/patches/0010-debianize-build-xml.patch |4 +- ...nt-look-for-build-properties-in-user-home.patch |2 +- debian/patches/0018-fix-manager-webapp.patch |2 +- java/org/apache/catalina/Lifecycle.java|4 +- .../apache/catalina/core/AprLifecycleListener.java |6 +- .../org/apache/catalina/core/AsyncContextImpl.java | 20 +- .../apache/catalina/core/StandardWrapperValve.java |4 +- .../apache/catalina/ha/session/BackupManager.java | 17 +- .../apache/catalina/ha/session/DeltaManager.java |4 +- .../catalina/ha/session/mbeans-descriptors.xml |5 - .../apache/catalina/ha/tcp/SimpleTcpCluster.java |6 +- .../apache/catalina/loader/LocalStrings.properties |5 + .../apache/catalina/loader/WebappClassLoader.java | 233 +- .../catalina/manager/StatusManagerServlet.java | 12 +- java/org/apache/catalina/realm/CombinedRealm.java | 14 + .../catalina/security/SecurityClassLoad.java |3 +- .../apache/catalina/servlets/DefaultServlet.java | 74 +- java/org/apache/catalina/startup/Bootstrap.java| 47 +- .../storeconfig/ConnectorStoreAppender.java|5 - .../storeconfig/GlobalNamingResourcesSF.java |2 +- .../catalina/storeconfig/StandardContextSF.java| 25 +- .../apache/catalina/storeconfig/StoreAppender.java |9 +- .../catalina/storeconfig/server-registry.xml | 29 +- java/org/apache/catalina/util/ParameterMap.java| 11 +- java/org/apache/catalina/util/TomcatCSS.java |2 +- .../apache/catalina/valves/ErrorReportValve.java | 20 +- .../apache/catalina/webresources/StandardRoot.java |2 +- .../TomcatURLStreamHandlerFactory.java | 77 +- .../catalina/webresources/WarURLStreamHandler.java |2 +- java/org/apache/coyote/AbstractProtocol.java | 15 +- java/org/apache/coyote/ActionCode.java | 10 +- java/org/apache/coyote/AsyncStateMachine.java |1 + .../apache/coyote/ajp/AbstractAjpProcessor.java|4 +- .../coyote/http11/AbstractHttp11Processor.java |2 + .../apache/coyote/http11/Http11AprProcessor.java | 12 +- java/org/apache/coyote/http11/Http11Processor.java |8 +- .../http11/upgrade/AprServletInputStream.java | 17 +- .../http11/upgrade/AprServletOutputStream.java | 20 +- .../coyote/http11/upgrade/LocalStrings.properties |7 +- .../http11/upgrade/NioServletOutputStream.java |1 + java/org/apache/jasper/JspC.java |5 +- java/org/apache/jasper/compiler/Node.java |3 +- .../apache/jasper/compiler/TagFileProcessor.java |2 +- java/org/apache/jasper/servlet/TldScanner.java | 20 +- java/org/apache/juli/ClassLoaderLogManager.java|6 +- .../apache/tomcat/InstrumentableClassLoader.java | 79 ++ java/org/apache/tomcat/buildutil/Txt2Html.java | 80 +- java/org/apache/tomcat/jni/Poll.java | 22 +- .../tomcat/util/descriptor/tld/TldParser.java |4 + .../util/descriptor/tld/TldResourcePath.java |7 +- java/org/apache/tomcat/util/http/Parameters.java |6 +- .../apache/tomcat/util/net/AbstractEndpoint.java | 44 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 394 +++--- java/org/apache/tomcat/util/net/JIoEndpoint.java | 73 +- java/org/apache/tomcat/util/net/NioChannel.java| 32 +- java/org/apache/tomcat/util/net/NioEndpoint.java | 65 +- java/org/apache/tomcat/util/net/SocketWrapper.java | 38 +-
[tomcat8] annotated tag upstream/8.0.0_RC5 created (now 5218c3c)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to annotated tag upstream/8.0.0_RC5 in repository tomcat8. at 5218c3c (tag) tagging c354e8d3f7dfadbb6b9a4d804a501031a02e8f1e (commit) replaces upstream/8.0.0_RC3 tagged by Emmanuel Bourg on Tue Oct 22 10:10:38 2013 +0200 - Log - Upstream version 8.0.0~RC5 Emmanuel Bourg (1): Imported Upstream version 8.0.0~RC5 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17367 - trunk/plexus-archiver/debian
Author: ebourg-guest
Date: 2013-10-22 09:03:51 + (Tue, 22 Oct 2013)
New Revision: 17367
Modified:
trunk/plexus-archiver/debian/changelog
trunk/plexus-archiver/debian/compat
trunk/plexus-archiver/debian/control
trunk/plexus-archiver/debian/rules
Log:
Use canonical URLs for the Vcs-* fields
Updated Standards-Version to 3.9.4 (no changes)
Bump to debhelper 9 compat level
debian/rules: Improved the clean target
Modified: trunk/plexus-archiver/debian/changelog
===
--- trunk/plexus-archiver/debian/changelog 2013-10-19 19:40:06 UTC (rev
17366)
+++ trunk/plexus-archiver/debian/changelog 2013-10-22 09:03:51 UTC (rev
17367)
@@ -1,3 +1,14 @@
+plexus-archiver (1.0~alpha12-4) UNRELEASED; urgency=low
+
+ * Team upload.
+ * debian/control:
+- Use canonical URLs for the Vcs-* fields
+- Updated Standards-Version to 3.9.4 (no changes)
+ * Bump to debhelper 9 compat level
+ * debian/rules: Improved the clean target
+
+ -- Emmanuel Bourg Tue, 22 Oct 2013 10:58:12 +0200
+
plexus-archiver (1.0~alpha12-3) unstable; urgency=low
* Add myself to Uploaders.
Modified: trunk/plexus-archiver/debian/compat
===
--- trunk/plexus-archiver/debian/compat 2013-10-19 19:40:06 UTC (rev 17366)
+++ trunk/plexus-archiver/debian/compat 2013-10-22 09:03:51 UTC (rev 17367)
@@ -1 +1 @@
-7
+9
Modified: trunk/plexus-archiver/debian/control
===
--- trunk/plexus-archiver/debian/control2013-10-19 19:40:06 UTC (rev
17366)
+++ trunk/plexus-archiver/debian/control2013-10-22 09:03:51 UTC (rev
17367)
@@ -2,21 +2,29 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
-Uploaders: Torsten Werner , Ludovic Claude
,
- Damien Raude-Morvan
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
-Build-Depends-Indep: maven-repo-helper (>> 0.5), maven-ant-helper (>> 4), ant,
ant-optional,
- libplexus-utils-java, libplexus-io-java, libplexus-containers-java
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-archiver
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-archiver/
+Uploaders: Torsten Werner ,
+ Ludovic Claude ,
+ Damien Raude-Morvan
+Build-Depends: cdbs (>= 0.4.5.3), debhelper (>= 9), default-jdk
+Build-Depends-Indep: ant,
+ ant-optional,
+ libplexus-containers-java,
+ libplexus-io-java,
+ libplexus-utils-java,
+ maven-ant-helper (>> 4),
+ maven-repo-helper (>> 0.5)
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/plexus-archiver
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-archiver/
Homepage: http://plexus.codehaus.org/plexus-components/plexus-archiver/
Package: libplexus-archiver-java
Architecture: all
-Depends: ${misc:Depends}, libplexus-utils-java, libplexus-io-java,
- libplexus-containers-java
-Description: The archiver plugin for the Plexus compiler system
+Depends: libplexus-containers-java,
+ libplexus-io-java,
+ libplexus-utils-java,
+ ${misc:Depends}
+Description: Archiver plugin for the Plexus compiler system
The Plexus project provides a full software stack for creating and
executing software projects. Based on the Plexus container, the applications
can utilise component-oriented programming to build modular, reusable
Modified: trunk/plexus-archiver/debian/rules
===
--- trunk/plexus-archiver/debian/rules 2013-10-19 19:40:06 UTC (rev 17366)
+++ trunk/plexus-archiver/debian/rules 2013-10-22 09:03:51 UTC (rev 17367)
@@ -20,5 +20,6 @@
mh_installjar -plib$(PACKAGE)-java -l pom.xml
build/$(PACKAGE)-$(VERSION).jar
clean::
+ mh_unpatchpoms -plib$(PACKAGE)-java
mh_clean
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17368 - trunk/plexus-archiver/debian
Author: ebourg-guest Date: 2013-10-22 09:10:55 + (Tue, 22 Oct 2013) New Revision: 17368 Modified: trunk/plexus-archiver/debian/changelog trunk/plexus-archiver/debian/orig-tar.sh Log: Use XZ compression for the upstream tarball Modified: trunk/plexus-archiver/debian/changelog === --- trunk/plexus-archiver/debian/changelog 2013-10-22 09:03:51 UTC (rev 17367) +++ trunk/plexus-archiver/debian/changelog 2013-10-22 09:10:55 UTC (rev 17368) @@ -6,6 +6,7 @@ - Updated Standards-Version to 3.9.4 (no changes) * Bump to debhelper 9 compat level * debian/rules: Improved the clean target + * Use XZ compression for the upstream tarball -- Emmanuel Bourg Tue, 22 Oct 2013 10:58:12 +0200 Modified: trunk/plexus-archiver/debian/orig-tar.sh === --- trunk/plexus-archiver/debian/orig-tar.sh2013-10-22 09:03:51 UTC (rev 17367) +++ trunk/plexus-archiver/debian/orig-tar.sh2013-10-22 09:10:55 UTC (rev 17368) @@ -1,11 +1,11 @@ #!/bin/sh -e -TAR=../plexus-archiver_$2.orig.tar.gz +TAR=../plexus-archiver_$2.orig.tar.xz DIR=plexus-archiver-$2 TAG=$(echo plexus-archiver-$2 | sed 's,~alpha,-alpha-,') svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +tar -c -J -f $TAR $DIR rm -rf $DIR ../$TAG # move to directory 'tarballs' ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17369 - trunk/plexus-archiver/debian
Author: ebourg-guest
Date: 2013-10-22 15:31:33 + (Tue, 22 Oct 2013)
New Revision: 17369
Removed:
trunk/plexus-archiver/debian/orig-tar.sh
Modified:
trunk/plexus-archiver/debian/changelog
trunk/plexus-archiver/debian/watch
Log:
New upstream release (1.2)
debian/watch: Updated to watch the new release tags on Github
Removed debian/orig-tar.sh and use the tarball from Github directly
Modified: trunk/plexus-archiver/debian/changelog
===
--- trunk/plexus-archiver/debian/changelog 2013-10-22 09:10:55 UTC (rev
17368)
+++ trunk/plexus-archiver/debian/changelog 2013-10-22 15:31:33 UTC (rev
17369)
@@ -1,14 +1,16 @@
-plexus-archiver (1.0~alpha12-4) UNRELEASED; urgency=low
+plexus-archiver (1.2-1) unstable; urgency=low
* Team upload.
+ * New upstream release
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Updated Standards-Version to 3.9.4 (no changes)
* Bump to debhelper 9 compat level
* debian/rules: Improved the clean target
- * Use XZ compression for the upstream tarball
+ * debian/watch: Updated to watch the new release tags on Github
+ * Removed debian/orig-tar.sh and use the tarball from Github directly
- -- Emmanuel Bourg Tue, 22 Oct 2013 10:58:12 +0200
+ -- Emmanuel Bourg Tue, 22 Oct 2013 12:11:28 +0200
plexus-archiver (1.0~alpha12-3) unstable; urgency=low
Deleted: trunk/plexus-archiver/debian/orig-tar.sh
===
--- trunk/plexus-archiver/debian/orig-tar.sh2013-10-22 09:10:55 UTC (rev
17368)
+++ trunk/plexus-archiver/debian/orig-tar.sh2013-10-22 15:31:33 UTC (rev
17369)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-TAR=../plexus-archiver_$2.orig.tar.xz
-DIR=plexus-archiver-$2
-TAG=$(echo plexus-archiver-$2 | sed 's,~alpha,-alpha-,')
-
-svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG $DIR
-tar -c -J -f $TAR $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-archiver/debian/watch
===
--- trunk/plexus-archiver/debian/watch 2013-10-22 09:10:55 UTC (rev 17368)
+++ trunk/plexus-archiver/debian/watch 2013-10-22 15:31:33 UTC (rev 17369)
@@ -1,4 +1,3 @@
version=3
opts=uversionmangle=s{-alpha-}{~alpha} \
- http://svn.codehaus.org/plexus/plexus-components/tags/ \
- plexus-archiver-(.*)/ debian debian/orig-tar.sh
+https://github.com/sonatype/plexus-archiver/releases
.*/plexus-archiver-(.*).tar.gz
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] branch master updated (f1d4a04 -> 09be1d6)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository plexus-classworlds2. from f1d4a04 Merge commit 'upstream/2.4' new 2558037 Use canonical URLs for the Vcs-* fields new 14b5742 Build depend on debhelper >= 9 new 647b25c Updated Standards-Version to 3.9.4 (no changes) new 7193585 debian/copyright: Updated to the Copyright Format 1.0 new 088ccc2 debian/rules: Improved the clean target to allow rebuilds new 09be1d6 Removed the unused debian/orig-tar.sh script The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog| 13 + debian/compat |2 +- debian/control |8 debian/copyright|6 +++--- debian/orig-tar.exclude |2 -- debian/orig-tar.sh | 10 -- debian/rules|5 + 7 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 debian/orig-tar.exclude delete mode 100755 debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 01/06: Use canonical URLs for the Vcs-* fields
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 25580370edd280a493b7afdf74d7ba05072eb82b Author: Emmanuel Bourg Date: Wed Oct 23 00:47:39 2013 +0200 Use canonical URLs for the Vcs-* fields --- debian/changelog |8 debian/control |4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac2f25f..6a104d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low + + * Team upload. + * debian/control: +- Use canonical URLs for the Vcs-* fields + + -- Emmanuel Bourg Wed, 23 Oct 2013 00:42:07 +0200 + plexus-classworlds2 (2.4-1) unstable; urgency=low * Upstream release: diff --git a/debian/control b/debian/control index 167c021..7760c0d 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Build-Depends: ant-optional, maven-repo-helper (>= 1.5~) Build-Depends-Indep: default-jdk-doc Standards-Version: 3.9.2 -Vcs-Git: git://git.debian.org/git/pkg-java/plexus-classworlds2.git -Vcs-Browser: http://git.debian.org/?p=pkg-java/plexus-classworlds2.git +Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-classworlds2.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-classworlds2.git Homepage: http://plexus.codehaus.org/plexus-classworlds Package: libplexus-classworlds2-java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 02/06: Build depend on debhelper >= 9
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 14b574225c2f3ab1626b899c6b04268a38355860 Author: Emmanuel Bourg Date: Wed Oct 23 00:49:02 2013 +0200 Build depend on debhelper >= 9 --- debian/changelog |1 + debian/compat|2 +- debian/control |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a104d1..c241bea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low * Team upload. * debian/control: - Use canonical URLs for the Vcs-* fields + * Build depend on debhelper >= 9 -- Emmanuel Bourg Wed, 23 Oct 2013 00:42:07 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 7760c0d..c5912ad 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers , Damien Raude-Morvan Build-Depends: ant-optional, - debhelper (>= 7), + debhelper (>= 9), default-jdk, maven-ant-helper (>> 6.7), maven-repo-helper (>= 1.5~) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 04/06: debian/copyright: Updated to the Copyright Format 1.0
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 7193585c24f80e0d41b6cf1eb04f23ff4f818d5b Author: Emmanuel Bourg Date: Wed Oct 23 10:45:01 2013 +0200 debian/copyright: Updated to the Copyright Format 1.0 --- debian/changelog |1 + debian/copyright |6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f507292..ab5ccf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low - Use canonical URLs for the Vcs-* fields - Updated Standards-Version to 3.9.4 (no changes) * Build depend on debhelper >= 9 + * debian/copyright: Updated to the Copyright Format 1.0 -- Emmanuel Bourg Wed, 23 Oct 2013 00:42:07 +0200 diff --git a/debian/copyright b/debian/copyright index b4a36d0..2de3630 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Plexus Classworlds Source: http://plexus.codehaus.org/plexus-classworlds Files: * -Copyright: Copyright 2001-2010, Codehaus Foundation +Copyright: 2001-2010, Codehaus Foundation License: Apache-2.0 Files: src/main/java/org/codehaus/classworlds/ClassWorldException.java @@ -17,7 +17,7 @@ License: Apache-1.1 Files: debian/* Copyright: 2010, Ludovic Claude -Copyright: 2011, Damien Raude-Morvan + 2011, Damien Raude-Morvan License: Apache-2.0 License: Apache-2.0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 06/06: Removed the unused debian/orig-tar.sh script
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 09be1d6b613d3e36da2468b9ada2de750c94a9af Author: Emmanuel Bourg Date: Wed Oct 23 10:50:45 2013 +0200 Removed the unused debian/orig-tar.sh script --- debian/changelog|1 + debian/orig-tar.exclude |2 -- debian/orig-tar.sh | 10 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index ff26b80..fb9cf1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low * Build depend on debhelper >= 9 * debian/copyright: Updated to the Copyright Format 1.0 * debian/rules: Improved the clean target to allow rebuilds + * Removed the unused debian/orig-tar.sh script -- Emmanuel Bourg Wed, 23 Oct 2013 00:42:07 +0200 diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude deleted file mode 100644 index 1262bf2..000 --- a/debian/orig-tar.exclude +++ /dev/null @@ -1,2 +0,0 @@ -*.jar -*.class \ No newline at end of file diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh deleted file mode 100755 index da263c8..000 --- a/debian/orig-tar.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e - -VERSION=$2 -TAR=../plexus-classworlds2_$VERSION.orig.tar.gz -DIR=plexus-classworlds2-$VERSION - -tar xzf $3 -mv sonatype-sisu-* $DIR -GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR -rm -rf $DIR -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 03/06: Updated Standards-Version to 3.9.4 (no changes)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 647b25ca0616ddb159a0dcd8140527d120b71008 Author: Emmanuel Bourg Date: Wed Oct 23 00:50:33 2013 +0200 Updated Standards-Version to 3.9.4 (no changes) --- debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c241bea..f507292 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low * Team upload. * debian/control: - Use canonical URLs for the Vcs-* fields +- Updated Standards-Version to 3.9.4 (no changes) * Build depend on debhelper >= 9 -- Emmanuel Bourg Wed, 23 Oct 2013 00:42:07 +0200 diff --git a/debian/control b/debian/control index c5912ad..5e9e2a2 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: ant-optional, maven-ant-helper (>> 6.7), maven-repo-helper (>= 1.5~) Build-Depends-Indep: default-jdk-doc -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-classworlds2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-classworlds2.git Homepage: http://plexus.codehaus.org/plexus-classworlds -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 05/06: debian/rules: Improved the clean target to allow rebuilds
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 088ccc23c3d913d56e5775171a4f0d905b3daff6 Author: Emmanuel Bourg Date: Wed Oct 23 10:47:54 2013 +0200 debian/rules: Improved the clean target to allow rebuilds --- debian/changelog |1 + debian/rules |5 + 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ab5ccf5..ff26b80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low - Updated Standards-Version to 3.9.4 (no changes) * Build depend on debhelper >= 9 * debian/copyright: Updated to the Copyright Format 1.0 + * debian/rules: Improved the clean target to allow rebuilds -- Emmanuel Bourg Wed, 23 Oct 2013 00:42:07 +0200 diff --git a/debian/rules b/debian/rules index 97c8c1b..c61b3d4 100755 --- a/debian/rules +++ b/debian/rules @@ -10,5 +10,10 @@ export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f /usr/ %: dh $@ --buildsystem=ant --with maven_repo_helper +override_dh_auto_clean: + mh_clean + mh_unpatchpoms -plibplexus-classworlds2-java + rm -Rf target debian/plexus-classworlds2-doc + get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] branch master updated (09be1d6 -> f630932)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository plexus-classworlds2. from 09be1d6 Removed the unused debian/orig-tar.sh script adds a4bdf22 Imported Upstream version 2.5.1 new 3a4a8b1 Merge tag 'upstream/2.5.1' new f630932 New upstream release (2.5.1) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |3 + LICENSE-2.0.txt| 202 debian/changelog |5 +- pom.xml| 68 +-- .../plexus/classworlds/event/ListenerAspect.aj |6 +- .../java/org/codehaus/classworlds/ClassRealm.java |2 - .../codehaus/classworlds/ClassRealmAdapter.java|1 - .../classworlds/ClassRealmReverseAdapter.java |1 - .../java/org/codehaus/classworlds/ClassWorld.java |1 - .../codehaus/classworlds/ClassWorldAdapter.java|1 - .../codehaus/classworlds/ClassWorldException.java |2 - .../classworlds/ClassWorldReverseAdapter.java |1 - .../classworlds/ConfigurationException.java|2 - .../org/codehaus/classworlds/Configurator.java |1 - .../codehaus/classworlds/ConfiguratorAdapter.java |1 - .../classworlds/DuplicateRealmException.java |2 - .../java/org/codehaus/classworlds/Launcher.java|1 - .../codehaus/classworlds/NoSuchRealmException.java |2 - .../codehaus/plexus/classworlds/ClassWorld.java| 63 +++--- .../plexus/classworlds/ClassWorldException.java|4 +- .../org/codehaus/plexus/classworlds/UrlUtils.java | 10 +- .../launcher/ConfigurationException.java |5 +- .../classworlds/launcher/ConfigurationHandler.java | 43 - .../classworlds/launcher/ConfigurationParser.java | 19 +- .../plexus/classworlds/launcher/Configurator.java | 32 ++-- .../plexus/classworlds/launcher/Launcher.java | 16 +- .../plexus/classworlds/realm/ClassRealm.java | 186 ++ .../classworlds/realm/DuplicateRealmException.java |4 +- .../codehaus/plexus/classworlds/realm/Entry.java |6 +- .../classworlds/realm/NoSuchRealmException.java|4 +- .../classworlds/strategy/AbstractStrategy.java |7 +- .../classworlds/strategy/OsgiBundleStrategy.java | 12 +- .../classworlds/strategy/ParentFirstStrategy.java | 12 +- .../classworlds/strategy/SelfFirstStrategy.java| 12 +- .../plexus/classworlds/strategy/Strategy.java |5 +- .../classworlds/strategy/StrategyFactory.java |1 - src/site/site.xml | 15 +- .../org/codehaus/plexus/classworlds/ClassView.java | 12 +- .../plexus/classworlds/ClassWorldTest.java | 10 +- .../org/codehaus/plexus/classworlds/TestUtil.java |1 - .../classworlds/launcher/ConfiguratorTest.java |6 +- .../plexus/classworlds/launcher/LauncherTest.java |2 +- .../classworlds/realm/ClassRealmImplTest.java | 34 ++-- .../classworlds/realm/DefaultClassRealmTest.java | 85 +++- .../plexus/classworlds/realm/EntryTest.java|1 - .../plexus/classworlds/strategy/StrategyTest.java | 12 +- src/test/test-data/deadlock.jar| Bin 0 -> 1576 bytes src/test/test-data/valid.conf |2 +- 48 files changed, 641 insertions(+), 282 deletions(-) create mode 100644 LICENSE-2.0.txt create mode 100644 src/test/test-data/deadlock.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 01/01: pristine-tar data for plexus-classworlds2_2.5.1.orig.tar.gz
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch pristine-tar in repository plexus-classworlds2. commit b672d8bc4907542a467fa128c133ef629e1de19e Author: Emmanuel Bourg Date: Wed Oct 23 10:55:57 2013 +0200 pristine-tar data for plexus-classworlds2_2.5.1.orig.tar.gz --- plexus-classworlds2_2.5.1.orig.tar.gz.delta | Bin 0 -> 4891 bytes plexus-classworlds2_2.5.1.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) diff --git a/plexus-classworlds2_2.5.1.orig.tar.gz.delta b/plexus-classworlds2_2.5.1.orig.tar.gz.delta new file mode 100644 index 000..974f0ea Binary files /dev/null and b/plexus-classworlds2_2.5.1.orig.tar.gz.delta differ diff --git a/plexus-classworlds2_2.5.1.orig.tar.gz.id b/plexus-classworlds2_2.5.1.orig.tar.gz.id new file mode 100644 index 000..267d5a6 --- /dev/null +++ b/plexus-classworlds2_2.5.1.orig.tar.gz.id @@ -0,0 +1 @@ +27ccd8f62aa5d25be6a991c31166a8e1b1faf0ac -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 02/02: New upstream release (2.5.1)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit f630932e6ffe7dd03c5774e2fe374b7af4deb581 Author: Emmanuel Bourg Date: Wed Oct 23 11:04:43 2013 +0200 New upstream release (2.5.1) --- debian/changelog |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb9cf1f..e1708d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low +plexus-classworlds2 (2.5.1-1) unstable; urgency=low * Team upload. + * New upstream release * debian/control: - Use canonical URLs for the Vcs-* fields - Updated Standards-Version to 3.9.4 (no changes) @@ -9,7 +10,7 @@ plexus-classworlds2 (2.4-2) UNRELEASED; urgency=low * debian/rules: Improved the clean target to allow rebuilds * Removed the unused debian/orig-tar.sh script - -- Emmanuel Bourg Wed, 23 Oct 2013 00:42:07 +0200 + -- Emmanuel Bourg Wed, 23 Oct 2013 11:01:52 +0200 plexus-classworlds2 (2.4-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] branch pristine-tar updated (2f63054 -> b672d8b)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch pristine-tar in repository plexus-classworlds2. from 2f63054 pristine-tar data for plexus-classworlds2_2.4.orig.tar.gz new b672d8b pristine-tar data for plexus-classworlds2_2.5.1.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: plexus-classworlds2_2.5.1.orig.tar.gz.delta | Bin 0 -> 4891 bytes plexus-classworlds2_2.5.1.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) create mode 100644 plexus-classworlds2_2.5.1.orig.tar.gz.delta create mode 100644 plexus-classworlds2_2.5.1.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] 01/02: Merge tag 'upstream/2.5.1'
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 3a4a8b14f00f86188db5105510f2f5ff4a022112 Merge: 09be1d6 a4bdf22 Author: Emmanuel Bourg Date: Wed Oct 23 10:55:57 2013 +0200 Merge tag 'upstream/2.5.1' Upstream version 2.5.1 .gitignore |3 + LICENSE-2.0.txt| 202 pom.xml| 68 +-- .../plexus/classworlds/event/ListenerAspect.aj |6 +- .../java/org/codehaus/classworlds/ClassRealm.java |2 - .../codehaus/classworlds/ClassRealmAdapter.java|1 - .../classworlds/ClassRealmReverseAdapter.java |1 - .../java/org/codehaus/classworlds/ClassWorld.java |1 - .../codehaus/classworlds/ClassWorldAdapter.java|1 - .../codehaus/classworlds/ClassWorldException.java |2 - .../classworlds/ClassWorldReverseAdapter.java |1 - .../classworlds/ConfigurationException.java|2 - .../org/codehaus/classworlds/Configurator.java |1 - .../codehaus/classworlds/ConfiguratorAdapter.java |1 - .../classworlds/DuplicateRealmException.java |2 - .../java/org/codehaus/classworlds/Launcher.java|1 - .../codehaus/classworlds/NoSuchRealmException.java |2 - .../codehaus/plexus/classworlds/ClassWorld.java| 63 +++--- .../plexus/classworlds/ClassWorldException.java|4 +- .../org/codehaus/plexus/classworlds/UrlUtils.java | 10 +- .../launcher/ConfigurationException.java |5 +- .../classworlds/launcher/ConfigurationHandler.java | 43 - .../classworlds/launcher/ConfigurationParser.java | 19 +- .../plexus/classworlds/launcher/Configurator.java | 32 ++-- .../plexus/classworlds/launcher/Launcher.java | 16 +- .../plexus/classworlds/realm/ClassRealm.java | 186 ++ .../classworlds/realm/DuplicateRealmException.java |4 +- .../codehaus/plexus/classworlds/realm/Entry.java |6 +- .../classworlds/realm/NoSuchRealmException.java|4 +- .../classworlds/strategy/AbstractStrategy.java |7 +- .../classworlds/strategy/OsgiBundleStrategy.java | 12 +- .../classworlds/strategy/ParentFirstStrategy.java | 12 +- .../classworlds/strategy/SelfFirstStrategy.java| 12 +- .../plexus/classworlds/strategy/Strategy.java |5 +- .../classworlds/strategy/StrategyFactory.java |1 - src/site/site.xml | 15 +- .../org/codehaus/plexus/classworlds/ClassView.java | 12 +- .../plexus/classworlds/ClassWorldTest.java | 10 +- .../org/codehaus/plexus/classworlds/TestUtil.java |1 - .../classworlds/launcher/ConfiguratorTest.java |6 +- .../plexus/classworlds/launcher/LauncherTest.java |2 +- .../classworlds/realm/ClassRealmImplTest.java | 34 ++-- .../classworlds/realm/DefaultClassRealmTest.java | 85 +++- .../plexus/classworlds/realm/EntryTest.java|1 - .../plexus/classworlds/strategy/StrategyTest.java | 12 +- src/test/test-data/deadlock.jar| Bin 0 -> 1576 bytes src/test/test-data/valid.conf |2 +- 47 files changed, 638 insertions(+), 280 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] annotated tag upstream/2.5.1 created (now 39dbdd4)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to annotated tag upstream/2.5.1 in repository plexus-classworlds2. at 39dbdd4 (tag) tagging a4bdf22ca45849e698c18d61154e3fc8fd3dbccd (commit) replaces upstream/2.4 tagged by Emmanuel Bourg on Wed Oct 23 10:55:57 2013 +0200 - Log - Upstream version 2.5.1 Emmanuel Bourg (1): Imported Upstream version 2.5.1 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17372 - trunk/nekohtml/debian
Author: ebourg-guest
Date: 2013-10-23 09:45:00 + (Wed, 23 Oct 2013)
New Revision: 17372
Modified:
trunk/nekohtml/debian/changelog
trunk/nekohtml/debian/compat
trunk/nekohtml/debian/control
trunk/nekohtml/debian/copyright
trunk/nekohtml/debian/orig-tar.sh
trunk/nekohtml/debian/rules
Log:
Use canonical URLs for the Vcs-* fields
Updated Standards-Version to 3.9.4 (no changes)
Removed Michael Koch from the uploaders (Closes: #654124)
Improved the package description
Build depend on debhelper >= 9
debian/rules: Improved the clean target
debian/copyright: Updated the Format URI
Use XZ compression for the upstream tarball
Modified: trunk/nekohtml/debian/changelog
===
--- trunk/nekohtml/debian/changelog 2013-10-23 05:55:11 UTC (rev 17371)
+++ trunk/nekohtml/debian/changelog 2013-10-23 09:45:00 UTC (rev 17372)
@@ -1,3 +1,18 @@
+nekohtml (1.9.15-2) UNRELEASED; urgency=low
+
+ * Team upload.
+ * debian/control:
+- Use canonical URLs for the Vcs-* fields
+- Updated Standards-Version to 3.9.4 (no changes)
+- Removed Michael Koch from the uploaders (Closes: #654124)
+- Improved the package description
+ * Build depend on debhelper >= 9
+ * debian/rules: Improved the clean target
+ * debian/copyright: Updated the Format URI
+ * Use XZ compression for the upstream tarball
+
+ -- Emmanuel Bourg Wed, 23 Oct 2013 11:28:12 +0200
+
nekohtml (1.9.15-1) unstable; urgency=low
* Team upload.
Modified: trunk/nekohtml/debian/compat
===
--- trunk/nekohtml/debian/compat2013-10-23 05:55:11 UTC (rev 17371)
+++ trunk/nekohtml/debian/compat2013-10-23 09:45:00 UTC (rev 17372)
@@ -1 +1 @@
-7
+9
Modified: trunk/nekohtml/debian/control
===
--- trunk/nekohtml/debian/control 2013-10-23 05:55:11 UTC (rev 17371)
+++ trunk/nekohtml/debian/control 2013-10-23 09:45:00 UTC (rev 17372)
@@ -2,20 +2,20 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
-Uploaders: Marcus Better , Michael Koch
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
+Uploaders: Marcus Better
+Build-Depends: debhelper (>= 9), cdbs, default-jdk
Build-Depends-Indep: maven-repo-helper, ant, libxerces2-java (>= 2.9.1),
libjaxp1.3-java (>> 1.3.04-3)
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/nekohtml
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/nekohtml/
-Homepage: http://nekohtml.sourceforge.net/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/nekohtml
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/nekohtml/
+Homepage: http://nekohtml.sourceforge.net
Package: libnekohtml-java
Architecture: all
Depends: ${misc:Depends}, libxerces2-java (>= 2.9.1), libjaxp1.3-java (>>
1.3.04-3)
Suggests: libnekohtml-java-doc
-Description: HTML parser for Java
- This is a simple HTML scanner and tag balancer that enables
+Description: NekoHTML - HTML parser for Java
+ NekoHTML is a simple HTML scanner and tag balancer that enables
application programmers to parse HTML documents and access the
information using standard XML interfaces. The parser can scan HTML
files and "fix up" many common mistakes that human (and computer)
@@ -29,8 +29,8 @@
Section: doc
Depends: ${misc:Depends}
Suggests: libnekohtml-java
-Description: HTML parser for Java
- This is a simple HTML scanner and tag balancer that enables
+Description: NekoHTML - HTML parser for Java (Documentation)
+ NekoHTML is a simple HTML scanner and tag balancer that enables
application programmers to parse HTML documents and access the
information using standard XML interfaces. The parser can scan HTML
files and "fix up" many common mistakes that human (and computer)
Modified: trunk/nekohtml/debian/copyright
===
--- trunk/nekohtml/debian/copyright 2013-10-23 05:55:11 UTC (rev 17371)
+++ trunk/nekohtml/debian/copyright 2013-10-23 09:45:00 UTC (rev 17372)
@@ -1,6 +1,6 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Neko HTML
-Source: http://nekohtml.sourceforge.net/
+Source: http://nekohtml.sourceforge.net
Files: *
Copyright: 2002-2009 Andy Clark, Marc Guillemot
Modified: trunk/nekohtml/debian/orig-tar.sh
===
--- trunk/nekohtml/debian/orig-tar.sh 2013-10-23 05:55:11 UTC (rev 17371)
+++ trunk/nekohtml/debian/orig-tar.sh 2013-10-23 09:45:00 UTC (rev 17372)
@@ -1,13 +1,13 @@
#!/bin/sh -e
VERSION=$2
-TAR=../nekohtml_$VERSION.orig.tar.gz
+TAR=../nekohtml_$VERSION.orig.tar.xz
DIR=nekohtml-$VERSION
TAG=nekohtml-$2
svn export https://nekohtml.svn.source
[pkg-java] r17373 - in trunk/nekohtml/debian: . patches
Author: ebourg-guest
Date: 2013-10-23 10:00:48 + (Wed, 23 Oct 2013)
New Revision: 17373
Added:
trunk/nekohtml/debian/libnekohtml-java.lintian-overrides
Modified:
trunk/nekohtml/debian/changelog
trunk/nekohtml/debian/nekohtml-xni.pom
trunk/nekohtml/debian/patches/build.diff
Log:
New upstream release (1.9.19)
Refreshed the patch
Added a Lintian override for the codeless-jar warning on nekohtmlXni.jar
Modified: trunk/nekohtml/debian/changelog
===
--- trunk/nekohtml/debian/changelog 2013-10-23 09:45:00 UTC (rev 17372)
+++ trunk/nekohtml/debian/changelog 2013-10-23 10:00:48 UTC (rev 17373)
@@ -1,6 +1,8 @@
-nekohtml (1.9.15-2) UNRELEASED; urgency=low
+nekohtml (1.9.19-1) unstable; urgency=low
* Team upload.
+ * New upstream release
+- Refreshed the patch
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Updated Standards-Version to 3.9.4 (no changes)
@@ -10,8 +12,9 @@
* debian/rules: Improved the clean target
* debian/copyright: Updated the Format URI
* Use XZ compression for the upstream tarball
+ * Added a Lintian override for the codeless-jar warning on nekohtmlXni.jar
- -- Emmanuel Bourg Wed, 23 Oct 2013 11:28:12 +0200
+ -- Emmanuel Bourg Wed, 23 Oct 2013 11:59:27 +0200
nekohtml (1.9.15-1) unstable; urgency=low
Added: trunk/nekohtml/debian/libnekohtml-java.lintian-overrides
===
--- trunk/nekohtml/debian/libnekohtml-java.lintian-overrides
(rev 0)
+++ trunk/nekohtml/debian/libnekohtml-java.lintian-overrides2013-10-23
10:00:48 UTC (rev 17373)
@@ -0,0 +1 @@
+libnekohtml-java: codeless-jar *nekohtmlXni*
Modified: trunk/nekohtml/debian/nekohtml-xni.pom
===
--- trunk/nekohtml/debian/nekohtml-xni.pom 2013-10-23 09:45:00 UTC (rev
17372)
+++ trunk/nekohtml/debian/nekohtml-xni.pom 2013-10-23 10:00:48 UTC (rev
17373)
@@ -2,5 +2,5 @@
4.0.0
nekohtml
nekohtmlXni
- 1.9.12
+ 1.9.19
Modified: trunk/nekohtml/debian/patches/build.diff
===
--- trunk/nekohtml/debian/patches/build.diff2013-10-23 09:45:00 UTC (rev
17372)
+++ trunk/nekohtml/debian/patches/build.diff2013-10-23 10:00:48 UTC (rev
17373)
@@ -9,7 +9,7 @@
-@@ -72,7 +72,7 @@
+@@ -78,7 +78,7 @@
source='${compile.source}' target='${compile.target}'
includeAntRuntime='false'>
@@ -18,7 +18,7 @@
-@@ -83,7 +83,7 @@
+@@ -89,7 +89,7 @@
source='${compile.source}' target='${compile.target}'
includeAntRuntime='false'>
@@ -27,7 +27,7 @@
-@@ -97,11 +97,6 @@
+@@ -103,11 +103,6 @@
unless="compile.skip">
@@ -37,5 +37,5 @@
-
-
+
-
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17374 - trunk/plexus-utils/debian
Author: ebourg-guest
Date: 2013-10-23 10:43:42 + (Wed, 23 Oct 2013)
New Revision: 17374
Removed:
trunk/plexus-utils/debian/orig-tar.sh
Modified:
trunk/plexus-utils/debian/changelog
trunk/plexus-utils/debian/compat
trunk/plexus-utils/debian/control
trunk/plexus-utils/debian/rules
trunk/plexus-utils/debian/watch
Log:
Use canonical URLs for the Vcs-* fields
Updated Standards-Version to 3.9.4 (no changes)
Removed Michael Koch from the uploaders (Closes: #654127)
Build depend on debhelper >= 9
debian/rules: Improved the clean target
debian/watch: Updated to watch the new release tags on Github
Removed debian/orig-tar.sh and use the tarball from Github directly
Modified: trunk/plexus-utils/debian/changelog
===
--- trunk/plexus-utils/debian/changelog 2013-10-23 10:00:48 UTC (rev 17373)
+++ trunk/plexus-utils/debian/changelog 2013-10-23 10:43:42 UTC (rev 17374)
@@ -1,3 +1,17 @@
+plexus-utils (1:1.5.15-5) UNRELEASED; urgency=low
+
+ * Team upload.
+ * debian/control:
+- Use canonical URLs for the Vcs-* fields
+- Updated Standards-Version to 3.9.4 (no changes)
+- Removed Michael Koch from the uploaders (Closes: #654127)
+ * Build depend on debhelper >= 9
+ * debian/rules: Improved the clean target
+ * debian/watch: Updated to watch the new release tags on Github
+ * Removed debian/orig-tar.sh and use the tarball from Github directly
+
+ -- Emmanuel Bourg Wed, 23 Oct 2013 12:25:00 +0200
+
plexus-utils (1:1.5.15-4) unstable; urgency=low
* Rename source package to plexus-utils to better conform to other plexus
Modified: trunk/plexus-utils/debian/compat
===
--- trunk/plexus-utils/debian/compat2013-10-23 10:00:48 UTC (rev 17373)
+++ trunk/plexus-utils/debian/compat2013-10-23 10:43:42 UTC (rev 17374)
@@ -1 +1 @@
-5
+9
Modified: trunk/plexus-utils/debian/control
===
--- trunk/plexus-utils/debian/control 2013-10-23 10:00:48 UTC (rev 17373)
+++ trunk/plexus-utils/debian/control 2013-10-23 10:43:42 UTC (rev 17374)
@@ -2,18 +2,17 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
-Uploaders: Michael Koch , Torsten Werner
,
- Ludovic Claude
-Build-Depends-Indep: maven-repo-helper, libxalan2-java,
libplexus-interpolation-java
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
-Standards-Version: 3.9.1
-Homepage: http://plexus.codehaus.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-utils
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-utils
+Uploaders: Torsten Werner , Ludovic Claude
+Build-Depends-Indep: libplexus-interpolation-java, libxalan2-java,
maven-repo-helper
+Build-Depends: ant, cdbs (>= 0.4.5.3), debhelper (>= 9), default-jdk
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/plexus-utils
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-utils
+Homepage: http://plexus.codehaus.org
Package: libplexus-utils-java
Architecture: all
-Depends: ${misc:Depends}, libxalan2-java, libplexus-interpolation-java
+Depends: libplexus-interpolation-java, libxalan2-java, ${misc:Depends}
Suggests: libplexus-utils-java-doc
Description: utilities for the Plexus framework
The Plexus project provides a full software stack for creating and executing
@@ -32,7 +31,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.
Package: libplexus-utils-java-doc
Architecture: all
@@ -56,6 +55,6 @@
* Auto-wiring
* Component dependencies, and
* Various dependency injection techniques including constructor injection,
- setter injection, and private field injection.
+ setter injection, and private field injection.
.
This package contains the API documentation for plexus-utils.
Deleted: trunk/plexus-utils/debian/orig-tar.sh
===
--- trunk/plexus-utils/debian/orig-tar.sh 2013-10-23 10:00:48 UTC (rev
17373)
+++ trunk/plexus-utils/debian/orig-tar.sh 2013-10-23 10:43:42 UTC (rev
17374)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-TAR=../libplexus-utils_$2.orig.tar.gz
-DIR=plexus-utils-$2
-TAG=plexus-utils-$2
-
-svn export http://svn.codehaus.org/plexus/plexus-utils/tags/$TAG $DIR
-tar -c -z -f $TAR $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-utils/debian/rules
===
--- trunk/plexus-utils/debian/rules 2013-10-23 10:00:48 UTC (re
[args4j] 04/09: Updated the Homepage field
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 0affca645288b4a2d9e450d133715d2d7edfc657 Author: Emmanuel Bourg Date: Thu Oct 24 11:12:52 2013 +0200 Updated the Homepage field --- debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7808baa..42c068a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ args4j (2.0.16-3) UNRELEASED; urgency=low - Use canonical URLs for the Vcs-* fields - Removed the deprecated DM-Upload-Allowed flag - Updated Standards-Version to 3.9.4 (no changes) +- Updated the Homepage field -- Emmanuel Bourg Thu, 24 Oct 2013 10:59:33 +0200 diff --git a/debian/control b/debian/control index 69cb159..be6da6f 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,9 @@ Build-Depends-Indep: libmaven-jar-plugin-java (>= 2.2), libmaven-javadoc-plugin-java Standards-Version: 3.9.4 -Homepage: http://args4j.java.net/ Vcs-Git: git://anonscm.debian.org/pkg-java/args4j.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/args4j.git +Homepage: http://args4j.kohsuke.org Package: libargs4j-java Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 01/09: Use canonical URLs for the Vcs-* fields
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit ef8da751a0e5ab160dafbcb80cef34bfabd26cb3 Author: Emmanuel Bourg Date: Thu Oct 24 11:00:19 2013 +0200 Use canonical URLs for the Vcs-* fields --- debian/changelog |8 debian/control |4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 402de56..f93ccde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +args4j (2.0.16-3) UNRELEASED; urgency=low + + * Team upload. + * debian/control: +- Use canonical URLs for the Vcs-* fields + + -- Emmanuel Bourg Thu, 24 Oct 2013 10:59:33 +0200 + args4j (2.0.16-2) unstable; urgency=low [James Page] diff --git a/debian/control b/debian/control index 7fea759..206a73a 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends-Indep: libmaven-javadoc-plugin-java Standards-Version: 3.9.2 Homepage: http://args4j.java.net/ -Vcs-Git: git://git.debian.org/git/pkg-java/args4j.git -Vcs-Browser: http://git.debian.org/?p=pkg-java/args4j.git +Vcs-Git: git://anonscm.debian.org/pkg-java/args4j.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/args4j.git Package: libargs4j-java Architecture: all -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 03/09: Updated Standards-Version to 3.9.4 (no changes)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 8d5a98e4e8cf6f91207388269b681fce0edbf0c3 Author: Emmanuel Bourg Date: Thu Oct 24 11:02:52 2013 +0200 Updated Standards-Version to 3.9.4 (no changes) --- debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b24d15e..7808baa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ args4j (2.0.16-3) UNRELEASED; urgency=low * debian/control: - Use canonical URLs for the Vcs-* fields - Removed the deprecated DM-Upload-Allowed flag +- Updated Standards-Version to 3.9.4 (no changes) -- Emmanuel Bourg Thu, 24 Oct 2013 10:59:33 +0200 diff --git a/debian/control b/debian/control index a9597b2..69cb159 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends-Indep: libmaven-install-plugin-java, libmaven-jar-plugin-java (>= 2.2), libmaven-javadoc-plugin-java -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://args4j.java.net/ Vcs-Git: git://anonscm.debian.org/pkg-java/args4j.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/args4j.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 02/09: Removed the deprecated DM-Upload-Allowed flag
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 7aa559a4d33690703ff71214259b482770478316 Author: Emmanuel Bourg Date: Thu Oct 24 11:01:37 2013 +0200 Removed the deprecated DM-Upload-Allowed flag --- debian/changelog |1 + debian/control |1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f93ccde..b24d15e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ args4j (2.0.16-3) UNRELEASED; urgency=low * Team upload. * debian/control: - Use canonical URLs for the Vcs-* fields +- Removed the deprecated DM-Upload-Allowed flag -- Emmanuel Bourg Thu, 24 Oct 2013 10:59:33 +0200 diff --git a/debian/control b/debian/control index 206a73a..a9597b2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: James Page -DM-Upload-Allowed: yes Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper Build-Depends-Indep: ant, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 06/09: Build depend on debhelper >= 9
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit c990c650a08603404657deea242de542eac9a955 Author: Emmanuel Bourg Date: Thu Oct 24 11:22:19 2013 +0200 Build depend on debhelper >= 9 --- debian/changelog |1 + debian/compat|2 +- debian/control |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7fbaca..affa13c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ args4j (2.0.16-3) UNRELEASED; urgency=low - Updated Standards-Version to 3.9.4 (no changes) - Updated the Homepage field * debian/copyright: Updated to the Copyright Format 1.0 + * Build depend on debhelper >= 9 -- Emmanuel Bourg Thu, 24 Oct 2013 10:59:33 +0200 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index be6da6f..543e422 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: James Page -Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper +Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper Build-Depends-Indep: ant, ant-doc, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 08/09: debian/watch: Updated to watch the new release tags on Github Removed debian/orig-tar.sh and use the tarball from Github directly
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository args4j.
commit 5573d0edf333e8d2b956bd15a787b4759dbc712c
Author: Emmanuel Bourg
Date: Thu Oct 24 11:33:33 2013 +0200
debian/watch: Updated to watch the new release tags on Github
Removed debian/orig-tar.sh and use the tarball from Github directly
---
debian/changelog |2 ++
debian/orig-tar.sh | 17 -
debian/watch |3 +--
3 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index affa13c..5413000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ args4j (2.0.16-3) UNRELEASED; urgency=low
- Updated the Homepage field
* debian/copyright: Updated to the Copyright Format 1.0
* Build depend on debhelper >= 9
+ * debian/watch: Updated to watch the new release tags on Github
+ * Removed debian/orig-tar.sh and use the tarball from Github directly
-- Emmanuel Bourg Thu, 24 Oct 2013 10:59:33 +0200
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index eb02105..000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../args4j_$VERSION.orig.tar.gz
-DIR=args4j-$VERSION
-TAG=$(echo "args4j-site-$VERSION" | sed -re's/~(alpha|beta)/-\1-/' | sed
's/\./_/g')
-
-svn export https://svn.java.net/svn/args4j~svn/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' \
- --exclude 'www' --exclude 'repo' --exclude '*.zip' $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
diff --git a/debian/watch b/debian/watch
index da86d72..0a2b830 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
version=3
opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
- http://java.net/projects/args4j/sources/svn/show/tags \
- /projects/args4j/sources/svn/show/tags/args4j-site-(\d+)_(\d+)_(\d+).*
debian debian/orig-tar.sh
+https://github.com/kohsuke/args4j/releases .*/args4j(?:-site)?-(.*).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/args4j.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 07/09: Wrap and sort
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 031b44c636dc3ba3c02f2a1c9aef91094f9becdb Author: Emmanuel Bourg Date: Thu Oct 24 11:23:02 2013 +0200 Wrap and sort --- debian/control | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/debian/control b/debian/control index 543e422..3d108d1 100644 --- a/debian/control +++ b/debian/control @@ -4,15 +4,14 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: James Page Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper -Build-Depends-Indep: - ant, - ant-doc, - default-jdk-doc, - junit, - libmaven-compiler-plugin-java (>= 2.0.2), - libmaven-install-plugin-java, - libmaven-jar-plugin-java (>= 2.2), - libmaven-javadoc-plugin-java +Build-Depends-Indep: ant, + ant-doc, + default-jdk-doc, + junit, + libmaven-compiler-plugin-java (>= 2.0.2), + libmaven-install-plugin-java, + libmaven-jar-plugin-java (>= 2.2), + libmaven-javadoc-plugin-java Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-java/args4j.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/args4j.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] branch master updated (c2b736d -> 8b06519)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository args4j. from c2b736d set DMUA flag new ef8da75 Use canonical URLs for the Vcs-* fields new 7aa559a Removed the deprecated DM-Upload-Allowed flag new 8d5a98e Updated Standards-Version to 3.9.4 (no changes) new 0affca6 Updated the Homepage field new 8027998 debian/copyright: Updated to the Copyright Format 1.0 new c990c65 Build depend on debhelper >= 9 new 031b44c Wrap and sort new 5573d0e debian/watch: Updated to watch the new release tags on Github Removed debian/orig-tar.sh and use the tarball from Github directly new 8b06519 Added --has-package-version and --java-lib The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 15 +++ debian/compat |2 +- debian/control | 28 +--- debian/copyright | 10 +- debian/libargs4j-java.poms | 31 ++- debian/orig-tar.sh | 17 - debian/watch |3 +-- 7 files changed, 61 insertions(+), 45 deletions(-) delete mode 100755 debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 05/09: debian/copyright: Updated to the Copyright Format 1.0
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 80279980bbb5d517b52fd110723605ebd489696c Author: Emmanuel Bourg Date: Thu Oct 24 11:19:42 2013 +0200 debian/copyright: Updated to the Copyright Format 1.0 --- debian/changelog |1 + debian/copyright | 10 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 42c068a..f7fbaca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ args4j (2.0.16-3) UNRELEASED; urgency=low - Removed the deprecated DM-Upload-Allowed flag - Updated Standards-Version to 3.9.4 (no changes) - Updated the Homepage field + * debian/copyright: Updated to the Copyright Format 1.0 -- Emmanuel Bourg Thu, 24 Oct 2013 10:59:33 +0200 diff --git a/debian/copyright b/debian/copyright index 9f350db..4ae3483 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,12 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: args4j Upstream-Contact: Kohsuke Kawaguchi -Source: http://args4j.java.net/ +Source: https://github.com/kohsuke/args4j Files: * -Copyright: 2003-2010, Kohsuke Kawaguchi -Copyright: 2003-2010, Jan Materne -Copyright: 2003-2010, Mark Sinke +Copyright: 2003-2010, Kohsuke Kawaguchi + 2003-2010, Jan Materne + 2003-2010, Mark Sinke License: MIT Files: debian/* -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 09/09: Added --has-package-version and --java-lib
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 8b06519a25db7198663105f9fa1bd3d29d161d75 Author: Emmanuel Bourg Date: Thu Oct 24 11:55:35 2013 +0200 Added --has-package-version and --java-lib --- debian/libargs4j-java.poms | 31 ++- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/debian/libargs4j-java.poms b/debian/libargs4j-java.poms index ecc789c..140faf0 100644 --- a/debian/libargs4j-java.poms +++ b/debian/libargs4j-java.poms @@ -1,9 +1,30 @@ # List of POM files for the package # Format of this file is: -# [option] +# [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 tag from the POM -pom.xml -args4j/pom.xml -args4j-tools/pom.xml +# --package=: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=: path to the build artifact associated with this POM, +# 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 to use when installing the library in /usr/share/java +# --usj-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=: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=: Optional, the classifier for the jar. Empty by default. +# --site-xml=: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --has-package-version +args4j/pom.xml --has-package-version --java-lib +args4j-tools/pom.xml --has-package-version --java-lib -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[jenkins-remoting] 01/04: debian/watch: Updated to exclude the test-client versions
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jenkins-remoting. commit ece657d7ddb7de00d8584e5c05e5d34cad48e28e Author: Emmanuel Bourg Date: Thu Oct 24 13:01:30 2013 +0200 debian/watch: Updated to exclude the test-client versions --- debian/changelog |7 +++ debian/watch |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e793eaa..1086db9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jenkins-remoting (2.23-2) UNRELEASED; urgency=low + + * Team upload. + * debian/watch: Updated to exclude the test-client versions + + -- Emmanuel Bourg Thu, 24 Oct 2013 13:00:13 +0200 + jenkins-remoting (2.23-1) unstable; urgency=low * New upstream release. diff --git a/debian/watch b/debian/watch index dd16d89..e6fd668 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts=dversionmangle=s/\+dfsg// \ -http://githubredir.debian.net/github/jenkinsci/remoting/ remoting-(.*).tar.gz debian debian/orig-tar.sh +http://githubredir.debian.net/github/jenkinsci/remoting/ remoting-(\d.*).tar.gz debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-remoting.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[jenkins-remoting] 03/04: Updated the Maven rules to use the latest version of args4j
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jenkins-remoting. commit 269b39010dbc73b800e55dead480338632012f9a Author: Emmanuel Bourg Date: Thu Oct 24 15:42:21 2013 +0200 Updated the Maven rules to use the latest version of args4j --- debian/changelog |1 + debian/libjenkins-remoting-java.poms |3 ++- debian/maven.rules |4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4917924..b69e6e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ jenkins-remoting (2.23-2) UNRELEASED; urgency=low * Team upload. * debian/watch: Updated to exclude the test-client versions * debian/control: Use canonical URLs for the Vcs-* fields + * Updated the Maven rules to use the latest version of args4j -- Emmanuel Bourg Thu, 24 Oct 2013 13:00:13 +0200 diff --git a/debian/libjenkins-remoting-java.poms b/debian/libjenkins-remoting-java.poms index f300aea..d179182 100644 --- a/debian/libjenkins-remoting-java.poms +++ b/debian/libjenkins-remoting-java.poms @@ -24,4 +24,5 @@ # --classifier=: Optional, the classifier for the jar. Empty by default. # --site-xml=: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] -pom.xml --no-parent --has-package-version --usj-name=jenkins-remoting --java-lib +# +pom.xml --no-parent --has-package-version --java-lib --usj-name=jenkins-remoting diff --git a/debian/maven.rules b/debian/maven.rules index 593eda1..af3eb29 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -14,10 +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/ -args4j args4j-site pom 2.0.16 * * -args4j args4j jar 2.0.16 * * asm asm-all jar s/.*/3.x/ * * junit junit jar s/4\..*/4.x/ * * org.jenkins-ci.main remoting jar s/.*/debian/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-remoting.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[jenkins-remoting] branch master updated (ff4dc27 -> ed9cca4)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository jenkins-remoting. from ff4dc27 Target correct distro new ece657d debian/watch: Updated to exclude the test-client versions new 5594ca2 debian/control: Use canonical URLs for the Vcs-* fields new 269b390 Updated the Maven rules to use the latest version of args4j new ed9cca4 Upload to unstable The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog |9 + debian/control |4 ++-- debian/libjenkins-remoting-java.poms |3 ++- debian/maven.rules |4 +--- debian/watch |2 +- 5 files changed, 15 insertions(+), 7 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-remoting.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[jenkins-remoting] 04/04: Upload to unstable
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jenkins-remoting. commit ed9cca4e207d3ab76b36074ecd16bd9df7c660e1 Author: Emmanuel Bourg Date: Thu Oct 24 15:43:29 2013 +0200 Upload to unstable --- debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b69e6e3..0eb907e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -jenkins-remoting (2.23-2) UNRELEASED; urgency=low +jenkins-remoting (2.23-2) unstable; urgency=low * Team upload. * debian/watch: Updated to exclude the test-client versions -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-remoting.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[jenkins-remoting] 02/04: debian/control: Use canonical URLs for the Vcs-* fields
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jenkins-remoting. commit 5594ca25ff8e6dca1b200fd06c79bee23f3fda32 Author: Emmanuel Bourg Date: Thu Oct 24 13:12:07 2013 +0200 debian/control: Use canonical URLs for the Vcs-* fields --- debian/changelog |1 + debian/control |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1086db9..4917924 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ jenkins-remoting (2.23-2) UNRELEASED; urgency=low * Team upload. * debian/watch: Updated to exclude the test-client versions + * debian/control: Use canonical URLs for the Vcs-* fields -- Emmanuel Bourg Thu, 24 Oct 2013 13:00:13 +0200 diff --git a/debian/control b/debian/control index 8682ff2..5faafb5 100644 --- a/debian/control +++ b/debian/control @@ -20,8 +20,8 @@ Build-Depends-Indep: libmaven-dependency-plugin-java, libmaven-javadoc-plugin-java Standards-Version: 3.9.4 -Vcs-Git: git://git.debian.org/git/pkg-java/jenkins-remoting.git -Vcs-Browser: http://git.debian.org/?p=pkg-java/jenkins-remoting.git +Vcs-Git: git://anonscm.debian.org/pkg-java/jenkins-remoting.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jenkins-remoting.git Homepage: http://jenkins-ci.org Package: libjenkins-remoting-java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-remoting.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 01/01: pristine-tar data for args4j_2.0.25.orig.tar.gz
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch pristine-tar in repository args4j. commit 692716a56fd6ea8ccc35a00e3d5d71b5b38b6578 Author: Emmanuel Bourg Date: Thu Oct 24 12:07:05 2013 +0200 pristine-tar data for args4j_2.0.25.orig.tar.gz --- args4j_2.0.25.orig.tar.gz.delta | Bin 0 -> 7371 bytes args4j_2.0.25.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) diff --git a/args4j_2.0.25.orig.tar.gz.delta b/args4j_2.0.25.orig.tar.gz.delta new file mode 100644 index 000..969e086 Binary files /dev/null and b/args4j_2.0.25.orig.tar.gz.delta differ diff --git a/args4j_2.0.25.orig.tar.gz.id b/args4j_2.0.25.orig.tar.gz.id new file mode 100644 index 000..e5f16c9 --- /dev/null +++ b/args4j_2.0.25.orig.tar.gz.id @@ -0,0 +1 @@ +296640f2ddc8a860d7cc4d929d0d7f223af0ea13 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 02/02: New upstream release (2.0.25)
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository args4j.
commit a30d8701b59552c8821e1b6d6e4a2889d7a70671
Author: Emmanuel Bourg
Date: Thu Oct 24 16:00:43 2013 +0200
New upstream release (2.0.25)
---
debian/changelog|5 -
debian/control |4 +++-
debian/libargs4j-java.poms |4 +++-
debian/maven.cleanIgnoreRules |1 -
debian/maven.ignoreRules|2 +-
debian/maven.rules |1 +
debian/patches/01-change-packaging-to-jar.patch | 22 ++
debian/patches/series |1 +
8 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5413000..d849205 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-args4j (2.0.16-3) UNRELEASED; urgency=low
+args4j (2.0.25-1) unstable; urgency=low
* Team upload.
+ * New upstream release
+- New build dependency on libmockito-java
+- Added a patch to change the packaging from bundle to jar
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Removed the deprecated DM-Upload-Allowed flag
diff --git a/debian/control b/debian/control
index 3d108d1..d196fe0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends-Indep: ant,
libmaven-compiler-plugin-java (>= 2.0.2),
libmaven-install-plugin-java,
libmaven-jar-plugin-java (>= 2.2),
- libmaven-javadoc-plugin-java
+ libmaven-javadoc-plugin-java,
+ libmockito-java
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-java/args4j.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/args4j.git
@@ -21,6 +22,7 @@ Package: libargs4j-java
Architecture: all
Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
+Breaks: libjenkins-remoting-java (<= 2.23-1)
Description: Java command line arguments parser
args4j is a small Java class library that makes it easy to parse
command line options/arguments in your CUI application.
diff --git a/debian/libargs4j-java.poms b/debian/libargs4j-java.poms
index 140faf0..9ab1351 100644
--- a/debian/libargs4j-java.poms
+++ b/debian/libargs4j-java.poms
@@ -25,6 +25,8 @@
# --site-xml=: Optional, the location for site.xml if it needs to
be installed.
# Empty by default. [mh_install]
#
-pom.xml --has-package-version
+pom.xml --no-parent --has-package-version
args4j/pom.xml --has-package-version --java-lib
args4j-tools/pom.xml --has-package-version --java-lib
+args4j-maven-plugin/pom.xml --ignore
+args4j-maven-plugin-example/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index b8f28c3..77af890 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -15,4 +15,3 @@
# junit junit jar s/3\\..*/3.x/
org.apache.maven.plugins maven-changes-plugin * * * *
-org.jvnet.wagon-svn wagon-svn * * * *
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b8f28c3..4a7c1ae 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -15,4 +15,4 @@
# junit junit jar s/3\\..*/3.x/
org.apache.maven.plugins maven-changes-plugin * * * *
-org.jvnet.wagon-svn wagon-svn * * * *
+org.apache.felix maven-bundle-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 5a05d95..10828bd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -18,3 +18,4 @@
junit junit jar s/3\..*/3.x/ * *
s/ant/org.apache.ant/ * * s/.*/debian/ * *
+org.mockito s/mockito-all/mockito-core * s/.*/debian/ * *
diff --git a/debian/patches/01-change-packaging-to-jar.patch
b/debian/patches/01-change-packaging-to-jar.patch
new file mode 100644
index 000..09c0f08
--- /dev/null
+++ b/debian/patches/01-change-packaging-to-jar.patch
@@ -0,0 +1,22 @@
+--- a/args4j-tools/pom.xml
b/args4j-tools/pom.xml
+@@ -11,7 +11,7 @@
+ args4j-tools
+ development-time tool for generating additional
artifacits
+
+- bundle
++ jar
+
+
+ org.kohsuke.args4j.apt.Main
+--- a/args4j/pom.xml
b/args4j/pom.xml
+@@ -9,7 +9,7 @@
+ args4j
+ args4j
+
+- bundle
++ jar
+
+
+ src
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..9e463b9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-change-packaging-to-jar.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/args4j.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] branch pristine-tar updated (54a0cca -> 692716a)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch pristine-tar in repository args4j. from 54a0cca pristine-tar data for args4j_2.0.16.orig.tar.gz new 692716a pristine-tar data for args4j_2.0.25.orig.tar.gz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: args4j_2.0.25.orig.tar.gz.delta | Bin 0 -> 7371 bytes args4j_2.0.25.orig.tar.gz.id|1 + 2 files changed, 1 insertion(+) create mode 100644 args4j_2.0.25.orig.tar.gz.delta create mode 100644 args4j_2.0.25.orig.tar.gz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] branch master updated (8b06519 -> a30d870)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository args4j. from 8b06519 Added --has-package-version and --java-lib adds b484197 Imported Upstream version 2.0.25 new 9fcf458 Merge tag 'upstream/2.0.25' new a30d870 New upstream release (2.0.25) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |6 + args4j-maven-plugin-example/pom.xml| 54 ++ .../java/org/kohsuke/args4j/maven/Example.java | 34 args4j-maven-plugin/pom.xml| 38 .../org/kohsuke/args4j/maven/Args4jUsageMojo.java | 123 + args4j-tools/LICENSE.txt | 46 ++--- args4j-tools/pom.xml | 38 +++- .../args4j/apt/AnnotationProcessorFactoryImpl.java | 30 +++- .../org/kohsuke/args4j/apt/AnnotationVisitor.java |6 + .../args4j/apt/AnnotationVisitorReorderer.java | 42 + .../src/org/kohsuke/args4j/apt/HtmlWriter.java |9 +- args4j-tools/src/org/kohsuke/args4j/apt/Main.java |2 +- args4j-tools/src/org/kohsuke/args4j/apt/Mode.java |2 +- .../org/kohsuke/args4j/apt/OptionWithUsage.java| 17 ++ .../src/org/kohsuke/args4j/apt/TxtWriter.java | 40 + .../src/org/kohsuke/args4j/apt/XmlWriter.java |7 + .../args4j/apt/AnnotationVisitorReordererTest.java | 53 ++ args4j/LICENSE.txt | 49 +++--- args4j/examples/SampleMain.java|5 +- args4j/lib/ant.jar | Bin 0 -> 716139 bytes args4j/lib/junit-src.zip | Bin 0 -> 57635 bytes args4j/lib/junit.jar | Bin 0 -> 121070 bytes args4j/pom.xml |4 +- args4j/src/org/kohsuke/args4j/Argument.java|7 +- args4j/src/org/kohsuke/args4j/ClassParser.java |2 +- args4j/src/org/kohsuke/args4j/CmdLineParser.java | 130 +++--- args4j/src/org/kohsuke/args4j/Config.java | 31 +--- args4j/src/org/kohsuke/args4j/ExampleMode.java | 20 +-- args4j/src/org/kohsuke/args4j/FieldParser.java | 33 args4j/src/org/kohsuke/args4j/MapSetter.java | 65 --- args4j/src/org/kohsuke/args4j/Messages.java|9 +- args4j/src/org/kohsuke/args4j/Messages.properties | 21 ++- .../org/kohsuke/args4j/Messages_de_DE.properties | 34 +++- .../org/kohsuke/args4j/Messages_ru_RU.properties | 35 ++-- args4j/src/org/kohsuke/args4j/NamedOptionDef.java | 22 ++- args4j/src/org/kohsuke/args4j/Option.java | 41 - args4j/src/org/kohsuke/args4j/OptionDef.java | 16 +- .../org/kohsuke/args4j/OptionHandlerFilter.java| 60 +++ args4j/src/org/kohsuke/args4j/XmlParser.java | 97 +- args4j/src/org/kohsuke/args4j/package.html | 83 - .../src/org/kohsuke/args4j/spi/AnnotationImpl.java | 68 +++ .../src/org/kohsuke/args4j/spi/ArgumentImpl.java | 13 ++ .../org/kohsuke/args4j/spi/ArrayFieldSetter.java | 79 + .../src/org/kohsuke/args4j/spi/ConfigElement.java | 26 +++ .../kohsuke/args4j/spi/DelimitedOptionHandler.java | 48 + .../org/kohsuke/args4j/spi/EnumOptionHandler.java | 11 +- .../args4j/spi/ExplicitBooleanOptionHandler.java | 64 +++ args4j/src/org/kohsuke/args4j/spi/FieldSetter.java | 28 ++- .../org/kohsuke/args4j/spi/FileOptionHandler.java |7 +- .../args4j/spi/InetAddressOptionHandler.java | 36 .../org/kohsuke/args4j/spi/MapOptionHandler.java | 85 +++-- args4j/src/org/kohsuke/args4j/spi/Messages.java|6 +- .../src/org/kohsuke/args4j/spi/Messages.properties |8 + .../org/kohsuke/args4j/spi/Messages_de.properties | 25 ++- .../org/kohsuke/args4j/spi/Messages_ru.properties |8 + .../src/org/kohsuke/args4j/spi/MethodSetter.java | 12 +- .../kohsuke/args4j/spi/MultiFileOptionHandler.java | 18 ++ .../kohsuke/args4j/spi/MultiPathOptionHandler.java | 19 ++ .../kohsuke/args4j/spi/MultiValueFieldSetter.java | 14 +- .../src/org/kohsuke/args4j/spi/OptionHandler.java |8 +- args4j/src/org/kohsuke/args4j/spi/OptionImpl.java | 24 +++ .../org/kohsuke/args4j/spi/PathOptionHandler.java | 35 args4j/src/org/kohsuke/args4j/spi/Setter.java | 46 - args4j/src/org/kohsuke/args4j/spi/Setters.java |6 +- .../args4j/spi/StringArrayOptionHandler.java | 68 +++ args4j/src/org/kohsuke/args4j/spi/SubCommand.java | 27 +++ .../org/kohsuke/args4j/spi/SubCommandHandler.java | 153 args4j/src/org/kohsuke/args4j/spi/SubComman
[args4j] 01/02: Merge tag 'upstream/2.0.25'
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 9fcf458112bdfa0b6de840af3832a81c7a3457e6 Merge: 8b06519 b484197 Author: Emmanuel Bourg Date: Thu Oct 24 12:07:05 2013 +0200 Merge tag 'upstream/2.0.25' Upstream version 2.0.25 .gitignore |6 + args4j-maven-plugin-example/pom.xml| 54 ++ .../java/org/kohsuke/args4j/maven/Example.java | 34 args4j-maven-plugin/pom.xml| 38 .../org/kohsuke/args4j/maven/Args4jUsageMojo.java | 123 + args4j-tools/LICENSE.txt | 46 ++--- args4j-tools/pom.xml | 38 +++- .../args4j/apt/AnnotationProcessorFactoryImpl.java | 30 +++- .../org/kohsuke/args4j/apt/AnnotationVisitor.java |6 + .../args4j/apt/AnnotationVisitorReorderer.java | 42 + .../src/org/kohsuke/args4j/apt/HtmlWriter.java |9 +- args4j-tools/src/org/kohsuke/args4j/apt/Main.java |2 +- args4j-tools/src/org/kohsuke/args4j/apt/Mode.java |2 +- .../org/kohsuke/args4j/apt/OptionWithUsage.java| 17 ++ .../src/org/kohsuke/args4j/apt/TxtWriter.java | 40 + .../src/org/kohsuke/args4j/apt/XmlWriter.java |7 + .../args4j/apt/AnnotationVisitorReordererTest.java | 53 ++ args4j/LICENSE.txt | 49 +++--- args4j/examples/SampleMain.java|5 +- args4j/lib/ant.jar | Bin 0 -> 716139 bytes args4j/lib/junit-src.zip | Bin 0 -> 57635 bytes args4j/lib/junit.jar | Bin 0 -> 121070 bytes args4j/pom.xml |4 +- args4j/src/org/kohsuke/args4j/Argument.java|7 +- args4j/src/org/kohsuke/args4j/ClassParser.java |2 +- args4j/src/org/kohsuke/args4j/CmdLineParser.java | 130 +++--- args4j/src/org/kohsuke/args4j/Config.java | 31 +--- args4j/src/org/kohsuke/args4j/ExampleMode.java | 20 +-- args4j/src/org/kohsuke/args4j/FieldParser.java | 33 args4j/src/org/kohsuke/args4j/MapSetter.java | 65 --- args4j/src/org/kohsuke/args4j/Messages.java|9 +- args4j/src/org/kohsuke/args4j/Messages.properties | 21 ++- .../org/kohsuke/args4j/Messages_de_DE.properties | 34 +++- .../org/kohsuke/args4j/Messages_ru_RU.properties | 35 ++-- args4j/src/org/kohsuke/args4j/NamedOptionDef.java | 22 ++- args4j/src/org/kohsuke/args4j/Option.java | 41 - args4j/src/org/kohsuke/args4j/OptionDef.java | 16 +- .../org/kohsuke/args4j/OptionHandlerFilter.java| 60 +++ args4j/src/org/kohsuke/args4j/XmlParser.java | 97 +- args4j/src/org/kohsuke/args4j/package.html | 83 - .../src/org/kohsuke/args4j/spi/AnnotationImpl.java | 68 +++ .../src/org/kohsuke/args4j/spi/ArgumentImpl.java | 13 ++ .../org/kohsuke/args4j/spi/ArrayFieldSetter.java | 79 + .../src/org/kohsuke/args4j/spi/ConfigElement.java | 26 +++ .../kohsuke/args4j/spi/DelimitedOptionHandler.java | 48 + .../org/kohsuke/args4j/spi/EnumOptionHandler.java | 11 +- .../args4j/spi/ExplicitBooleanOptionHandler.java | 64 +++ args4j/src/org/kohsuke/args4j/spi/FieldSetter.java | 28 ++- .../org/kohsuke/args4j/spi/FileOptionHandler.java |7 +- .../args4j/spi/InetAddressOptionHandler.java | 36 .../org/kohsuke/args4j/spi/MapOptionHandler.java | 85 +++-- args4j/src/org/kohsuke/args4j/spi/Messages.java|6 +- .../src/org/kohsuke/args4j/spi/Messages.properties |8 + .../org/kohsuke/args4j/spi/Messages_de.properties | 25 ++- .../org/kohsuke/args4j/spi/Messages_ru.properties |8 + .../src/org/kohsuke/args4j/spi/MethodSetter.java | 12 +- .../kohsuke/args4j/spi/MultiFileOptionHandler.java | 18 ++ .../kohsuke/args4j/spi/MultiPathOptionHandler.java | 19 ++ .../kohsuke/args4j/spi/MultiValueFieldSetter.java | 14 +- .../src/org/kohsuke/args4j/spi/OptionHandler.java |8 +- args4j/src/org/kohsuke/args4j/spi/OptionImpl.java | 24 +++ .../org/kohsuke/args4j/spi/PathOptionHandler.java | 35 args4j/src/org/kohsuke/args4j/spi/Setter.java | 46 - args4j/src/org/kohsuke/args4j/spi/Setters.java |6 +- .../args4j/spi/StringArrayOptionHandler.java | 68 +++ args4j/src/org/kohsuke/args4j/spi/SubCommand.java | 27 +++ .../org/kohsuke/args4j/spi/SubCommandHandler.java | 153 args4j/src/org/kohsuke/args4j/spi/SubCommands.java | 18 ++ args4j/test/ExampleTest.java | 49 +- args4j/test/org/kohsuke/args4j/Bean.java |9 + .../test/org/kohsuke/args4j/DependencyOptions.java | 24 +++ .../org/kohsuke/args4j/DependencyOptio
[args4j] annotated tag upstream/2.0.25 created (now c5a68c2)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to annotated tag upstream/2.0.25 in repository args4j. at c5a68c2 (tag) tagging b484197fbc55b681a1001a21240a6bf274ad07f1 (commit) replaces upstream/2.0.16 tagged by Emmanuel Bourg on Thu Oct 24 12:07:05 2013 +0200 - Log - Upstream version 2.0.25 Emmanuel Bourg (1): Imported Upstream version 2.0.25 --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] branch master updated (a30d870 -> 11a52b2)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository args4j. from a30d870 New upstream release (2.0.25) new 11a52b2 Added a description to the patch The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/patches/01-change-packaging-to-jar.patch |3 +++ 1 file changed, 3 insertions(+) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[args4j] 01/01: Added a description to the patch
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository args4j. commit 11a52b230bfc12d47c98bf0ea02758e8636f9bc6 Author: Emmanuel Bourg Date: Thu Oct 24 16:11:57 2013 +0200 Added a description to the patch --- debian/patches/01-change-packaging-to-jar.patch |3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/patches/01-change-packaging-to-jar.patch b/debian/patches/01-change-packaging-to-jar.patch index 09c0f08..19956b0 100644 --- a/debian/patches/01-change-packaging-to-jar.patch +++ b/debian/patches/01-change-packaging-to-jar.patch @@ -1,3 +1,6 @@ +Description: Changes the packaging to "jar" to avoid a dependency on bnd +Author: Emmanuel Bourg +Forwarded: not-needed --- a/args4j-tools/pom.xml +++ b/args4j-tools/pom.xml @@ -11,7 +11,7 @@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/args4j.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17376 - trunk/maven-invoker/debian
Author: ebourg-guest
Date: 2013-10-24 14:52:10 + (Thu, 24 Oct 2013)
New Revision: 17376
Modified:
trunk/maven-invoker/debian/changelog
trunk/maven-invoker/debian/control
trunk/maven-invoker/debian/copyright
trunk/maven-invoker/debian/rules
Log:
Use canonical URLs for the Vcs-* fields
Updated Standards-Version to 3.9.4 (no changes)
debian:copyright: Updated to the Copyright Format 1.0
debian/rules: Improved the clean target
Modified: trunk/maven-invoker/debian/changelog
===
--- trunk/maven-invoker/debian/changelog2013-10-24 04:10:26 UTC (rev
17375)
+++ trunk/maven-invoker/debian/changelog2013-10-24 14:52:10 UTC (rev
17376)
@@ -1,3 +1,14 @@
+maven-invoker (2.0.11-2) UNRELEASED; urgency=low
+
+ * Team upload.
+ * debian/control:
+- Use canonical URLs for the Vcs-* fields
+- Updated Standards-Version to 3.9.4 (no changes)
+ * debian:copyright: Updated to the Copyright Format 1.0
+ * debian/rules: Improved the clean target
+
+ -- Emmanuel Bourg Thu, 24 Oct 2013 16:48:11 +0200
+
maven-invoker (2.0.11-1) unstable; urgency=low
* Team upload.
Modified: trunk/maven-invoker/debian/control
===
--- trunk/maven-invoker/debian/control 2013-10-24 04:10:26 UTC (rev 17375)
+++ trunk/maven-invoker/debian/control 2013-10-24 14:52:10 UTC (rev 17376)
@@ -3,18 +3,23 @@
Priority: optional
Maintainer: Debian Java Maintainers
Uploaders: Ludovic Claude
-Build-Depends: default-jdk, debhelper (>= 6), cdbs
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
ant-optional,
- junit, libmaven-plugin-tools-java, libplexus-component-metadata-java (>=
1.0~beta3.0.7),
- libplexus-utils-java
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-invoker
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-invoker/
+Build-Depends: cdbs, debhelper (>= 6), default-jdk
+Build-Depends-Indep: ant,
+ ant-optional,
+ junit,
+ libmaven-plugin-tools-java,
+ libplexus-component-metadata-java (>= 1.0~beta3.0.7),
+ libplexus-utils-java,
+ maven-ant-helper (>> 4),
+ maven-repo-helper
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-invoker
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-invoker/
Homepage: http://maven.apache.org/shared/maven-invoker/
Package: libmaven-invoker-java
Architecture: all
-Depends: ${misc:Depends}, libplexus-utils-java
+Depends: libplexus-utils-java, ${misc:Depends}
Description: Maven Invoker
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
Modified: trunk/maven-invoker/debian/copyright
===
--- trunk/maven-invoker/debian/copyright2013-10-24 04:10:26 UTC (rev
17375)
+++ trunk/maven-invoker/debian/copyright2013-10-24 14:52:10 UTC (rev
17376)
@@ -1,7 +1,7 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Maven Invoker
-Maintainer: Apache Maven team
-Source: http://maven.apache.org/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Maven Invoker
+Upstream-Contact: Apache Maven team
+Source: http://maven.apache.org
Files: *
Copyright: 2001-2009, The Apache Software Foundation.
@@ -15,8 +15,7 @@
On Debian GNU/Linux system you can find the complete text of the
Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
-License: GPL-3
+License: GPL-3+
On Debian GNU/Linux system you can find the complete text of the
- GNU General Public License version 3 license in
+ GNU General Public License version 3 license in
'/usr/share/common-licenses/GPL-3'.
-
Modified: trunk/maven-invoker/debian/rules
===
--- trunk/maven-invoker/debian/rules2013-10-24 04:10:26 UTC (rev 17375)
+++ trunk/maven-invoker/debian/rules2013-10-24 14:52:10 UTC (rev 17376)
@@ -24,5 +24,4 @@
clean::
-rm -rf debian/tmp
mh_clean
-
-
+ mh_unpatchpoms -plib$(PACKAGE)-java
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17377 - trunk/maven-invoker/debian
Author: ebourg-guest
Date: 2013-10-24 15:10:44 + (Thu, 24 Oct 2013)
New Revision: 17377
Modified:
trunk/maven-invoker/debian/changelog
trunk/maven-invoker/debian/control
trunk/maven-invoker/debian/rules
Log:
New upstream release (2.1.1)
Modified: trunk/maven-invoker/debian/changelog
===
--- trunk/maven-invoker/debian/changelog2013-10-24 14:52:10 UTC (rev
17376)
+++ trunk/maven-invoker/debian/changelog2013-10-24 15:10:44 UTC (rev
17377)
@@ -1,6 +1,8 @@
-maven-invoker (2.0.11-2) UNRELEASED; urgency=low
+maven-invoker (2.1.1-1) unstable; urgency=low
* Team upload.
+ * New upstream release
+- Added a dependency on libplexus-containers1.5-java
* debian/control:
- Use canonical URLs for the Vcs-* fields
- Updated Standards-Version to 3.9.4 (no changes)
Modified: trunk/maven-invoker/debian/control
===
--- trunk/maven-invoker/debian/control 2013-10-24 14:52:10 UTC (rev 17376)
+++ trunk/maven-invoker/debian/control 2013-10-24 15:10:44 UTC (rev 17377)
@@ -8,6 +8,7 @@
ant-optional,
junit,
libmaven-plugin-tools-java,
+ libplexus-containers1.5-java,
libplexus-component-metadata-java (>= 1.0~beta3.0.7),
libplexus-utils-java,
maven-ant-helper (>> 4),
@@ -19,7 +20,7 @@
Package: libmaven-invoker-java
Architecture: all
-Depends: libplexus-utils-java, ${misc:Depends}
+Depends: libplexus-utils-java, libplexus-containers1.5-java, ${misc:Depends}
Description: Maven Invoker
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
Modified: trunk/maven-invoker/debian/rules
===
--- trunk/maven-invoker/debian/rules2013-10-24 14:52:10 UTC (rev 17376)
+++ trunk/maven-invoker/debian/rules2013-10-24 15:10:44 UTC (rev 17377)
@@ -8,7 +8,7 @@
JAVA_HOME:= /usr/lib/jvm/default-java
# Need to specify the exact version of the Plexus plugin (from
plexus-component-metadata package) used here
PLEXUS_PLUGIN_VERSION:= 1.0-beta-3.0.7
-DEB_JARS := ant-nodeps plexus-utils junit
+DEB_JARS := ant-nodeps plexus-utils junit
plexus-component-annotations-1.5
DEB_ANT_BUILD_TARGET := package #javadoc
DEB_ANT_BUILDFILE:= /usr/share/maven-ant-helper/maven-build.xml
DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
-Dversion=$(VERSION)
-Dplexus-component-metadata.version=$(PLEXUS_PLUGIN_VERSION)
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17378 - trunk/maven-verifier/debian
Author: ebourg-guest Date: 2013-10-24 15:43:27 + (Thu, 24 Oct 2013) New Revision: 17378 Modified: trunk/maven-verifier/debian/changelog trunk/maven-verifier/debian/control trunk/maven-verifier/debian/copyright trunk/maven-verifier/debian/libmaven-verifier-java.poms Log: Use canonical URLs for the Vcs-* fields Updated Standards-Version to 3.9.4 (no changes) debian/copyright: Updated to the Copyright Format 1.0 Modified: trunk/maven-verifier/debian/changelog === --- trunk/maven-verifier/debian/changelog 2013-10-24 15:10:44 UTC (rev 17377) +++ trunk/maven-verifier/debian/changelog 2013-10-24 15:43:27 UTC (rev 17378) @@ -1,3 +1,13 @@ +maven-verifier (1.2-2) UNRELEASED; urgency=low + + * Team upload. + * debian/control: +- Use canonical URLs for the Vcs-* fields +- Updated Standards-Version to 3.9.4 (no changes) + * debian/copyright: Updated to the Copyright Format 1.0 + + -- Emmanuel Bourg Thu, 24 Oct 2013 17:36:31 +0200 + maven-verifier (1.2-1) unstable; urgency=low * Team upload. Modified: trunk/maven-verifier/debian/control === --- trunk/maven-verifier/debian/control 2013-10-24 15:10:44 UTC (rev 17377) +++ trunk/maven-verifier/debian/control 2013-10-24 15:43:27 UTC (rev 17378) @@ -5,9 +5,9 @@ Uploaders: Ludovic Claude Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) Build-Depends-Indep: junit, default-jdk-doc, libmaven-javadoc-plugin-java -Standards-Version: 3.9.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-verifier -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-verifier/ +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-verifier +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-verifier/ Homepage: http://maven.apache.org/shared/maven-verifier/ Package: libmaven-verifier-java Modified: trunk/maven-verifier/debian/copyright === --- trunk/maven-verifier/debian/copyright 2013-10-24 15:10:44 UTC (rev 17377) +++ trunk/maven-verifier/debian/copyright 2013-10-24 15:43:27 UTC (rev 17378) @@ -1,7 +1,7 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Maven Verifier Component -Maintainer: Apache Maven team -Source: http://maven.apache.org/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Maven Verifier Component +Upstream-Contact: Apache Maven team +Source: http://maven.apache.org Files: * Copyright: 2004, The Codehaus. @@ -113,6 +113,6 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: GPL-3 +License: GPL-3+ On Debian GNU/Linux system you can find the complete text of the GPL-3 license in '/usr/share/common-licenses/GPL-3' Modified: trunk/maven-verifier/debian/libmaven-verifier-java.poms === --- trunk/maven-verifier/debian/libmaven-verifier-java.poms 2013-10-24 15:10:44 UTC (rev 17377) +++ trunk/maven-verifier/debian/libmaven-verifier-java.poms 2013-10-24 15:43:27 UTC (rev 17378) @@ -2,7 +2,9 @@ # Format of this file is: # [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 tag from the POM # --package=: an alternative package to use when installing this POM # and its artifact @@ -11,16 +13,16 @@ # --keep-elements=: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=: 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 to use when installing the library in /usr/share/java # --usj-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=: the destination for the real jar -# it will be installed with mh_install. +# --dest-jar=: the destination for the real jar. +# It will be installed with mh_install. [mh_install] # --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 ce
[plexus-classworlds2] 01/01: Updated the Maven rules to transform all plexus-classworlds artifacts to 2.x (Closes: #727637)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-classworlds2. commit 2e9308c3e8bf46fd02de1298523257837bd92ea3 Author: Emmanuel Bourg Date: Sat Oct 26 22:27:28 2013 +0200 Updated the Maven rules to transform all plexus-classworlds artifacts to 2.x (Closes: #727637) --- debian/changelog |8 debian/maven.rules |2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e1708d7..398c497 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +plexus-classworlds2 (2.5.1-2) unstable; urgency=low + + * Team upload. + * Updated the Maven rules to transform all plexus-classworlds +artifacts to 2.x (Closes: #727637) + + -- Emmanuel Bourg Sat, 26 Oct 2013 22:25:24 +0200 + plexus-classworlds2 (2.5.1-1) unstable; urgency=low * Team upload. diff --git a/debian/maven.rules b/debian/maven.rules index 1c938d0..9054674 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -16,5 +16,5 @@ # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ -org.codehaus.plexus plexus-classworlds jar s/2\..*/2.x/ * * +org.codehaus.plexus plexus-classworlds * s/2\..*/2.x/ * * org.codehaus.plexus plexus pom s/2\..*/2.x/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-classworlds2] branch master updated (f630932 -> 2e9308c)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository plexus-classworlds2. from f630932 New upstream release (2.5.1) new 2e9308c Updated the Maven rules to transform all plexus-classworlds artifacts to 2.x (Closes: #727637) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog |8 debian/maven.rules |2 +- 2 files changed, 9 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[wagon2] 02/05: Use XZ compression for the upstream tarball
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon2. commit b6b66ad71444cf92aaa59e2f7ea21947ca27c12b Author: Emmanuel Bourg Date: Mon Oct 28 09:54:43 2013 +0100 Use XZ compression for the upstream tarball --- debian/changelog |1 + debian/orig-tar.sh |9 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f68ea05..ae8dfe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ wagon2 (2.4-2) UNRELEASED; urgency=low * debian/control: Use canonical URLs for the Vcs-* fields + * Use XZ compression for the upstream tarball -- Emmanuel Bourg Sun, 27 Oct 2013 22:30:07 +0100 diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 7653c22..fb2618a 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,9 +1,10 @@ #!/bin/sh -e -TAR=../wagon2_$2.orig.tar.gz -DIR=wagon-$2 +VERSION=$2 +TAR=../wagon2_$VERSION.orig.tar.xz +DIR=wagon-$VERSION -tar -zxvf $3 +unzip $3 rm $3 -tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +tar -c -J -f $TAR -X debian/orig-tar.exclude $DIR rm -rf $DIR -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[wagon2] annotated tag upstream/2.5 created (now 61e98c5)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to annotated tag upstream/2.5 in repository wagon2. at 61e98c5 (tag) tagging 6fb3b85c75c9f2104efa24c7f5b187715d7a (commit) replaces upstream/2.4 tagged by Emmanuel Bourg on Mon Oct 28 10:49:14 2013 +0100 - Log - Upstream version 2.5 Emmanuel Bourg (1): Imported Upstream version 2.5 --- This annotated tag includes the following new commits: new 6fb3b85 Imported Upstream version 2.5 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[wagon2] 03/05: Updated Standards-Version to 3.9.5 (no changes)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon2. commit e27d5520339a118d57090c5b936e7ef55272836a Author: Emmanuel Bourg Date: Mon Oct 28 09:56:24 2013 +0100 Updated Standards-Version to 3.9.5 (no changes) --- debian/changelog |4 +++- debian/control |2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae8dfe5..3089c97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ wagon2 (2.4-2) UNRELEASED; urgency=low - * debian/control: Use canonical URLs for the Vcs-* fields + * debian/control: +- Use canonical URLs for the Vcs-* fields +- Updated Standards-Version to 3.9.5 (no changes) * Use XZ compression for the upstream tarball -- Emmanuel Bourg Sun, 27 Oct 2013 22:30:07 +0100 diff --git a/debian/control b/debian/control index 51a27ce..a6f90a4 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ Build-Depends-Indep: default-jdk-doc, libplexus-utils-java, libplexus-utils-java-doc, subversion -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/wagon2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/wagon2.git Homepage: http://maven.apache.org/wagon/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[wagon2] 01/05: debian/control: Use canonical URLs for the Vcs-* fields
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon2. commit 7140e96fdf55d93a66c311710068a3c0dbbedbc4 Author: Emmanuel Bourg Date: Sun Oct 27 22:58:34 2013 +0100 debian/control: Use canonical URLs for the Vcs-* fields --- debian/changelog |6 ++ debian/control |4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a3207f..f68ea05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wagon2 (2.4-2) UNRELEASED; urgency=low + + * debian/control: Use canonical URLs for the Vcs-* fields + + -- Emmanuel Bourg Sun, 27 Oct 2013 22:30:07 +0100 + wagon2 (2.4-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index e0dd68a..51a27ce 100644 --- a/debian/control +++ b/debian/control @@ -42,8 +42,8 @@ Build-Depends-Indep: default-jdk-doc, libplexus-utils-java-doc, subversion Standards-Version: 3.9.4 -Vcs-Git: git://git.debian.org/git/pkg-java/wagon2.git -Vcs-Browser: http://git.debian.org/?p=pkg-java/wagon2.git +Vcs-Git: git://anonscm.debian.org/pkg-java/wagon2.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/wagon2.git Homepage: http://maven.apache.org/wagon/ Package: libwagon2-java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[wagon2] 05/05: New upstream release (2.5) Refreshed the patches Removed the wagon-providers/wagon-http-shared4 module
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon2. commit 991b59dea70c0f5aae7d286643440271c670df20 Author: Emmanuel Bourg Date: Mon Oct 28 12:01:00 2013 +0100 New upstream release (2.5) Refreshed the patches Removed the wagon-providers/wagon-http-shared4 module --- debian/changelog|5 - debian/libwagon2-java.poms |1 - debian/patches/do_not_build_ftp_tests.patch |6 ++ debian/patches/do_not_run_http_tests.patch |4 ++-- debian/patches/no_itcould_webdav.diff |2 +- debian/patches/no_mina_sshd.diff|2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3089c97..3caebf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -wagon2 (2.4-2) UNRELEASED; urgency=low +wagon2 (2.5-1) unstable; urgency=low + * New upstream release +- Refreshed the patches +- Removed the wagon-providers/wagon-http-shared4 module * debian/control: - Use canonical URLs for the Vcs-* fields - Updated Standards-Version to 3.9.5 (no changes) diff --git a/debian/libwagon2-java.poms b/debian/libwagon2-java.poms index 89c4cf5..c277a1e 100644 --- a/debian/libwagon2-java.poms +++ b/debian/libwagon2-java.poms @@ -32,7 +32,6 @@ wagon-providers/wagon-file/pom.xml --has-package-version --java-lib --usj-name=w wagon-providers/wagon-ftp/pom.xml --has-package-version --java-lib --usj-name=wagon-ftp-2.x wagon-providers/wagon-http/pom.xml --has-package-version --java-lib --usj-name=wagon-http-2.x wagon-providers/wagon-http-shared/pom.xml --has-package-version --java-lib --usj-name=wagon-http-shared-2.x -wagon-providers/wagon-http-shared4/pom.xml --has-package-version --java-lib --usj-name=wagon-http-shared4-2.x wagon-providers/wagon-http-lightweight/pom.xml --has-package-version --java-lib --usj-name=wagon-http-lightweight-2.x wagon-providers/wagon-scm/pom.xml --has-package-version --java-lib --usj-name=wagon-scm-2.x wagon-providers/wagon-ssh/pom.xml --has-package-version --java-lib --usj-name=wagon-ssh-2.x diff --git a/debian/patches/do_not_build_ftp_tests.patch b/debian/patches/do_not_build_ftp_tests.patch index d8fdbbf..980123d 100644 --- a/debian/patches/do_not_build_ftp_tests.patch +++ b/debian/patches/do_not_build_ftp_tests.patch @@ -6,12 +6,10 @@ Subject: [PATCH] do not build FtpWagonTest.java wagon-providers/wagon-ftp/pom.xml |9 + 1 files changed, 9 insertions(+), 0 deletions(-) -Index: b/wagon-providers/wagon-ftp/pom.xml -=== --- a/wagon-providers/wagon-ftp/pom.xml +++ b/wagon-providers/wagon-ftp/pom.xml -@@ -55,5 +55,19 @@ - slf4j-simple +@@ -59,5 +59,19 @@ + commons-io + diff --git a/debian/patches/do_not_run_http_tests.patch b/debian/patches/do_not_run_http_tests.patch index c9f9ad7..0e079e8 100644 --- a/debian/patches/do_not_run_http_tests.patch +++ b/debian/patches/do_not_run_http_tests.patch @@ -3,7 +3,7 @@ Author: Damien Raude-Morvan Subject: Do not run tests making HTTP/HTTPS connections --- a/wagon-providers/wagon-http-lightweight/pom.xml +++ b/wagon-providers/wagon-http-lightweight/pom.xml -@@ -58,4 +58,19 @@ +@@ -48,4 +48,19 @@ test @@ -25,7 +25,7 @@ Subject: Do not run tests making HTTP/HTTPS connections --- a/wagon-providers/wagon-http/pom.xml +++ b/wagon-providers/wagon-http/pom.xml -@@ -114,6 +114,18 @@ +@@ -118,6 +118,18 @@ diff --git a/debian/patches/no_itcould_webdav.diff b/debian/patches/no_itcould_webdav.diff index 5ce226a..09f28d3 100644 --- a/debian/patches/no_itcould_webdav.diff +++ b/debian/patches/no_itcould_webdav.diff @@ -1,6 +1,6 @@ --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml -@@ -165,6 +165,15 @@ +@@ -160,6 +160,15 @@ diff --git a/debian/patches/no_mina_sshd.diff b/debian/patches/no_mina_sshd.diff index 0622132..b3f080e 100644 --- a/debian/patches/no_mina_sshd.diff +++ b/debian/patches/no_mina_sshd.diff @@ -1,6 +1,6 @@ --- a/wagon-providers/pom.xml +++ b/wagon-providers/pom.xml -@@ -41,7 +41,6 @@ +@@ -40,7 +40,6 @@ wagon-scm wagon-ssh-external wagon-ssh-common -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[wagon2] branch master updated (1a08069 -> 991b59d)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository wagon2. from 1a08069 Changelog update new 7140e96 debian/control: Use canonical URLs for the Vcs-* fields new b6b66ad Use XZ compression for the upstream tarball new e27d552 Updated Standards-Version to 3.9.5 (no changes) adds 6fb3b85 Imported Upstream version 2.5 new 531 Merge tag 'upstream/2.5' new 991b59d New upstream release (2.5) Refreshed the patches Removed the wagon-providers/wagon-http-shared4 module The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |4 + debian/changelog | 12 + debian/control |6 +- debian/libwagon2-java.poms |1 - debian/orig-tar.sh |9 +- debian/patches/do_not_build_ftp_tests.patch|6 +- debian/patches/do_not_run_http_tests.patch |4 +- debian/patches/no_itcould_webdav.diff |2 +- debian/patches/no_mina_sshd.diff |2 +- deploySite.sh |2 +- pom.xml| 45 +- src/site/resources/images/wagon-deps.png | Bin 33075 -> 31652 bytes src/site/xdoc/index.xml|3 +- src/site/xdoc/wagon-deps.odg | Bin 16281 -> 16223 bytes wagon-provider-api/pom.xml |2 +- .../java/org/apache/maven/wagon/AbstractWagon.java | 55 +- wagon-provider-api/src/site/apt/index.apt |2 +- .../org/apache/maven/wagon/AbstractWagonTest.java |1 - .../java/org/apache/maven/wagon/WagonMock.java |4 +- .../wagon/events/TransferEventSupportTest.java |2 - wagon-provider-test/pom.xml|2 +- .../apache/maven/wagon/StreamingWagonTestCase.java |1 - .../apache/maven/wagon/http/HttpWagonTestCase.java |2 +- wagon-providers/pom.xml|9 +- wagon-providers/wagon-file/pom.xml | 10 +- .../maven/wagon/providers/file/FileWagon.java |2 +- wagon-providers/wagon-file/src/site/apt/index.apt |2 +- wagon-providers/wagon-ftp/pom.xml |8 +- .../apache/maven/wagon/providers/ftp/FtpWagon.java |4 +- wagon-providers/wagon-ftp/src/site/apt/index.apt |2 +- .../maven/wagon/providers/ftp/FtpWagonTest.java|5 +- wagon-providers/wagon-http-lightweight/pom.xml | 16 +- .../wagon/providers/http/LightweightHttpWagon.java |2 +- .../wagon-http-lightweight/src/site/apt/index.apt |2 +- .../providers/http/LightweightHttpWagonTest.java |5 - .../apache/maven/wagon/providers/http/TckTest.java |2 - wagon-providers/wagon-http-shared/pom.xml | 46 +- .../wagon/shared/http/HtmlFileListParser.java | 178 +++-- wagon-providers/wagon-http-shared4/pom.xml | 63 -- .../wagon/shared/http4/HtmlFileListParser.java | 164 - .../wagon-http-shared4/src/site/site.xml | 33 - .../wagon/shared/http4/HtmlFileListParserTest.java | 728 .../test/resources/filelistings/commons-lang.html | 31 - .../test/resources/filelistings/ibiblio-wagon.html | 99 --- .../test/resources/filelistings/jetty-wagon.html | 90 --- .../src/test/resources/filelistings/mevenide.html | 42 -- .../test/resources/filelistings/mirror-wagon.html | 112 --- .../src/test/resources/filelistings/nekohtml.html | 23 - .../src/test/resources/filelistings/net_sf.html| 71 -- .../resources/filelistings/org.apache.maven.html | 42 -- .../test/resources/filelistings/org.codehaus.html | 82 --- wagon-providers/wagon-http/pom.xml | 14 +- .../providers/http}/AbstractHttpClientWagon.java |6 +- .../ConfigurableSSLSocketFactoryDecorator.java |2 +- .../wagon/providers/http}/HttpConfiguration.java |2 +- .../providers/http}/HttpMethodConfiguration.java |2 +- .../maven/wagon/providers/http/HttpWagon.java |3 +- .../providers/http}/RelaxedX509TrustManager.java |2 +- wagon-providers/wagon-http/src/site/apt/index.apt |2 +- .../wagon/providers/http/HttpClientWagonTest.java} |4 +- .../providers/http/HttpWagonPreemptiveTest.java|2 - .../maven/wagon/providers/http/HttpWagonTest.java |4 - .../wagon/providers/http/HttpWagonTimeoutTest.java |2 - .../providers/http/HttpsWagonPreemptiveTest.java |2 - .../wagon/providers/http/HugeFileDownloadTest.java | 156 + .../apache/maven/wagon/providers/http/TckTest.j
[wagon2] branch pristine-tar updated (b00bacb -> cbecd88)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch pristine-tar in repository wagon2. from b00bacb pristine-tar data for wagon2_2.4.orig.tar.gz new cbecd88 pristine-tar data for wagon2_2.5.orig.tar.xz The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: wagon2_2.5.orig.tar.xz.delta | Bin 0 -> 19725 bytes wagon2_2.5.orig.tar.xz.id|1 + 2 files changed, 1 insertion(+) create mode 100644 wagon2_2.5.orig.tar.xz.delta create mode 100644 wagon2_2.5.orig.tar.xz.id -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[wagon2] 04/05: Merge tag 'upstream/2.5'
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon2. commit 531c096fed97cbfcc92b3e20d44d4132578c Merge: e27d552 6fb3b85 Author: Emmanuel Bourg Date: Mon Oct 28 10:49:15 2013 +0100 Merge tag 'upstream/2.5' Upstream version 2.5 .gitignore |4 + deploySite.sh |2 +- pom.xml| 45 +- src/site/resources/images/wagon-deps.png | Bin 33075 -> 31652 bytes src/site/xdoc/index.xml|3 +- src/site/xdoc/wagon-deps.odg | Bin 16281 -> 16223 bytes wagon-provider-api/pom.xml |2 +- .../java/org/apache/maven/wagon/AbstractWagon.java | 55 +- wagon-provider-api/src/site/apt/index.apt |2 +- .../org/apache/maven/wagon/AbstractWagonTest.java |1 - .../java/org/apache/maven/wagon/WagonMock.java |4 +- .../wagon/events/TransferEventSupportTest.java |2 - wagon-provider-test/pom.xml|2 +- .../apache/maven/wagon/StreamingWagonTestCase.java |1 - .../apache/maven/wagon/http/HttpWagonTestCase.java |2 +- wagon-providers/pom.xml|9 +- wagon-providers/wagon-file/pom.xml | 10 +- .../maven/wagon/providers/file/FileWagon.java |2 +- wagon-providers/wagon-file/src/site/apt/index.apt |2 +- wagon-providers/wagon-ftp/pom.xml |8 +- .../apache/maven/wagon/providers/ftp/FtpWagon.java |4 +- wagon-providers/wagon-ftp/src/site/apt/index.apt |2 +- .../maven/wagon/providers/ftp/FtpWagonTest.java|5 +- wagon-providers/wagon-http-lightweight/pom.xml | 16 +- .../wagon/providers/http/LightweightHttpWagon.java |2 +- .../wagon-http-lightweight/src/site/apt/index.apt |2 +- .../providers/http/LightweightHttpWagonTest.java |5 - .../apache/maven/wagon/providers/http/TckTest.java |2 - wagon-providers/wagon-http-shared/pom.xml | 46 +- .../wagon/shared/http/HtmlFileListParser.java | 178 +++-- wagon-providers/wagon-http-shared4/pom.xml | 63 -- .../wagon/shared/http4/HtmlFileListParser.java | 164 - .../wagon-http-shared4/src/site/site.xml | 33 - .../wagon/shared/http4/HtmlFileListParserTest.java | 728 .../test/resources/filelistings/commons-lang.html | 31 - .../test/resources/filelistings/ibiblio-wagon.html | 99 --- .../test/resources/filelistings/jetty-wagon.html | 90 --- .../src/test/resources/filelistings/mevenide.html | 42 -- .../test/resources/filelistings/mirror-wagon.html | 112 --- .../src/test/resources/filelistings/nekohtml.html | 23 - .../src/test/resources/filelistings/net_sf.html| 71 -- .../resources/filelistings/org.apache.maven.html | 42 -- .../test/resources/filelistings/org.codehaus.html | 82 --- wagon-providers/wagon-http/pom.xml | 14 +- .../providers/http}/AbstractHttpClientWagon.java |6 +- .../ConfigurableSSLSocketFactoryDecorator.java |2 +- .../wagon/providers/http}/HttpConfiguration.java |2 +- .../providers/http}/HttpMethodConfiguration.java |2 +- .../maven/wagon/providers/http/HttpWagon.java |3 +- .../providers/http}/RelaxedX509TrustManager.java |2 +- wagon-providers/wagon-http/src/site/apt/index.apt |2 +- .../wagon/providers/http/HttpClientWagonTest.java} |4 +- .../providers/http/HttpWagonPreemptiveTest.java|2 - .../maven/wagon/providers/http/HttpWagonTest.java |4 - .../wagon/providers/http/HttpWagonTimeoutTest.java |2 - .../providers/http/HttpsWagonPreemptiveTest.java |2 - .../wagon/providers/http/HugeFileDownloadTest.java | 156 + .../apache/maven/wagon/providers/http/TckTest.java |2 +- .../wagon-http/src/test/resources/log4j.xml|8 +- wagon-providers/wagon-scm/pom.xml |4 +- wagon-providers/wagon-scm/src/site/apt/index.apt |2 +- wagon-providers/wagon-ssh-common-test/pom.xml |2 +- wagon-providers/wagon-ssh-common/pom.xml |2 +- wagon-providers/wagon-ssh-external/pom.xml |6 +- .../providers/ssh/external/ScpExternalWagon.java |1 - .../wagon-ssh-external/src/site/apt/index.apt |4 +- wagon-providers/wagon-ssh/pom.xml |8 +- .../maven/wagon/providers/ssh/jsch/SftpWagon.java |3 +- wagon-providers/wagon-ssh/src/site/apt/index.apt |2 +- .../providers/ssh/jsch/EmbeddedScpWagonTest.java |2 - wagon-providers/wagon-webdav-jackrabbit/pom.xml|9 +- .../providers/webdav}/AbstractHttpClientWagon.java |2 +- .../wagon/providers/webdav}/HttpConfiguration.java |2 +- .../providers/webdav}/HttpMethodConfiguration.java |2 +- .../maven
[wagon2] 01/01: pristine-tar data for wagon2_2.5.orig.tar.xz
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch pristine-tar in repository wagon2. commit cbecd88f38669d1e5fe16586daa8ac38aa290faf Author: Emmanuel Bourg Date: Mon Oct 28 10:49:14 2013 +0100 pristine-tar data for wagon2_2.5.orig.tar.xz --- wagon2_2.5.orig.tar.xz.delta | Bin 0 -> 19725 bytes wagon2_2.5.orig.tar.xz.id|1 + 2 files changed, 1 insertion(+) diff --git a/wagon2_2.5.orig.tar.xz.delta b/wagon2_2.5.orig.tar.xz.delta new file mode 100644 index 000..2c9e82d Binary files /dev/null and b/wagon2_2.5.orig.tar.xz.delta differ diff --git a/wagon2_2.5.orig.tar.xz.id b/wagon2_2.5.orig.tar.xz.id new file mode 100644 index 000..098bb2e --- /dev/null +++ b/wagon2_2.5.orig.tar.xz.id @@ -0,0 +1 @@ +27f23a4aba38895fe78d308f4d6c5eef52eef21f -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[pkg-java] r17383 - trunk/plexus-cipher/debian
Author: ebourg-guest
Date: 2013-10-28 12:54:44 + (Mon, 28 Oct 2013)
New Revision: 17383
Modified:
trunk/plexus-cipher/debian/changelog
trunk/plexus-cipher/debian/control
trunk/plexus-cipher/debian/copyright
trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install
trunk/plexus-cipher/debian/libplexus-cipher-java.poms
Log:
Use canonical URLs for the Vcs-* fields
Updated Standard-Version to 3.9.5 (no changes)
Modified: trunk/plexus-cipher/debian/changelog
===
--- trunk/plexus-cipher/debian/changelog2013-10-27 22:00:38 UTC (rev
17382)
+++ trunk/plexus-cipher/debian/changelog2013-10-28 12:54:44 UTC (rev
17383)
@@ -1,3 +1,12 @@
+plexus-cipher (1.5-5) UNRELEASED; urgency=low
+
+ * Team upload.
+ * debian/control:
+- Use canonical URLs for the Vcs-* fields
+- Updated Standard-Version to 3.9.5 (no changes)
+
+ -- Emmanuel Bourg Mon, 28 Oct 2013 13:52:27 +0100
+
plexus-cipher (1.5-4) unstable; urgency=low
* Team upload.
Modified: trunk/plexus-cipher/debian/control
===
--- trunk/plexus-cipher/debian/control 2013-10-27 22:00:38 UTC (rev 17382)
+++ trunk/plexus-cipher/debian/control 2013-10-28 12:54:44 UTC (rev 17383)
@@ -3,17 +3,21 @@
Priority: optional
Maintainer: Debian Java Maintainers
Uploaders: Ludovic Claude
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>=
1.4)
-Build-Depends-Indep: libplexus-maven-plugin-java, junit,
libplexus-container-default-java, default-jdk-doc,
- libplexus-container-default-java-doc, libmaven-javadoc-plugin-java
-Standards-Version: 3.9.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-cipher
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-cipher/
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>=
1.4)
+Build-Depends-Indep: default-jdk-doc,
+ junit,
+ libmaven-javadoc-plugin-java,
+ libplexus-container-default-java,
+ libplexus-container-default-java-doc,
+ libplexus-maven-plugin-java
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/plexus-cipher
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-cipher/
Homepage: https://github.com/sonatype/plexus-cipher
Package: libplexus-cipher-java
Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
Recommends: ${maven:OptionalDepends}
Suggests: libplexus-cipher-java-doc
Description: Plexus Cipher Component used by Maven
@@ -27,7 +31,7 @@
Package: libplexus-cipher-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
Recommends: ${maven:DocOptionalDepends}
Suggests: libplexus-cipher-java
Description: Documentation for Plexus Cipher Component used by Maven
Modified: trunk/plexus-cipher/debian/copyright
===
--- trunk/plexus-cipher/debian/copyright2013-10-27 22:00:38 UTC (rev
17382)
+++ trunk/plexus-cipher/debian/copyright2013-10-28 12:54:44 UTC (rev
17383)
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Plexus Cipher Component
Upstream-Contact: Sonatype
-Source: http://www.sonatype.org/
+Source: http://www.sonatype.org
Files: *
Copyright: 2008, Sonatype Inc.
Modified: trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install
===
--- trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install
2013-10-27 22:00:38 UTC (rev 17382)
+++ trunk/plexus-cipher/debian/libplexus-cipher-java-doc.install
2013-10-28 12:54:44 UTC (rev 17383)
@@ -1,2 +1,2 @@
+
target/apidocs/* usr/share/doc/libplexus-cipher-java/api
-
Modified: trunk/plexus-cipher/debian/libplexus-cipher-java.poms
===
--- trunk/plexus-cipher/debian/libplexus-cipher-java.poms 2013-10-27
22:00:38 UTC (rev 17382)
+++ trunk/plexus-cipher/debian/libplexus-cipher-java.poms 2013-10-28
12:54:44 UTC (rev 17383)
@@ -2,7 +2,9 @@
# Format of this file is:
# [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 tag from the POM
# --package=: an alternative package to use when installing this POM
# and its artifact
@@ -11,16 +13,16 @@
# --keep-elements=: a list of XML elements to keep in the POM
# during a clean operation with mh_cleanpom
[gradle] branch master updated (17d4130 -> 089dee3)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository gradle. from 17d4130 Merge tag 'upstream/1.5' new 089dee3 Added a link to jatl.jar in /usr/share/gradle/lib/plugins/ The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/libgradle-plugins-java.links |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[gradle] 01/01: Added a link to jatl.jar in /usr/share/gradle/lib/plugins/
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle. commit 089dee37e4602c3720b1b5b9c064a56c2791c265 Author: Emmanuel Bourg Date: Mon Oct 28 18:33:55 2013 +0100 Added a link to jatl.jar in /usr/share/gradle/lib/plugins/ --- debian/libgradle-plugins-java.links |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/libgradle-plugins-java.links b/debian/libgradle-plugins-java.links index f1a1785..ed7bd33 100644 --- a/debian/libgradle-plugins-java.links +++ b/debian/libgradle-plugins-java.links @@ -8,7 +8,7 @@ usr/share/java/CodeNarc.jar usr/share/gradle/lib/plugins/Co usr/share/java/GMetrics.jar usr/share/gradle/lib/plugins/GMetrics.jar # gradle-js -usr/share/java/js.jar usr/share/gradle/lib/plugins/js.jar +usr/share/java/js.jar usr/share/gradle/lib/plugins/js.jar usr/share/java/gson.jar usr/share/gradle/lib/plugins/gson.jar # gradle-jetty @@ -31,4 +31,7 @@ usr/share/java/commons-cli.jar usr/share/gradle/lib/plugins/co # gradle-signing usr/share/java/bcpg.jar usr/share/gradle/lib/plugins/bcpg.jar -usr/share/java/bcprov.jar usr/share/gradle/lib/plugins/bcprov.jar \ No newline at end of file +usr/share/java/bcprov.jar usr/share/gradle/lib/plugins/bcprov.jar + +# gradle-reporting +usr/share/java/jatl.jar usr/share/gradle/lib/plugins/jatl.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-containers1.5] 02/04: Updated Standards-Version to 3.9.5 (no changes)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-containers1.5. commit e0ac4cd0be5b4bdb86896f7c3cb28ffd050b374e Author: Emmanuel Bourg Date: Tue Oct 29 11:07:30 2013 +0100 Updated Standards-Version to 3.9.5 (no changes) --- debian/changelog |1 + debian/control |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dee360e..9f2897f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ plexus-containers1.5 (1.5.5-6) UNRELEASED; urgency=low * Team upload. * Added a patch to fix the source incompatibility with plexus-classworlds 2.5 (Closes: #728171) + * Updated Standards-Version to 3.9.5 (no changes) -- Emmanuel Bourg Tue, 29 Oct 2013 10:52:31 +0100 diff --git a/debian/control b/debian/control index 06c150b..6ddc35e 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends-Indep: ant, libxbean-java, maven-ant-helper, maven-repo-helper -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-containers1.5.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/plexus-containers1.5.git Homepage: http://plexus.codehaus.org/plexus-containers/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-containers1.5] branch master updated (1e0abd5 -> ffe8150)
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a change to branch master in repository plexus-containers1.5. from 1e0abd5 Replaced the dependency on Google Collections by Guava Use canonical URLs for the Vcs-* fields debian/rules: Improved the clean target to allow rebuilds debian/copyright: Updated the Format URI to 1.0 new a148881 Fixed the source incompatibility with plexus-classworlds 2.5 (Closes: #728171) new e0ac4cd Updated Standards-Version to 3.9.5 (no changes) new b501c59 Build depend on debhelper >= 9 new ffe8150 Upload to unstable The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 10 + debian/compat |2 +- debian/control|4 +- debian/patches/01-classworlds-compatibility.patch | 43 + debian/patches/series |1 + 5 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 debian/patches/01-classworlds-compatibility.patch create mode 100644 debian/patches/series -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-containers1.5] 03/04: Build depend on debhelper >= 9
This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-containers1.5. commit b501c593907f601e0d4df560b1d08e316f537446 Author: Emmanuel Bourg Date: Tue Oct 29 11:08:20 2013 +0100 Build depend on debhelper >= 9 --- debian/changelog |1 + debian/compat|2 +- debian/control |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f2897f..5906e43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ plexus-containers1.5 (1.5.5-6) UNRELEASED; urgency=low * Added a patch to fix the source incompatibility with plexus-classworlds 2.5 (Closes: #728171) * Updated Standards-Version to 3.9.5 (no changes) + * Build depend on debhelper >= 9 -- Emmanuel Bourg Tue, 29 Oct 2013 10:52:31 +0100 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 6ddc35e..4b4fb6c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers Uploaders: Damien Raude-Morvan -Build-Depends: cdbs, debhelper (>= 7), default-jdk +Build-Depends: cdbs, debhelper (>= 9), default-jdk Build-Depends-Indep: ant, ant-optional, junit, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-containers1.5.git ___ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[plexus-containers1.5] 01/04: Fixed the source incompatibility with plexus-classworlds 2.5 (Closes: #728171)
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-containers1.5.
commit a148881738d450de0b19a591529578e802c6adaa
Author: Emmanuel Bourg
Date: Tue Oct 29 11:06:13 2013 +0100
Fixed the source incompatibility with plexus-classworlds 2.5 (Closes:
#728171)
---
debian/changelog |8
debian/patches/01-classworlds-compatibility.patch | 43 +
debian/patches/series |1 +
3 files changed, 52 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index e0f749f..dee360e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+plexus-containers1.5 (1.5.5-6) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Added a patch to fix the source incompatibility with plexus-classworlds 2.5
+(Closes: #728171)
+
+ -- Emmanuel Bourg Tue, 29 Oct 2013 10:52:31 +0100
+
plexus-containers1.5 (1.5.5-5) unstable; urgency=low
* Team upload.
diff --git a/debian/patches/01-classworlds-compatibility.patch
b/debian/patches/01-classworlds-compatibility.patch
new file mode 100644
index 000..2ba3c75
--- /dev/null
+++ b/debian/patches/01-classworlds-compatibility.patch
@@ -0,0 +1,43 @@
+Description: Maintains the source compatibility with the latest version of
plexus-classworlds
+Author: Emmanuel Bourg
+Forwarded: not-needed
+---
a/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
b/plexus-component-metadata/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+@@ -189,7 +189,7 @@
+ {
+ try
+ {
+-roleClass = realm.loadClass( role );
++roleClass = (Class) realm.loadClass( role );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
+@@ -299,7 +299,7 @@
+ {
+ try
+ {
+-implementationClass = realm.loadClass( implementation );
++implementationClass = (Class) realm.loadClass(
implementation );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
+---
a/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
b/plexus-container-default/src/main/java/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+@@ -189,7 +189,7 @@
+ {
+ try
+ {
+-roleClass = getRealm().loadClass( getRole() );
++roleClass = (Class) getRealm().loadClass( getRole() );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
+@@ -299,7 +299,7 @@
+ {
+ try
+ {
+-implementationClass = getRealm().loadClass(
getImplementation() );
++implementationClass = (Class) getRealm().loadClass(
getImplementation() );
+ Thread.currentThread();
+ }
+ catch ( Throwable ignored )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..ea4e502
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-classworlds-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/plexus-containers1.5.git
___
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
