[pkg-java] r8880 - trunk/plexus-component-api/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-06 19:10:43 +0000 (Mon, 06 Jul 2009)
New Revision: 8880

Added:
   trunk/plexus-component-api/debian/orig-tar.sh
Modified:
   trunk/plexus-component-api/debian/changelog
   trunk/plexus-component-api/debian/rules
   trunk/plexus-component-api/debian/watch
Log:
* New version

Modified: trunk/plexus-component-api/debian/changelog
===================================================================
--- trunk/plexus-component-api/debian/changelog	2009-07-06 16:38:00 UTC (rev 8879)
+++ trunk/plexus-component-api/debian/changelog	2009-07-06 19:10:43 UTC (rev 8880)
@@ -1,6 +1,9 @@
-plexus-component-api (1.0+svn6316-2) unstable; urgency=low
+plexus-component-api (1.0.0~alpha22-1) unstable; urgency=low
 
   [Ludovic Claude]
+  * New upstream version (sort of), using the version stored in
+    the SVN tags rather than the trunk as it has disapeared 
+    upstream.
   * Change section to java, bump up Standards-Version to 3.8.1
   * Add the Maven POM to the package,
   * Add a Build-Depends-Indep dependency on maven-repo-helper

Added: trunk/plexus-component-api/debian/orig-tar.sh
===================================================================
--- trunk/plexus-component-api/debian/orig-tar.sh	                        (rev 0)
+++ trunk/plexus-component-api/debian/orig-tar.sh	2009-07-06 19:10:43 UTC (rev 8880)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# $2 = version
+
+TAR=../plexus-component-api_$2.orig.tar.gz
+DIR=plexus-component-api-$2
+TAG=$(echo plexus-containers-$2 | sed 's/~alpha/-alpha-/' | sed 's/1\.0\.0/1.0/')
+
+svn export http://svn.codehaus.org/plexus/plexus-containers/tags/$TAG/plexus-component-api/ $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/plexus-component-api/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/plexus-component-api/debian/rules
===================================================================
--- trunk/plexus-component-api/debian/rules	2009-07-06 16:38:00 UTC (rev 8879)
+++ trunk/plexus-component-api/debian/rules	2009-07-06 19:10:43 UTC (rev 8880)
@@ -13,18 +13,9 @@
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 #DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
 API_DOCS             := build/doc/api
-SVN                  := http://svn.codehaus.org/plexus/plexus-containers/trunk/plexus-component-api
-REVISION             := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
 
-
 get-orig-source:
-	echo "Getting revision $(REVISION) from $(SVN)"
-	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q -r $(REVISION) $(SVN) $(PACKAGE) && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
-	rm -rf orig_tmp
-	
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
 makebuilddir/lib$(PACKAGE)-java-doc::
 	echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install

Modified: trunk/plexus-component-api/debian/watch
===================================================================
--- trunk/plexus-component-api/debian/watch	2009-07-06 16:38:00 UTC (rev 8879)
+++ trunk/plexus-component-api/debian/watch	2009-07-06 19:10:43 UTC (rev 8880)
@@ -1,2 +1,4 @@
 version=3
-http://repository.codehaus.org/org/codehaus/plexus/plexus-component-api/ (\d.*)/
+opts="uversionmangle=s/1\.0-/1.0.0-/;s/-alpha-/~alpha/" \
+  http://svn.codehaus.org/plexus/plexus-containers/tags/ \
+  plexus-containers-(1\.0-alpha-2\d)/ debian debian/orig-tar.sh