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

[varun at alioth.debian.org]

Author: varun
Date: 2008-02-25 09:38:51 +0000 (Mon, 25 Feb 2008)
New Revision: 5883

Modified:
   trunk/ehcache/debian/README.Debian
   trunk/ehcache/debian/build.xml
   trunk/ehcache/debian/changelog
   trunk/ehcache/debian/control
   trunk/ehcache/debian/rules
Log:
* Disable hibernate support and remove libhibernate3-java from
  Build-Depends-Indep, because libhibernate3-java is in contrib and
  depending on it would force ehcache and many other rdepends to be
  moved to contrib (Closes: #467312)
* Update README.Debian to reflect the changes

Modified: trunk/ehcache/debian/README.Debian
===================================================================
--- trunk/ehcache/debian/README.Debian	2008-02-25 05:40:39 UTC (rev 5882)
+++ trunk/ehcache/debian/README.Debian	2008-02-25 09:38:51 UTC (rev 5883)
@@ -1,18 +1,13 @@
 ehcache
 -------
 
-ehcache is build without Hibernate support at the moment because
-Hibernate is not yet in Debian. Anyway, we'll have a bootstrap problem
-because Hibernate needs ehcache!
+ehcache is built without hibernate support at the moment because
+hibernate package is in contrib and depending on it would force
+ehcache and many other reverse dependencies to be moved to contrib.
 
-At the moment, I solve it with to ant targets, one that builds ehcache
-without hibernate if org.hibernate.cache.CacheException is not present
-and one that builds every classes if the hibernate class is present. So
-building ehcahce, then building hibernate, then rebuilding ehcache
-should do the trick...
+If you want to build ehcache with hibernate support please install
+libhibernate3-java package from debian contrib and include hibernate3
+in DEB_JARS in debian/rules (read the instructions given there) and
+rebuild the package.
 
-Any comment welcome via bug reports.
-
-Thanks
-
- -- Arnaud Vandyck <avdyk at debian.org>, Mon, 16 Jul 2007 12:16:03 +0200
+ -- Varun Hiremath <varun at debian.org>, Mon, 25 Feb 2008 15:24:42 +0530

Modified: trunk/ehcache/debian/build.xml
===================================================================
--- trunk/ehcache/debian/build.xml	2008-02-25 05:40:39 UTC (rev 5882)
+++ trunk/ehcache/debian/build.xml	2008-02-25 09:38:51 UTC (rev 5883)
@@ -9,16 +9,21 @@
     <delete dir="${target}"/>
   </target>
 
-  <target name="jar" depends="compile">
-    <jar basedir="${build}" jarfile="${target}/${ant.project.name}.jar"/>
+  <target name="init">
+    <mkdir dir="${build}"/>
+    <available classname="org.hibernate.cache.CacheException"
+           property="hibernate.present"/>
   </target>
 
-  <target name="compile" depends="init">
+  <target name="compile" depends="init" unless="hibernate.present">
+    <javac destdir="${build}" srcdir="." excludes="**/hibernate/**"/>
+  </target>
+
+  <target name="compile-with-hibernate" depends="init" if="hibernate.present">
     <javac destdir="${build}" srcdir="."/>
   </target>
 
-  <target name="init">
-    <mkdir dir="${build}"/>
+  <target name="jar" depends="compile, compile-with-hibernate">
+    <jar basedir="${build}" jarfile="${target}/${ant.project.name}.jar"/>
   </target>
-
 </project>

Modified: trunk/ehcache/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog	2008-02-25 05:40:39 UTC (rev 5882)
+++ trunk/ehcache/debian/changelog	2008-02-25 09:38:51 UTC (rev 5883)
@@ -1,7 +1,10 @@
 ehcache (1.4.1-2) UNRELEASED; urgency=low
 
-  * Move the package to contrib because libhibernate3-java is in contrib
-    (Closes: #467312)
+  * Disable hibernate support and remove libhibernate3-java from
+    Build-Depends-Indep, because libhibernate3-java is in contrib and
+    depending on it would force ehcache and many other rdepends to be
+    moved to contrib (Closes: #467312)
+  * Update README.Debian to reflect the changes
 
  -- Varun Hiremath <varun at debian.org>  Thu, 21 Feb 2008 16:48:33 +0530
 

Modified: trunk/ehcache/debian/control
===================================================================
--- trunk/ehcache/debian/control	2008-02-25 05:40:39 UTC (rev 5882)
+++ trunk/ehcache/debian/control	2008-02-25 09:38:51 UTC (rev 5883)
@@ -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 <varun at debian.org>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 6), 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, libhibernate3-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
 Standards-Version: 3.7.3
 Homepage: http://ehcache.sourceforge.net/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/ehcache

Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules	2008-02-25 05:40:39 UTC (rev 5882)
+++ trunk/ehcache/debian/rules	2008-02-25 09:38:51 UTC (rev 5883)
@@ -5,11 +5,11 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/java-gcj/
-
-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_BUILDFILE := debian/build.xml
 DEB_ANT_BUILD_TARGET := jar # javadocs
-DEB_ANT_BUILDFILE := debian/build.xml
+# install libhibernate3-java package from debian contrib and include
+# hibernate3 in DEB_JARS to build net.sf.ehcache.hibernate.* classes
+DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent jsr107cache commons-collections3 # hibernate3
 DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG.txt
 
 install/libehcache-java::