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

[varun at alioth.debian.org]

Author: varun
Date: 2008-02-25 18:30:42 +0000 (Mon, 25 Feb 2008)
New Revision: 5885

Removed:
   trunk/ehcache/debian/README.Debian
Modified:
   trunk/ehcache/debian/build.xml
   trunk/ehcache/debian/changelog
   trunk/ehcache/debian/control
   trunk/ehcache/debian/rules
Log:
* Revert old changes
* Move package to contrib as libloader-java no longer depends on ehcahe


Deleted: trunk/ehcache/debian/README.Debian
===================================================================
--- trunk/ehcache/debian/README.Debian	2008-02-25 12:39:01 UTC (rev 5884)
+++ trunk/ehcache/debian/README.Debian	2008-02-25 18:30:42 UTC (rev 5885)
@@ -1,13 +0,0 @@
-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.
-
-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.
-
- -- 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 12:39:01 UTC (rev 5884)
+++ trunk/ehcache/debian/build.xml	2008-02-25 18:30:42 UTC (rev 5885)
@@ -9,21 +9,16 @@
     <delete dir="${target}"/>
   </target>
 
-  <target name="init">
-    <mkdir dir="${build}"/>
-    <available classname="org.hibernate.cache.CacheException"
-           property="hibernate.present"/>
+  <target name="jar" depends="compile">
+    <jar basedir="${build}" jarfile="${target}/${ant.project.name}.jar"/>
   </target>
 
-  <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">
+  <target name="compile" depends="init">
     <javac destdir="${build}" srcdir="."/>
   </target>
 
-  <target name="jar" depends="compile, compile-with-hibernate">
-    <jar basedir="${build}" jarfile="${target}/${ant.project.name}.jar"/>
+  <target name="init">
+    <mkdir dir="${build}"/>
   </target>
+
 </project>

Modified: trunk/ehcache/debian/changelog
===================================================================
--- trunk/ehcache/debian/changelog	2008-02-25 12:39:01 UTC (rev 5884)
+++ trunk/ehcache/debian/changelog	2008-02-25 18:30:42 UTC (rev 5885)
@@ -1,12 +1,10 @@
-ehcache (1.4.1-2) UNRELEASED; urgency=low
+ehcache (1.4.1-2) unstable; urgency=low
 
-  * 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
+  * Move package to contrib because libhibernate3-java is in contrib
+    (Closes: #467312)
+  * Remove debian/README.Debian - not required
 
- -- Varun Hiremath <varun at debian.org>  Thu, 21 Feb 2008 16:48:33 +0530
+ -- Varun Hiremath <varun at debian.org>  Tue, 26 Feb 2008 00:15:24 +0530
 
 ehcache (1.4.1-1) unstable; urgency=low
 

Modified: trunk/ehcache/debian/control
===================================================================
--- trunk/ehcache/debian/control	2008-02-25 12:39:01 UTC (rev 5884)
+++ trunk/ehcache/debian/control	2008-02-25 18:30:42 UTC (rev 5885)
@@ -1,17 +1,16 @@
 Source: ehcache
-Section: libs
+Section: contrib/libs
 Priority: optional
 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
+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
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ehcache/
 
 Package: libehcache-java
-Section: libs
 Architecture: all
 Depends: java-gcj-compat | java2-runtime, libcommons-logging-java, libcommons-collections3-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
 Description: distributed cache library

Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules	2008-02-25 12:39:01 UTC (rev 5884)
+++ trunk/ehcache/debian/rules	2008-02-25 18:30:42 UTC (rev 5885)
@@ -6,10 +6,8 @@
 
 JAVA_HOME := /usr/lib/jvm/java-gcj/
 DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := jar # javadocs
-# 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_ANT_BUILD_TARGET := jar
+DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent jsr107cache hibernate3 commons-collections3
 DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG.txt
 
 install/libehcache-java::