[pkg-java] r8073 - in trunk/libmx4j-java/debian: . patches

Mon Mar 9 22:57:06 UTC 2009

Author: drazzib-guest
Date: 2009-03-09 22:57:06 +0000 (Mon, 09 Mar 2009)
New Revision: 8073

Removed:
   trunk/libmx4j-java/debian/libmx4j-java-gcj.lintian-overrides
   trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
Modified:
   trunk/libmx4j-java/debian/README.Debian
   trunk/libmx4j-java/debian/changelog
   trunk/libmx4j-java/debian/compat
   trunk/libmx4j-java/debian/control
   trunk/libmx4j-java/debian/rules
Log:
[libmx4j-java]
* Bump debhelper compat level to 7
* Build Remote-IIOP: use openjdk-6-jdk as Java builder
  and update README.Debian and debian/rules


Modified: trunk/libmx4j-java/debian/README.Debian
===================================================================

--- trunk/libmx4j-java/debian/README.Debian	2009-03-09 20:24:07 UTC (rev 8072)
+++ trunk/libmx4j-java/debian/README.Debian	2009-03-09 22:57:06 UTC (rev 8073)
@@ -3,10 +3,6 @@
 
 Difference to binary upstream release:
 
-[Remote] 
-No support of RMI over IIOP protocol due to missing
-iiop generation in free rmic compilers.
-
 [Tools]
 No SOAP, Hessian or Burlap connectors due to missing
 packages in debian (axis, caucho libraries).

Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog	2009-03-09 20:24:07 UTC (rev 8072)
+++ trunk/libmx4j-java/debian/changelog	2009-03-09 22:57:06 UTC (rev 8073)
@@ -1,17 +1,22 @@
-libmx4j-java (3.0.2-5) UNRELEASED; urgency=low
+libmx4j-java (3.0.2-5) unstable; urgency=low
 
-  * Add mx4j-remove-invalids-providers.patch to remove invalid
+  * Apply patch mx4j-remove-invalids-providers.patch to remove invalid
     service provider from META-INF/services/. Closes: #504664.
-  * Add lintian-overrides for command-with-path-in-maintainer-script
-    Waiting for java-gcj-compat-dev to be updated.
   * debian/control:
     - Move all java libraries to Build-Depends-Indep
       They are arch:all and not needed during clean target.
-    - Updated Standards-Version to 3.8.0.
+    - Add Depends on openjdk-6-jdk to enable IIOP build
+    - Bump Standards-Version to 3.8.0.
+    - Bump to debhelper >= 7
     - Add ${misc:Depends} on libmx4j-java package.
     - Add myself as uploader.
+  * debian/compat: Bump debhelper compat level to 7
+  * debian/rules: Use openjdk-6-jdk as builder via JAVA_HOME
+  * debian/README.Debian
+    - Remove section about missing IIOP as we now build this part of MX4J
+  * debian/patches/mx4j-no-iiop.patch: Remove to re-enable IIOP build
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Fri, 30 Jan 2009 00:16:21 +0100
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Mon, 09 Mar 2009 23:07:00 +0100
 
 libmx4j-java (3.0.2-4) unstable; urgency=low
 

Modified: trunk/libmx4j-java/debian/compat
===================================================================
--- trunk/libmx4j-java/debian/compat	2009-03-09 20:24:07 UTC (rev 8072)
+++ trunk/libmx4j-java/debian/compat	2009-03-09 22:57:06 UTC (rev 8073)
@@ -1 +1 @@
-4
+7

Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control	2009-03-09 20:24:07 UTC (rev 8072)
+++ trunk/libmx4j-java/debian/control	2009-03-09 22:57:06 UTC (rev 8073)
@@ -5,7 +5,7 @@
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Stefan Gybas <sgybas at debian.org>,
            Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>,
            Damien Raude-Morvan <drazzib at drazzib.com>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.30), default-jdk-builddep, ant
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), openjdk-6-jdk, java-gcj-compat-dev, ant
 Build-Depends-Indep: liblog4j1.2-java, libcommons-logging-java,
   libbcel-java (>=5.0), libgnujaf-java, libgnumail-java, libservlet2.4-java,
   jython, libaxis-java

Deleted: trunk/libmx4j-java/debian/libmx4j-java-gcj.lintian-overrides
===================================================================
--- trunk/libmx4j-java/debian/libmx4j-java-gcj.lintian-overrides	2009-03-09 20:24:07 UTC (rev 8072)
+++ trunk/libmx4j-java/debian/libmx4j-java-gcj.lintian-overrides	2009-03-09 22:57:06 UTC (rev 8073)
@@ -1,3 +0,0 @@
-# See Debian bug #511491 in BTS
-# java-gcj-compat-dev: postinst generated by dh_nativejava references commands with prepended path
-libmx4j-java-gcj binary: command-with-path-in-maintainer-script

Deleted: trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	2009-03-09 20:24:07 UTC (rev 8072)
+++ trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	2009-03-09 22:57:06 UTC (rev 8073)
@@ -1,24 +0,0 @@
---- build/build.xml.orig	2008-01-21 23:03:24.000000000 +0100
-+++ build/build.xml	2008-01-21 23:05:02.000000000 +0100
-@@ -254,8 +254,10 @@
-    </target>
- 
-    <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes">
-+      <!--
-       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes"/>
-       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes"/>
-+      -->
-    </target>
- 
-    <target name="compile.rjmx" description="Compiles the Remote JMX (JSR 160) classes" depends="compile.jmx" if="jaas.present">
-@@ -263,8 +265,10 @@
-          <patternset refid="rmx4j.classes"/>
-          <classpath refid="lib.classpath"/>
-       </javac>
-+      <!--
-       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
-       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
-+      -->
- 
-       <jar jarfile="${rjmx-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
-          <fileset dir="${core.classes.dir}">

Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules	2009-03-09 20:24:07 UTC (rev 8072)
+++ trunk/libmx4j-java/debian/rules	2009-03-09 22:57:06 UTC (rev 8073)
@@ -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/default-java
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))


