[pkg-java] r12412 - branches/ehcache/2.x/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-14 19:36:13 +0000 (Fri, 14 May 2010)
New Revision: 12412

Removed:
   branches/ehcache/2.x/debian/docs
Modified:
   branches/ehcache/2.x/debian/build.xml
   branches/ehcache/2.x/debian/changelog
   branches/ehcache/2.x/debian/control
Log:
merge changes from trunk


Modified: branches/ehcache/2.x/debian/build.xml
===================================================================
--- branches/ehcache/2.x/debian/build.xml	2010-05-14 19:32:37 UTC (rev 12411)
+++ branches/ehcache/2.x/debian/build.xml	2010-05-14 19:36:13 UTC (rev 12412)
@@ -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: branches/ehcache/2.x/debian/changelog
===================================================================
--- branches/ehcache/2.x/debian/changelog	2010-05-14 19:32:37 UTC (rev 12411)
+++ branches/ehcache/2.x/debian/changelog	2010-05-14 19:36:13 UTC (rev 12412)
@@ -2,10 +2,20 @@
 
   * UNRELEASED
   * New upstream release
-  * Export SVN tree instead now as it contains the build system.
+  * Use Maven (= maven-debian-helper) to build the package.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 13 May 2010 12:17:24 +0200
+ -- Torsten Werner <twerner at debian.org>  Fri, 14 May 2010 21:34:56 +0200
 
+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.
+  * Install POM file using maven-repo-helper.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 14 May 2010 21:30:20 +0200
+
 ehcache (1.5.0+dak1-3) unstable; urgency=low
 
   * Update debian/watch to support the newer upstream versions.

Modified: branches/ehcache/2.x/debian/control
===================================================================
--- branches/ehcache/2.x/debian/control	2010-05-14 19:32:37 UTC (rev 12411)
+++ branches/ehcache/2.x/debian/control	2010-05-14 19:36:13 UTC (rev 12412)
@@ -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: branches/ehcache/2.x/debian/docs
===================================================================
--- branches/ehcache/2.x/debian/docs	2010-05-14 19:32:37 UTC (rev 12411)
+++ branches/ehcache/2.x/debian/docs	2010-05-14 19:36:13 UTC (rev 12412)
@@ -1 +0,0 @@
-RELEASE_NOTES.txt