[pkg-java] r10939 - trunk/libjboss-cache2-java/debian

[Torsten Werner]

Author: twerner
Date: 2009-10-27 21:22:37 +0000 (Tue, 27 Oct 2009)
New Revision: 10939

Modified:
   trunk/libjboss-cache2-java/debian/build.xml
   trunk/libjboss-cache2-java/debian/changelog
   trunk/libjboss-cache2-java/debian/control
   trunk/libjboss-cache2-java/debian/rules
Log:
* Update java-gcj-compat-dev build-dep to default-jdk.
* Replace java-gcj-compat optional depend with default-jre-headless.
* Bump Standards Version to 3.8.3. (No changes needed).
* Switch to legacy package libjgroups2.6-java. (Closes: #549741)
* Change Section: java.

Modified: trunk/libjboss-cache2-java/debian/build.xml
===================================================================
--- trunk/libjboss-cache2-java/debian/build.xml	2009-10-27 21:19:32 UTC (rev 10938)
+++ trunk/libjboss-cache2-java/debian/build.xml	2009-10-27 21:22:37 UTC (rev 10939)
@@ -10,10 +10,7 @@
   <target name="compile">
     <mkdir dir="${class.dir}"/>
     <javac srcdir="${source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5" nowarn="true">
-      <!-- see https://jira.jboss.org/jira/browse/JBCACHE-1044 -->
-      <exclude name="org/jboss/cache/jmx/*.java"/>
-    </javac>
+      debug="true" source="1.5" nowarn="true"/>
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">

Modified: trunk/libjboss-cache2-java/debian/changelog
===================================================================
--- trunk/libjboss-cache2-java/debian/changelog	2009-10-27 21:19:32 UTC (rev 10938)
+++ trunk/libjboss-cache2-java/debian/changelog	2009-10-27 21:22:37 UTC (rev 10939)
@@ -1,14 +1,17 @@
 libjboss-cache2-java (2.2.2.GA-1) unstable; urgency=low
 
-  UNRELEASED
-    - still shows build errors in a file that is excluded:
-      src/org/jboss/cache/jmx/LegacyConfiguration.java WTF???
+  [ Barry deFreese ]
+  * Update java-gcj-compat-dev build-dep to default-jdk.
+  * Replace java-gcj-compat optional depend with default-jre-headless.
+  * Bump Standards Version to 3.8.3. (No changes needed).
+
+  [ Torsten Werner ]
   * new upstream release
   * Disable compiler warnings.
-  * Do not build src/org/jboss/cache/jmx/*.java because it uses an outdated
-    jgroups API.
+  * Switch to legacy package libjgroups2.6-java. (Closes: #549741)
+  * Change Section: java.
 
- -- Torsten Werner <twerner at debian.org>  Mon, 21 Sep 2009 08:07:22 +0200
+ -- Torsten Werner <twerner at debian.org>  Tue, 27 Oct 2009 22:15:06 +0100
 
 libjboss-cache2-java (2.2.1.GA-1) unstable; urgency=low
 

Modified: trunk/libjboss-cache2-java/debian/control
===================================================================
--- trunk/libjboss-cache2-java/debian/control	2009-10-27 21:19:32 UTC (rev 10938)
+++ trunk/libjboss-cache2-java/debian/control	2009-10-27 21:22:37 UTC (rev 10939)
@@ -1,15 +1,15 @@
 Source: libjboss-cache2-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev, libdb-je-java, bsh,
- libc3p0-java, ant-optional, libjgroups-java, libcommons-logging-java,
+Build-Depends-Indep: ant, default-jdk, libdb-je-java, bsh,
+ libc3p0-java, ant-optional, libjgroups2.6-java, libcommons-logging-java,
  libjboss-j2ee-java, libjdbm-java, libjboss-common-java, junit,
  libjboss-aop-java, libjboss-server-java, libjcip-annotations-java,
  libexml-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://labs.jboss.com/jbosscache/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-cache-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-cache-java
@@ -17,7 +17,7 @@
 Package: libjboss-cache2-java
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends},
- java-gcj-compat | java1-runtime | java2-runtime
+ default-jre-headless | java5-runtime | java2-runtime
 Description: cache frequently accessed Java objects
  JBoss Cache is a product designed to cache frequently accessed Java
  objects in order to dramatically improve the performance of e-business

Modified: trunk/libjboss-cache2-java/debian/rules
===================================================================
--- trunk/libjboss-cache2-java/debian/rules	2009-10-27 21:19:32 UTC (rev 10938)
+++ trunk/libjboss-cache2-java/debian/rules	2009-10-27 21:22:37 UTC (rev 10939)
@@ -3,11 +3,11 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 	     := /usr/lib/jvm/java-gcj
+JAVA_HOME 	     := /usr/lib/jvm/default-java
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_JARS	     := jcip jboss jboss-aop db-je bsh c3p0    \
-	ant-junit jgroups-core commons-logging jboss-j2ee jdbm \
+	ant-junit jgroups-core-2.6 commons-logging jboss-j2ee jdbm \
 	jboss-common junit exml
 
 install/libjboss-cache2-java::