[pkg-java] r4536 - trunk/libjboss-common-java/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-10-31 08:35:26 +0000 (Wed, 31 Oct 2007)
New Revision: 4536

Modified:
   trunk/libjboss-common-java/debian/build.xml
   trunk/libjboss-common-java/debian/control
   trunk/libjboss-common-java/debian/rules
Log:
* move package to main
* reduce warning noise
* enable optimization


Modified: trunk/libjboss-common-java/debian/build.xml
===================================================================
--- trunk/libjboss-common-java/debian/build.xml	2007-10-31 07:20:41 UTC (rev 4535)
+++ trunk/libjboss-common-java/debian/build.xml	2007-10-31 08:35:26 UTC (rev 4536)
@@ -27,7 +27,7 @@
 
     <mkdir dir="${class.dir}"/>
     <javac srcdir="all-sources" destdir="${class.dir}"
-    deprecation="true" debug="true" optimize="false"/>
+      debug="true" source="1.5"/>
 
     <jar jarfile="jboss-common.jar">
       <fileset dir="${class.dir}">
@@ -37,16 +37,16 @@
 
     <mkdir dir="${common-logging-log4j.dir}/${class.dir}"/>
     <javac srcdir="${common-logging-log4j.dir}/${source.dir}" destdir="common-logging-log4j/${class.dir}"
-    deprecation="true" debug="true" optimize="false" classpath="jboss-common.jar"/>
+      debug="true" classpath="jboss-common.jar" source="1.5"/>
     <mkdir dir="${common-logging-jdk.dir}/${class.dir}"/>
     <javac srcdir="${common-logging-jdk.dir}/${source.dir}" destdir="common-logging-jdk/${class.dir}"
-    deprecation="true" debug="true" optimize="false" classpath="jboss-common.jar"/>
+      debug="true" classpath="jboss-common.jar" source="1.5"/>
     <mkdir dir="${common-logging-spi.dir}/${class.dir}"/>
     <javac srcdir="${common-logging-spi.dir}/${source.dir}" destdir="common-logging-spi/${class.dir}"
-    deprecation="true" debug="true" optimize="false" classpath="jboss-common.jar"/>
+      debug="true" classpath="jboss-common.jar" source="1.5"/>
     <mkdir dir="${common-core.dir}/${class.dir}"/>
     <javac srcdir="${common-core.dir}/${source.dir}" destdir="common-core/${class.dir}"
-    deprecation="true" debug="true" optimize="false" classpath="jboss-common.jar"/>
+      debug="true" classpath="jboss-common.jar" source="1.5"/>
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">

Modified: trunk/libjboss-common-java/debian/control
===================================================================
--- trunk/libjboss-common-java/debian/control	2007-10-31 07:20:41 UTC (rev 4535)
+++ trunk/libjboss-common-java/debian/control	2007-10-31 08:35:26 UTC (rev 4536)
@@ -1,10 +1,11 @@
 Source: libjboss-common-java
-Section: contrib/libs
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
+Uploaders: Varun Hiremath <varunhiremath at gmail.com>,
+ Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, sun-java6-jdk, libslide-webdavclient-java,
+Build-Depends-Indep: ant, java-gcj-compat-dev, libslide-webdavclient-java,
  liblog4j1.2-java, libcommons-httpclient-java
 Standards-Version: 3.7.2
 Homepage: http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject
@@ -13,7 +14,8 @@
 
 Package: libjboss-common-core-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ java-gcj-compat | java1-runtime | java2-runtime
 Description: The JBoss Common Project
  The common module in JBoss Application Server has been promoted to a
  standalone project. The project itself has now been and broken up
@@ -23,7 +25,8 @@
 
 Package: libjboss-common-logging-spi-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ java-gcj-compat | java1-runtime | java2-runtime
 Description: The JBoss Common Project
  The common module in JBoss Application Server has been promoted to a
  standalone project. The project itself has now been and broken up
@@ -33,7 +36,8 @@
 
 Package: libjboss-common-logging-log4-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ java-gcj-compat | java1-runtime | java2-runtime
 Description: The JBoss Common Project
  The common module in JBoss Application Server has been promoted to a
  standalone project. The project itself has now been and broken up
@@ -43,7 +47,8 @@
 
 Package: libjboss-common-logging-jdk-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ java-gcj-compat | java1-runtime | java2-runtime
 Description: The JBoss Common Project
  The common module in JBoss Application Server has been promoted to a
  standalone project. The project itself has now been and broken up

Modified: trunk/libjboss-common-java/debian/rules
===================================================================
--- trunk/libjboss-common-java/debian/rules	2007-10-31 07:20:41 UTC (rev 4535)
+++ trunk/libjboss-common-java/debian/rules	2007-10-31 08:35:26 UTC (rev 4536)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-6-sun
+JAVA_HOME 		:= /usr/lib/jvm/java-gcj
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_JARS		:= log4j-1.2 commons-httpclient jakarta-slide-webdavlib