[pkg-java] r6080 - trunk/libcodemodel-java/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-04-03 10:50:31 +0000 (Thu, 03 Apr 2008)
New Revision: 6080

Modified:
   trunk/libcodemodel-java/debian/changelog
   trunk/libcodemodel-java/debian/control
   trunk/libcodemodel-java/debian/copyright
   trunk/libcodemodel-java/debian/rules
Log:
* Switch to openjdk-6.
* Move package to main.
* Improve copyright file.

Modified: trunk/libcodemodel-java/debian/changelog
===================================================================
--- trunk/libcodemodel-java/debian/changelog	2008-04-03 10:27:09 UTC (rev 6079)
+++ trunk/libcodemodel-java/debian/changelog	2008-04-03 10:50:31 UTC (rev 6080)
@@ -1,3 +1,11 @@
+libcodemodel-java (2.0-2) UNRELEASED; urgency=low
+
+  * Switch to openjdk-6.
+  * Move package to main.
+  * Improve copyright file.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 03 Apr 2008 12:47:57 +0200
+
 libcodemodel-java (2.0-1) unstable; urgency=low
 
   * Initial release (Closes: #457492)

Modified: trunk/libcodemodel-java/debian/control
===================================================================
--- trunk/libcodemodel-java/debian/control	2008-04-03 10:27:09 UTC (rev 6079)
+++ trunk/libcodemodel-java/debian/control	2008-04-03 10:50:31 UTC (rev 6080)
@@ -1,10 +1,10 @@
 Source: libcodemodel-java
-Section: contrib/libs
+Section: libs
 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, sun-java5-jdk
+Build-Depends-Indep: ant, openjdk-6-jdk | sun-java5-jdk
 Standards-Version: 3.7.3
 Homepage: https://codemodel.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcodemodel-java
@@ -12,7 +12,7 @@
 
 Package: libcodemodel-java
 Architecture: all
-Depends: sun-java5-jre | java1-runtime | java2-runtime
+Depends: openjdk-6-jre-headless | sun-java5-jre | java1-runtime | java2-runtime
 Description: Java library for code generators
  CodeModel is a Java library for code generators; it provides a way to
  generate Java programs in a way much nicer than

Modified: trunk/libcodemodel-java/debian/copyright
===================================================================
--- trunk/libcodemodel-java/debian/copyright	2008-04-03 10:27:09 UTC (rev 6079)
+++ trunk/libcodemodel-java/debian/copyright	2008-04-03 10:50:31 UTC (rev 6080)
@@ -3,6 +3,8 @@
 
 It was downloaded from https://codemodel.dev.java.net/svn/codemodel/
 
+Copyright: © 2005-2008 Sun Microsystems
+
 Upstream Authors: 
     Bhakti Mehta
     Kohsuke Kawaguchi

Modified: trunk/libcodemodel-java/debian/rules
===================================================================
--- trunk/libcodemodel-java/debian/rules	2008-04-03 10:27:09 UTC (rev 6079)
+++ trunk/libcodemodel-java/debian/rules	2008-04-03 10:50:31 UTC (rev 6080)
@@ -3,9 +3,9 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-1.5.0-sun
-DEB_ANT_BUILD_TARGET	:= jar
-DEB_ANT_BUILDFILE	:= debian/build.xml
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-1.5.0-sun
+DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_BUILDFILE    := debian/build.xml
 
 ALL_JARS = $(wildcard *.jar)
 DEST_DIR = $(DEB_DESTDIR)/usr/share/java