[pkg-java] r4365 - trunk/aspectwerkz2/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-10-12 22:19:52 +0000 (Fri, 12 Oct 2007)
New Revision: 4365

Modified:
   trunk/aspectwerkz2/debian/control
   trunk/aspectwerkz2/debian/rules
Log:
* use sun-java6-jdk instead of java-gcj-compat-dev
* move package to contrib
* STILL BROKEN :-(


Modified: trunk/aspectwerkz2/debian/control
===================================================================
--- trunk/aspectwerkz2/debian/control	2007-10-12 21:17:56 UTC (rev 4364)
+++ trunk/aspectwerkz2/debian/control	2007-10-12 22:19:52 UTC (rev 4365)
@@ -1,9 +1,9 @@
 Source: aspectwerkz2
-Section: libs
+Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs,
+Build-Depends-Indep: debhelper (>= 4.2.30), sun-java6-jdk, ant, cdbs,
  libasm-java, junit, libdom4j-java, libjrexx-java, libjarjar-java,
  libtrove-java, libqdox-java, libjavassist-java, libconcurrent-java
 Standards-Version: 3.7.2
@@ -33,7 +33,7 @@
  for users familiar with proxies.
 
 Package: libaspectwerkz2-java-doc
-Section: doc
+Section: contrib/doc
 Architecture: all
 Suggests: libaspectwerkz1-java
 Description: Javadoc for libaspectwerkz1-java

Modified: trunk/aspectwerkz2/debian/rules
===================================================================
--- trunk/aspectwerkz2/debian/rules	2007-10-12 21:17:56 UTC (rev 4364)
+++ trunk/aspectwerkz2/debian/rules	2007-10-12 22:19:52 UTC (rev 4365)
@@ -7,7 +7,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj/
+JAVA_HOME := /usr/lib/jvm/java-6-sun
 ANT_HOME := /usr/share/ant
 
 DEB_JARS := asm asm-attrs asm-util junit dom4j jrexx jarjar trove qdox javassist concurrent