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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-01-01 16:06:52 +0000 (Tue, 01 Jan 2008)
New Revision: 5253

Added:
   trunk/ehcache/debian/docs
Modified:
   trunk/ehcache/debian/build.xml
   trunk/ehcache/debian/changelog
   trunk/ehcache/debian/control
   trunk/ehcache/debian/rules
Log:
* Build hibernate related classes because we have hibernate in Debian now.
* Install upstream's CHANGELOG.txt and RELEASE_NOTES.txt.

Modified: trunk/ehcache/debian/build.xml
===================================================================
--- trunk/ehcache/debian/build.xml	2008-01-01 15:53:46 UTC (rev 5252)
+++ trunk/ehcache/debian/build.xml	2008-01-01 16:06:52 UTC (rev 5253)
@@ -4,37 +4,21 @@
   <property name="target" value="${basedir}/target" />
   <property name="build" value="${target}/classes" />
 
-  <path id="compile.classpath">
-    <pathelement location="${java.class.path}" />
-  </path>
-
   <target name="clean">
+    <delete dir="${build}"/>
     <delete dir="${target}"/>
   </target>
 
   <target name="jar" depends="compile">
-    <jar basedir="${build}" jarfile="${target}/${ant.project.name}.jar">
-      <include name="**/*"/>
-    </jar> 
+    <jar basedir="${build}" jarfile="${target}/${ant.project.name}.jar"/>
   </target>
 
-  <target name="compile" depends="init" unless="compile-with-hibernate">
-    <javac destdir="${build}" srcdir=".">
-      <exclude name="**/hibernate/**" />
-      <classpath refid="compile.classpath" />
-    </javac>    
+  <target name="compile" depends="init">
+    <javac destdir="${build}" srcdir="."/>
   </target>
 
-  <target name="compile-with-hibernate" depends="init" if="hibernate.present">
-    <javac destdir="${build}" srcdir=".">
-      <classpath refid="compile.classpath" />
-    </javac>    
-  </target>
-
   <target name="init">
     <mkdir dir="${build}"/>
-    <available classname="org.hibernate.cache.CacheException"
-           property="hibernate.present"/>
   </target>
 
 </project>

Modified: trunk/ehcache/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog	2008-01-01 15:53:46 UTC (rev 5252)
+++ trunk/ehcache/debian/changelog	2008-01-01 16:06:52 UTC (rev 5253)
@@ -4,8 +4,10 @@
   * Add myself to Uploaders.
   * Update Homepage and Vcs headers in debian/control.
   * Set Standards-Version: 3.7.3.
+  * Build hibernate related classes because we have hibernate in Debian now.
+  * Install upstream's CHANGELOG.txt and RELEASE_NOTES.txt.
 
- -- Torsten Werner <twerner at debian.org>  Tue, 01 Jan 2008 16:51:09 +0100
+ -- Torsten Werner <twerner at debian.org>  Tue, 01 Jan 2008 17:01:28 +0100
 
 ehcache (1.4.0~beta-1) unstable; urgency=low
 

Modified: trunk/ehcache/debian/control
===================================================================
--- trunk/ehcache/debian/control	2008-01-01 15:53:46 UTC (rev 5252)
+++ trunk/ehcache/debian/control	2008-01-01 16:06:52 UTC (rev 5253)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant, libcommons-logging-java, libcommons-collections3-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
+Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant, libcommons-logging-java, libcommons-collections3-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java, libhibernate3-java
 Standards-Version: 3.7.3
 Homepage: http://ehcache.sourceforge.net/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/ehcache

Added: trunk/ehcache/debian/docs
===================================================================
--- trunk/ehcache/debian/docs	                        (rev 0)
+++ trunk/ehcache/debian/docs	2008-01-01 16:06:52 UTC (rev 5253)
@@ -0,0 +1 @@
+RELEASE_NOTES.txt

Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules	2008-01-01 15:53:46 UTC (rev 5252)
+++ trunk/ehcache/debian/rules	2008-01-01 16:06:52 UTC (rev 5253)
@@ -6,12 +6,13 @@
 
 JAVA_HOME := /usr/lib/jvm/java-gcj/
 
-DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent jsr107cache hibernate commons-collections3
+DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent jsr107cache hibernate3 commons-collections3
 # hibernate is needed if you wanna build net.sf.ehcache.hibernate.* package
 DEB_ANT_BUILD_TARGET := jar # javadocs
 DEB_ANT_BUILDFILE := debian/build.xml
+DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG.txt
 
-VERSION=1.4.0
+VERSION := 1.4.0
 
 install/libehcache-java::
 	install -D -m 644 target/ehcache.jar $(DEB_DESTDIR)/usr/share/java/ehcache-${VERSION}.jar