[pkg-java] r12286 - trunk/libhibernate-entitymanager-java/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-03 19:35:50 +0000 (Mon, 03 May 2010)
New Revision: 12286

Modified:
   trunk/libhibernate-entitymanager-java/debian/changelog
   trunk/libhibernate-entitymanager-java/debian/control
   trunk/libhibernate-entitymanager-java/debian/rules
Log:
* Switch to default-jdk and default-jre-headless.
* Add missing Depends: ${misc:Depends}, libgeronimo-jta-1.0.1b-spec-java.
* Change Section: java.

Modified: trunk/libhibernate-entitymanager-java/debian/changelog
===================================================================
--- trunk/libhibernate-entitymanager-java/debian/changelog	2010-05-03 19:21:32 UTC (rev 12285)
+++ trunk/libhibernate-entitymanager-java/debian/changelog	2010-05-03 19:35:50 UTC (rev 12286)
@@ -2,8 +2,11 @@
 
   * Switch to source format 3.0.
   * Update Standards-Version: 3.8.4.
+  * Switch to default-jdk and default-jre-headless.
+  * Add missing Depends: ${misc:Depends}, libgeronimo-jta-1.0.1b-spec-java.
+  * Change Section: java.
 
- -- Torsten Werner <twerner at debian.org>  Mon, 03 May 2010 21:18:56 +0200
+ -- Torsten Werner <twerner at debian.org>  Mon, 03 May 2010 21:28:50 +0200
 
 libhibernate-entitymanager-java (3.4.0.GA+dak1-1ubuntu1) jaunty; urgency=low
 

Modified: trunk/libhibernate-entitymanager-java/debian/control
===================================================================
--- trunk/libhibernate-entitymanager-java/debian/control	2010-05-03 19:21:32 UTC (rev 12285)
+++ trunk/libhibernate-entitymanager-java/debian/control	2010-05-03 19:35:50 UTC (rev 12286)
@@ -1,14 +1,14 @@
 Source: libhibernate-entitymanager-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev, libdom4j-java,
+Build-Depends-Indep: ant, default-jdk, libdom4j-java,
  libcommons-logging-java, libjavassist-java, libhibernate3-java,
  libhibernate-commons-annotations-java, glassfish-toplink-essentials,
  libhibernate-annotations-java, libhibernate-validator-java,
- libjboss-common-java, libslf4j-java
+ libjboss-common-java, libslf4j-java, libgeronimo-jta-1.0.1b-spec-java
 Standards-Version: 3.8.4
 Homepage: http://entitymanager.hibernate.org
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libhibernate-entitymanager-java
@@ -16,7 +16,7 @@
 
 Package: libhibernate-entitymanager-java
 Architecture: all
-Depends: java-gcj-compat | java2-runtime
+Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
 Description: Hibernate EntityManager
  Hibernate EntityManager implements the programming interfaces and
  lifecycle rules as defined by the EJB3 persistence specification.

Modified: trunk/libhibernate-entitymanager-java/debian/rules
===================================================================
--- trunk/libhibernate-entitymanager-java/debian/rules	2010-05-03 19:21:32 UTC (rev 12285)
+++ trunk/libhibernate-entitymanager-java/debian/rules	2010-05-03 19:35:50 UTC (rev 12286)
@@ -3,11 +3,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME         := /usr/lib/jvm/java-gcj/
+JAVA_HOME         := /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE := debian/build.xml
 DEB_JARS          := commons-logging hibernate-commons-annotations hibernate3 \
                      glassfish-toplink-essentials hibernate-annotations       \
-		     hibernate-validator dom4j jboss-common javassist slf4j-api
+		     hibernate-validator dom4j jboss-common javassist         \
+		     slf4j-api geronimo-jta-1.0.1b-spec-1.1
 
 install/libhibernate-entitymanager-java::
 	install -m 644 -D hibernate-entitymanager.jar $(DEB_DESTDIR)/usr/share/java/hibernate-entitymanager-$(DEB_UPSTREAM_VERSION).jar