[pkg-java] r12473 - trunk/oscache/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-21 08:05:19 +0000 (Fri, 21 May 2010)
New Revision: 12473

Modified:
   trunk/oscache/debian/changelog
   trunk/oscache/debian/control
   trunk/oscache/debian/orig-tar.sh
   trunk/oscache/debian/rules
   trunk/oscache/debian/watch
Log:
* Create orig tarball from SVN tag.
* Add POM file.

Modified: trunk/oscache/debian/changelog
===================================================================
--- trunk/oscache/debian/changelog	2010-05-21 08:00:58 UTC (rev 12472)
+++ trunk/oscache/debian/changelog	2010-05-21 08:05:19 UTC (rev 12473)
@@ -1,14 +1,14 @@
-oscache (2.4.1+dak1-3) UNRELEASED; urgency=low
+oscache (2.4.1+ds1-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   [ Varun Hiremath ]
   * Set java source to 1.4 in d/ant.properties instead of d/rules
 
   [ Torsten Werner ]
   * Remove Kalle from uploaders list.
+  * Create orig tarball from SVN tag.
+  * Add POM file.
 
- -- Torsten Werner <twerner at debian.org>  Sat, 08 May 2010 00:23:48 +0200
+ -- Torsten Werner <twerner at debian.org>  Fri, 21 May 2010 10:02:53 +0200
 
 oscache (2.4.1+dak1-2) unstable; urgency=low
 

Modified: trunk/oscache/debian/control
===================================================================
--- trunk/oscache/debian/control	2010-05-21 08:00:58 UTC (rev 12472)
+++ trunk/oscache/debian/control	2010-05-21 08:05:19 UTC (rev 12473)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 7)
+Build-Depends: cdbs, debhelper (>= 7), maven-repo-helper
 Build-Depends-Indep: ant, default-jdk, libjgroups-java,
  glassfish-javaee, libcommons-logging-java, libservlet2.4-java,
  libhibernate3-java

Modified: trunk/oscache/debian/orig-tar.sh
===================================================================
--- trunk/oscache/debian/orig-tar.sh	2010-05-21 08:00:58 UTC (rev 12472)
+++ trunk/oscache/debian/orig-tar.sh	2010-05-21 08:05:19 UTC (rev 12473)
@@ -1,14 +1,15 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-TAR=oscache_$2.orig.tar.gz
+TAR=../oscache_$2+ds1.orig.tar.gz
 DIR=oscache-$2.orig
+SVN=http://svn.opensymphony.com/svn/oscache/tags
+TAG=$(echo "v$2" | sed "s,\.,_,g")
 
-# clean up the upstream tarball
-mkdir $DIR
-unzip -d $DIR $3
+svn export $SVN/$TAG $DIR
+rm -rf $DIR/trunk
 tar -c -z -f $TAR --exclude '*.jar' --exclude '*/docs/api/*' $DIR
-rm -rf $3 $DIR
+rm -rf ../$TAG $DIR
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Modified: trunk/oscache/debian/rules
===================================================================
--- trunk/oscache/debian/rules	2010-05-21 08:00:58 UTC (rev 12472)
+++ trunk/oscache/debian/rules	2010-05-21 08:05:19 UTC (rev 12473)
@@ -9,8 +9,8 @@
 DEB_JARS		:= commons-logging jgroups-all servlet-api jsp-api glassfish-javaee jgroups-all hibernate3
 
 install/liboscache-java::
-	install -m 644 -D oscache.jar $(DEB_DESTDIR)/usr/share/java/oscache-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/oscache-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/oscache.jar
+	mh_installpom -pliboscache-java pom.xml
+	mh_installjar -pliboscache-java pom.xml -l oscache.jar
 
 get-orig-source:
-	-uscan --upstream-version 0
+	uscan --force-download

Modified: trunk/oscache/debian/watch
===================================================================
--- trunk/oscache/debian/watch	2010-05-21 08:00:58 UTC (rev 12472)
+++ trunk/oscache/debian/watch	2010-05-21 08:05:19 UTC (rev 12473)
@@ -1,4 +1,5 @@
 version=3
-http://www.opensymphony.com/oscache/download.action .*/oscache-(.*)-full.zip \
+opts="uversionmangle=s/_/./g,dversionmangle=s/\+.*//" \
+  http://svn.opensymphony.com/svn/oscache/tags/ v(.*)/ \
   debian debian/orig-tar.sh