[wagon] 25/62: 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.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master-1.x
in repository wagon.

commit 980e242f630c8625a8893366e0856a423591a177
Author: Torsten Werner <twerner at debian.org>
Date:   Mon Aug 29 13:46:32 2011 +0000

    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.
---
 debian/changelog      | 13 +++++++++++--
 debian/orig-tar.sh    |  3 ++-
 debian/patches/series |  2 +-
 debian/rules          |  2 +-
 debian/watch          |  4 +++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9a0cac..6b8af80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-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
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index b83dd1a..7f87114 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index 57e11bf..a1fc321 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-use_debian_neko_and_xerces.patch
+#use_debian_neko_and_xerces.patch
diff --git a/debian/rules b/debian/rules
index a8536d6..fd7dce3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk
 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
diff --git a/debian/watch b/debian/watch
index a47aeeb..6fe35d1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon.git