[pkg-java] r14557 - in trunk/wagon/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2011-08-29 13:46:32 +0000 (Mon, 29 Aug 2011)
New Revision: 14557

Modified:
   trunk/wagon/debian/changelog
   trunk/wagon/debian/orig-tar.sh
   trunk/wagon/debian/patches/series
   trunk/wagon/debian/rules
   trunk/wagon/debian/watch
Log:
DOES NOT BUILD YET BECAUSE IT NEEDS JSOUP.
* New upstream release 1.0. We use 1.0.0 to fake a newer version compared to
  1.0-beta-*.
* Change debian/watch to allow download of version 1.0.
* Disable old patch that is not needed anymore.

Modified: trunk/wagon/debian/changelog
===================================================================
--- trunk/wagon/debian/changelog	2011-08-29 13:04:37 UTC (rev 14556)
+++ trunk/wagon/debian/changelog	2011-08-29 13:46:32 UTC (rev 14557)
@@ -1,11 +1,20 @@
-wagon (1.0-beta-6-3) UNRELEASED; urgency=low
+wagon (1.0.0-1) UNRELEASED; urgency=low
 
+  DOES NOT BUILD YET BECAUSE IT NEEDS JSOUP.
+
+  [ Michael Koch ]
   * Added myself to Uploaders.
   * Build-Depends on debhelper (>= 7).
   * Updated Standards-Version to 3.8.3.
 
- -- Michael Koch <konqueror at gmx.de>  Tue, 03 Nov 2009 23:16:32 +0100
+  [ Torsten Werner ]
+  * New upstream release 1.0. We use 1.0.0 to fake a newer version compared to
+    1.0-beta-*.
+  * Change debian/watch to allow download of version 1.0.
+  * Disable old patch that is not needed anymore.
 
+ -- Torsten Werner <twerner at debian.org>  Mon, 29 Aug 2011 15:31:12 +0200
+
 wagon (1.0-beta-6-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/wagon/debian/orig-tar.sh
===================================================================
--- trunk/wagon/debian/orig-tar.sh	2011-08-29 13:04:37 UTC (rev 14556)
+++ trunk/wagon/debian/orig-tar.sh	2011-08-29 13:46:32 UTC (rev 14557)
@@ -2,7 +2,8 @@
 
 TAR=../wagon_$2.orig.tar.gz
 DIR=wagon-$2
-TAG=wagon-$2
+# fix 1.0-final -> 1.0
+TAG=$(echo wagon-$2 | sed 's/wagon-1.0.0$/wagon-1.0/')
 
 svn export http://svn.apache.org/repos/asf/maven/wagon/tags/$TAG/ $DIR
 rm -rf $DIR/lib

Modified: trunk/wagon/debian/patches/series
===================================================================
--- trunk/wagon/debian/patches/series	2011-08-29 13:04:37 UTC (rev 14556)
+++ trunk/wagon/debian/patches/series	2011-08-29 13:46:32 UTC (rev 14557)
@@ -1 +1 @@
-use_debian_neko_and_xerces.patch
+#use_debian_neko_and_xerces.patch

Modified: trunk/wagon/debian/rules
===================================================================
--- trunk/wagon/debian/rules	2011-08-29 13:04:37 UTC (rev 14556)
+++ trunk/wagon/debian/rules	2011-08-29 13:46:32 UTC (rev 14557)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
+VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/^1\.0\.0/1.0/')
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps
 DEB_ANT_BUILD_TARGET := package javadoc

Modified: trunk/wagon/debian/watch
===================================================================
--- trunk/wagon/debian/watch	2011-08-29 13:04:37 UTC (rev 14556)
+++ trunk/wagon/debian/watch	2011-08-29 13:46:32 UTC (rev 14557)
@@ -1,4 +1,6 @@
 version=3
-http://svn.apache.org/repos/asf/maven/wagon/tags/ \
+
+opts=uversionmangle=s/^1\.0$/1.0.0/ \
+  http://svn.apache.org/repos/asf/maven/wagon/tags/ \
   wagon-(\d.*)/ debian debian/orig-tar.sh