[pkg-java] r7586 - trunk/libplexus-utils/debian

Sun Dec 7 21:21:52 UTC 2008

Author: twerner
Date: 2008-12-07 21:21:52 +0000 (Sun, 07 Dec 2008)
New Revision: 7586

Added:
   trunk/libplexus-utils/debian/orig-tar.sh
Modified:
   trunk/libplexus-utils/debian/changelog
   trunk/libplexus-utils/debian/control
   trunk/libplexus-utils/debian/rules
   trunk/libplexus-utils/debian/watch
Log:
UNRELEASED
* New upstream release
* Update watch file.
* Added myself to Uploaders.
* Bump up Standards-Version: 3.8.0 (no changes).

Modified: trunk/libplexus-utils/debian/changelog
===================================================================

--- trunk/libplexus-utils/debian/changelog	2008-12-07 20:51:30 UTC (rev 7585)
+++ trunk/libplexus-utils/debian/changelog	2008-12-07 21:21:52 UTC (rev 7586)
@@ -1,10 +1,18 @@
-libplexus-utils (1:1.4.8-2) UNRELEASED; urgency=low
+libplexus-utils (1:1.5.6-1) experimental; urgency=low
 
+  UNRELEASED
+  [ Michael Koch ]
   * Added watch file.
   * Added myself to Uploaders.
 
- -- Michael Koch <konqueror at gmx.de>  Sat, 19 Apr 2008 09:41:37 +0200
+  [ Torsten Werner ]
+  * New upstream release
+  * Update watch file.
+  * Added myself to Uploaders.
+  * Bump up Standards-Version: 3.8.0 (no changes).
 
+ -- Torsten Werner <twerner at debian.org>  Sun, 07 Dec 2008 22:04:27 +0100
+
 libplexus-utils (1:1.4.8-1) unstable; urgency=low
 
   * New upstream version (Closes: #454095).

Modified: trunk/libplexus-utils/debian/control
===================================================================
--- trunk/libplexus-utils/debian/control	2008-12-07 20:51:30 UTC (rev 7585)
+++ trunk/libplexus-utils/debian/control	2008-12-07 21:21:52 UTC (rev 7586)
@@ -2,10 +2,11 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstøl <trygvis at codehaus.org>, Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java
+Uploaders: Trygve Laugstøl <trygvis at codehaus.org>, Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
+Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), libxalan2-java,
+ libplexus-interpolation-java
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://plexus.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libplexus-utils
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libplexus-utils

Added: trunk/libplexus-utils/debian/orig-tar.sh
===================================================================
--- trunk/libplexus-utils/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libplexus-utils/debian/orig-tar.sh	2008-12-07 21:21:52 UTC (rev 7586)
@@ -0,0 +1,16 @@
+#!/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


Property changes on: trunk/libplexus-utils/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/libplexus-utils/debian/rules
===================================================================
--- trunk/libplexus-utils/debian/rules	2008-12-07 20:51:30 UTC (rev 7585)
+++ trunk/libplexus-utils/debian/rules	2008-12-07 21:21:52 UTC (rev 7586)
@@ -7,24 +7,17 @@
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/^[0-9]*://')
 JAVA_HOME            := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2
+DEB_JARS             := plexus-interpolation xalan2
 DEB_ANT_BUILD_TARGET := package
-BUILD_FILE           := ./debian/build.xml
-DEB_ANT_INVOKE       := ant -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
+DEB_ANT_BUILDFILE    := ./debian/build.xml
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/doc/api
 SVN                  := http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-$(VERSION)
 #REVISION             := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
 
 
 get-orig-source:
-	echo "Getting sources $(REVISION) from $(SVN)"
-	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q $(SVN) $(PACKAGE) && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
-	rm -rf orig_tmp
-	
+	uscan --force-download
 
 binary-post-install/libplexus-utils-java::
 	dh_install -plibplexus-utils-java build/plexus-utils-$(VERSION).jar usr/share/java

Modified: trunk/libplexus-utils/debian/watch
===================================================================
--- trunk/libplexus-utils/debian/watch	2008-12-07 20:51:30 UTC (rev 7585)
+++ trunk/libplexus-utils/debian/watch	2008-12-07 21:21:52 UTC (rev 7586)
@@ -1,2 +1,3 @@
 version=3
-http://repository.codehaus.org/org/codehaus/plexus/plexus-utils/ (\d.*)/
+http://svn.codehaus.org/plexus/plexus-utils/tags/ plexus-utils-(.*)/ \
+  debian debian/orig-tar.sh


