[pkg-java] r12090 - in trunk/oscache/debian: . source

[Varun Hiremath]

Author: varun
Date: 2010-04-11 05:59:11 +0000 (Sun, 11 Apr 2010)
New Revision: 12090

Added:
   trunk/oscache/debian/source/
   trunk/oscache/debian/source/format
Modified:
   trunk/oscache/debian/changelog
   trunk/oscache/debian/compat
   trunk/oscache/debian/control
   trunk/oscache/debian/rules
Log:
* Update my email address
* Bump Standards-Version to 3.8.4
* Change Section to java
* Switch to default-jdk
* Switch to source format 3.0
* Set source version to 1.4 in debian/rules

Modified: trunk/oscache/debian/changelog
===================================================================
--- trunk/oscache/debian/changelog	2010-04-11 05:52:39 UTC (rev 12089)
+++ trunk/oscache/debian/changelog	2010-04-11 05:59:11 UTC (rev 12090)
@@ -1,3 +1,14 @@
+oscache (2.4.1+dak1-2) unstable; urgency=low
+
+  * Update my email address
+  * Bump Standards-Version to 3.8.4
+  * Change Section to java
+  * Switch to default-jdk
+  * Switch to source format 3.0
+  * Set source version to 1.4 in debian/rules
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 11 Apr 2010 01:55:34 -0400
+
 oscache (2.4.1+dak1-1) unstable; urgency=low
 
   * Move package to main.

Modified: trunk/oscache/debian/compat
===================================================================
--- trunk/oscache/debian/compat	2010-04-11 05:52:39 UTC (rev 12089)
+++ trunk/oscache/debian/compat	2010-04-11 05:59:11 UTC (rev 12090)
@@ -1 +1 @@
-5
+7

Modified: trunk/oscache/debian/control
===================================================================
--- trunk/oscache/debian/control	2010-04-11 05:52:39 UTC (rev 12089)
+++ trunk/oscache/debian/control	2010-04-11 05:59:11 UTC (rev 12090)
@@ -1,21 +1,21 @@
 Source: oscache
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Kalle Kivimaa <killer at debian.org>,
- Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, java-gcj-compat-dev, libjgroups-java,
+ Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
+Build-Depends: cdbs, debhelper (>= 7)
+Build-Depends-Indep: ant, default-jdk, libjgroups-java,
  glassfish-javaee, libcommons-logging-java, libservlet2.4-java,
  libhibernate3-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 Homepage: http://www.opensymphony.com/oscache/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/oscache
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/oscache
 
 Package: liboscache-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java2-runtime-headless
 Description: caching solution for java server pages (JSP)
  OSCache is a caching solution that includes a JSP tag library and set
  of classes to perform fine grained dynamic caching of JSP content,

Modified: trunk/oscache/debian/rules
===================================================================
--- trunk/oscache/debian/rules	2010-04-11 05:52:39 UTC (rev 12089)
+++ trunk/oscache/debian/rules	2010-04-11 05:59:11 UTC (rev 12090)
@@ -3,10 +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		:= commons-logging jgroups-all servlet-api jsp-api glassfish-javaee jgroups-all hibernate3
+ANT_OPTS	        := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
 
 install/liboscache-java::
 	install -m 644 -D oscache.jar $(DEB_DESTDIR)/usr/share/java/oscache-$(DEB_UPSTREAM_VERSION).jar

Added: trunk/oscache/debian/source/format
===================================================================
--- trunk/oscache/debian/source/format	                        (rev 0)
+++ trunk/oscache/debian/source/format	2010-04-11 05:59:11 UTC (rev 12090)
@@ -0,0 +1 @@
+3.0 (quilt)