[pkg-java] r12411 - trunk/ehcache/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-14 19:32:37 +0000 (Fri, 14 May 2010)
New Revision: 12411

Removed:
   trunk/ehcache/debian/docs
Modified:
   trunk/ehcache/debian/build.xml
   trunk/ehcache/debian/changelog
   trunk/ehcache/debian/control
   trunk/ehcache/debian/orig-tar.sh
   trunk/ehcache/debian/rules
   trunk/ehcache/debian/watch
Log:
* New upstream release
* Export SVN tree instead of tarball as it contains the build system.
* Install POM file using maven-repo-helper.

Modified: trunk/ehcache/debian/build.xml
===================================================================
--- trunk/ehcache/debian/build.xml	2010-05-14 19:10:12 UTC (rev 12410)
+++ trunk/ehcache/debian/build.xml	2010-05-14 19:32:37 UTC (rev 12411)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project basedir=".." name="ehcache" default="jar">
+<project basedir="../core" name="ehcache" default="jar">
 
   <property name="target" value="${basedir}/target" />
   <property name="build" value="${target}/classes" />
@@ -14,7 +14,7 @@
   </target>
 
   <target name="compile" depends="init">
-    <javac destdir="${build}" srcdir="."/>
+    <javac destdir="${build}" srcdir="src/main/java"/>
   </target>
 
   <target name="init">

Modified: trunk/ehcache/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog	2010-05-14 19:10:12 UTC (rev 12410)
+++ trunk/ehcache/debian/changelog	2010-05-14 19:32:37 UTC (rev 12411)
@@ -1,10 +1,12 @@
-ehcache (1.5.0+dak1-4) unstable; urgency=low
+ehcache (1.6.2-1) unstable; urgency=low
 
   * UNRELEASED
+  * New upstream release
+  * Export SVN tree instead of tarball as it contains the build system.
   * Switch to servlet-api-2.5.
-  * Download ehcache-core in debian/watch.
+  * Install POM file using maven-repo-helper.
 
- -- Torsten Werner <twerner at debian.org>  Wed, 12 May 2010 14:26:47 +0200
+ -- Torsten Werner <twerner at debian.org>  Fri, 14 May 2010 21:30:20 +0200
 
 ehcache (1.5.0+dak1-3) unstable; urgency=low
 

Modified: trunk/ehcache/debian/control
===================================================================
--- trunk/ehcache/debian/control	2010-05-14 19:10:12 UTC (rev 12410)
+++ trunk/ehcache/debian/control	2010-05-14 19:32:37 UTC (rev 12411)
@@ -5,7 +5,7 @@
 Uploaders: Varun Hiremath <varun at debian.org>, 
 	   Kumar Appaiah <akumar at debian.org>, 
 	   Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 6), cdbs
+Build-Depends: debhelper (>= 6), cdbs, maven-repo-helper
 Build-Depends-Indep: default-jdk, ant,
  libcommons-logging-java, libcommons-collections3-java,
  libservlet2.5-java, libbackport-util-concurrent-java,

Deleted: trunk/ehcache/debian/docs
===================================================================
--- trunk/ehcache/debian/docs	2010-05-14 19:10:12 UTC (rev 12410)
+++ trunk/ehcache/debian/docs	2010-05-14 19:32:37 UTC (rev 12411)
@@ -1 +0,0 @@
-RELEASE_NOTES.txt

Modified: trunk/ehcache/debian/orig-tar.sh
===================================================================
--- trunk/ehcache/debian/orig-tar.sh	2010-05-14 19:10:12 UTC (rev 12410)
+++ trunk/ehcache/debian/orig-tar.sh	2010-05-14 19:32:37 UTC (rev 12411)
@@ -2,19 +2,18 @@
 
 # called by uscan with '--upstream-version' <version> <file>
 DIR=ehcache-$2.orig
+TAR=../ehcache_$2.orig.tar.gz
 
 # clean up the upstream tarball
-tar zxf $3
-mv ehcache-* $DIR
-(cd $DIR; jar xf ehcache-*-sources.jar)
-GZIP=--best tar czf $3 --exclude '*.jar' --exclude '*.zip' $DIR
-rm -rf $DIR
+svn export http://svn.terracotta.org/svn/ehcache/tags/ehcache-core-$2/ $DIR
+# FIXME: check PDF and DOC files
+GZIP=--best tar czf $TAR --exclude '*.jar' --exclude '*.zip' $DIR
+rm -rf $DIR ../ehcache-core-$2
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
     . .svn/deb-layout
-    mv $3 $origDir
-    echo "moved $3 to $origDir"
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
 fi
 
-exit 0

Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules	2010-05-14 19:10:12 UTC (rev 12410)
+++ trunk/ehcache/debian/rules	2010-05-14 19:32:37 UTC (rev 12411)
@@ -9,11 +9,10 @@
 DEB_ANT_BUILD_TARGET := jar
 DEB_JARS := commons-logging servlet-api-2.5 backport-util-concurrent	\
 		jsr107cache hibernate3 commons-collections3 jgroups-all
-DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG.txt
 
 install/libehcache-java::
-	install -D -m 644 target/ehcache.jar $(DEB_DESTDIR)/usr/share/java/ehcache-${DEB_UPSTREAM_VERSION}.jar
-	dh_link -plibehcache-java usr/share/java/ehcache-${DEB_UPSTREAM_VERSION}.jar usr/share/java/ehcache.jar
+	mh_installpom -plibehcache-java core/pom.xml
+	mh_installjar -plibehcache-java -l core/pom.xml core/target/ehcache.jar
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: trunk/ehcache/debian/watch
===================================================================
--- trunk/ehcache/debian/watch	2010-05-14 19:10:12 UTC (rev 12410)
+++ trunk/ehcache/debian/watch	2010-05-14 19:32:37 UTC (rev 12411)
@@ -1,3 +1,4 @@
 version=3
 opts="uversionmangle=s/-/~/,dversionmangle=s/-/~/" \
-  http://sf.net/ehcache/ehcache-core-([\d.]+)-distribution\.tar\.gz debian debian/orig-tar.sh
+  http://svn.terracotta.org/svn/ehcache/tags/ ehcache-core-(.*)/ \
+  debian debian/orig-tar.sh