[pkg-java] r6079 - trunk/javassist/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-04-03 10:27:09 +0000 (Thu, 03 Apr 2008)
New Revision: 6079

Modified:
   trunk/javassist/debian/changelog
   trunk/javassist/debian/control
   trunk/javassist/debian/rules
Log:
* Switch to openjdk-6.
* Move package to main.
* Add myself to Uploaders.

Modified: trunk/javassist/debian/changelog
===================================================================
--- trunk/javassist/debian/changelog	2008-04-03 09:56:04 UTC (rev 6078)
+++ trunk/javassist/debian/changelog	2008-04-03 10:27:09 UTC (rev 6079)
@@ -1,3 +1,11 @@
+javassist (3.7.GA-2) UNRELEASED; urgency=low
+
+  * Switch to openjdk-6.
+  * Move package to main.
+  * Add myself to Uploaders.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 03 Apr 2008 12:16:21 +0200
+
 javassist (3.7.GA-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/javassist/debian/control
===================================================================
--- trunk/javassist/debian/control	2008-04-03 09:56:04 UTC (rev 6078)
+++ trunk/javassist/debian/control	2008-04-03 10:27:09 UTC (rev 6079)
@@ -1,17 +1,17 @@
 Source: javassist
-Section: contrib/libs
+Section: 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>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Varun Hiremath <varun at debian.org>,
+ Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 6), cdbs
-Build-Depends-Indep: ant, sun-java6-jdk
+Build-Depends-Indep: ant, openjdk-6-jdk | sun-java6-jdk
 Standards-Version: 3.7.3
 Homepage: http://www.csg.is.titech.ac.jp/~chiba/javassist/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javassist
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/javassist
 
 Package: libjavassist-java
-Section: contrib/libs
 Architecture: all
 Depends: sun-java6-jre | java1-runtime | java2-runtime
 Description: library for editing bytecodes in Java
@@ -28,7 +28,7 @@
  other editors.
 
 Package: libjavassist-java-doc
-Section: contrib/doc
+Section: doc
 Architecture: all
 Suggests: libjavassist-java
 Description: library for editing bytecodes in Java

Modified: trunk/javassist/debian/rules
===================================================================
--- trunk/javassist/debian/rules	2008-04-03 09:56:04 UTC (rev 6078)
+++ trunk/javassist/debian/rules	2008-04-03 10:27:09 UTC (rev 6079)
@@ -4,8 +4,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME		:= /usr/lib/jvm/java-6-sun
-DEB_ANT_BUILD_TARGET	:= jar javadocs
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun
+DEB_ANT_BUILD_TARGET := jar javadocs
 
 clean::
 	$(RM) javassist-src.jar