[pkg-java] r3033 - in trunk/libmx4j-java/debian: . patches
Michael Koch
mkoch at alioth.debian.org
Sun Mar 4 18:10:34 CET 2007
Author: mkoch
Date: 2007-03-04 17:10:33 +0000 (Sun, 04 Mar 2007)
New Revision: 3033
Added:
trunk/libmx4j-java/debian/patches/
trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch
trunk/libmx4j-java/debian/patches/mx4j-build.patch
trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
trunk/libmx4j-java/debian/patches/mx4j-docbook.patch
trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
Modified:
trunk/libmx4j-java/debian/
trunk/libmx4j-java/debian/changelog
trunk/libmx4j-java/debian/control
trunk/libmx4j-java/debian/rules
Log:
libmx4j-java (3.0.1-1ubuntu3) experimental; urgency=low
* Merged from Ubuntu.
* Upload to experimental.
-- Michael Koch <konqueror at gmx.de> Sun, 4 Mar 2007 16:40:48 +0100
libmx4j-java (3.0.1-1ubuntu2) feisty; urgency=low
* Build a -gcj package.
-- Matthias Klose <doko at ubuntu.com> Thu, 15 Feb 2007 15:41:17 +0100
libmx4j-java (3.0.1-1ubuntu1) edgy; urgency=low
* Upload to edgy.
-- Matthias Klose <doko at ubuntu.com> Wed, 27 Sep 2006 10:59:47 +0000
libmx4j-java (3.0.1-1) unstable; urgency=low
* New upstream version.
* Added several patches to build with GCJ.
* Build and Depend on java-gcj-compat.
* Updated Standards-Version to 3.7.2.
(All changes by Vladim?\195?\131?\194?\173r Lap?\195?\131?\194?\161?\195?\132?\194?\141ek and Matthias Klose)
-- Michael Koch <konqueror at gmx.de> Wed, 20 Sep 2006 21:13:57 +0000
Property changes on: trunk/libmx4j-java/debian
___________________________________________________________________
Name: svn:ignore
+ files
libmx4j-java
libmx4j-java-gcj
stamp-*
*.debhelper
*.substvars
Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/changelog 2007-03-04 17:10:33 UTC (rev 3033)
@@ -1,3 +1,32 @@
+libmx4j-java (3.0.1-1ubuntu3) experimental; urgency=low
+
+ * Merged from Ubuntu.
+ * Upload to experimental.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 4 Mar 2007 16:40:48 +0100
+
+libmx4j-java (3.0.1-1ubuntu2) feisty; urgency=low
+
+ * Build a -gcj package.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 15 Feb 2007 15:41:17 +0100
+
+libmx4j-java (3.0.1-1ubuntu1) edgy; urgency=low
+
+ * Upload to edgy.
+
+ -- Matthias Klose <doko at ubuntu.com> Wed, 27 Sep 2006 10:59:47 +0000
+
+libmx4j-java (3.0.1-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added several patches to build with GCJ.
+ * Build and Depend on java-gcj-compat.
+ * Updated Standards-Version to 3.7.2.
+ (All changes by Vladimír Lapáček and Matthias Klose)
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 20 Sep 2006 21:13:57 +0000
+
libmx4j-java (2.1.1-4) unstable; urgency=low
* Removed forgotten files in debian directory and unused patches.
Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/control 2007-03-04 17:10:33 UTC (rev 3033)
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
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>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.30), liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0), libgnujaf-java, libgnumail-java, kaffe (>= 2:1.1.6.91-1), ant, libservlet2.4-java, jython
-Standards-Version: 3.6.2
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.30), liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0), libgnujaf-java, libgnumail-java, java-gcj-compat-dev , ant, libservlet2.4-java, jython, gcj, libaxis-java
+Standards-Version: 3.7.2
Package: libmx4j-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, liblog4j1.2-java, libbcel-java (>=5.0)
+Depends: java-gcj-compat | java1-runtime | java2-runtime, liblog4j1.2-java, libbcel-java (>=5.0)
Suggests: libservlet2.4-java, libgnumail-java, jython
Description: An open source implementation of the JMX(TM) technology
JMX defines the architecture, the patterns , the API and services to
@@ -18,6 +18,20 @@
do some operation (such as downloading information from an URL the
system administrator passes in), and so on.
+Package: libmx4j-java-gcj
+Architecture: any
+Section: libs
+Depends: libmx4j-java (>= ${source:Version}), liblog4j1.2-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Description: An open source implementation of the JMX(TM) technology (native code)
+ JMX defines the architecture, the patterns , the API and services to
+ build manageable Java applications. It provide flexible framework to
+ stop and restart services, and remove it from the application or to add
+ it to an application, to change its configuration files, to ask it to
+ do some operation (such as downloading information from an URL the
+ system administrator passes in), and so on.
+ .
+ This package contains the natively compiled code for use by gij.
+
#Package: libmx4j-java-doc
#Architecture: all
#Suggests: junit
Property changes on: trunk/libmx4j-java/debian/patches
___________________________________________________________________
Name: svn:ignore
+ *.log
Added: trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch 2007-03-04 17:10:33 UTC (rev 3033)
@@ -0,0 +1,24 @@
+--- mx4j/src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java.orig Thu Dec 23 19:07:29 2004
++++ mx4j/src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java Thu Dec 23 19:08:43 2004
+@@ -21,9 +21,9 @@
+ import javax.net.ssl.SSLServerSocket;
+ import javax.net.ssl.SSLServerSocketFactory;
+
+-import com.sun.net.ssl.KeyManagerFactory;
+-import com.sun.net.ssl.SSLContext;
+-import com.sun.net.ssl.TrustManagerFactory;
++import javax.net.ssl.KeyManagerFactory;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.TrustManagerFactory;
+ import mx4j.log.Log;
+ import mx4j.log.Logger;
+
+@@ -60,7 +60,7 @@
+ {
+ static
+ {
+- addProvider(new com.sun.net.ssl.internal.ssl.Provider());
++ //addProvider(new com.sun.net.ssl.internal.ssl.Provider());
+ }
+
+ private String m_keyStoreType = "JKS";
Added: trunk/libmx4j-java/debian/patches/mx4j-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-build.patch 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/patches/mx4j-build.patch 2007-03-04 17:10:33 UTC (rev 3033)
@@ -0,0 +1,75 @@
+--- mx4j/build/build.xml.orig Thu Dec 23 18:35:27 2004
++++ mx4j/build/build.xml Thu Dec 23 19:52:49 2004
+@@ -55,6 +55,9 @@
+ <property name="rjmx.jar.file" value="${dist.lib.dir}/${name}-rjmx.jar"/>
+ <property name="rimpl.jar.file" value="${dist.lib.dir}/${name}-rimpl.jar"/>
+ <property name="rmx4j.jar.file" value="${dist.lib.dir}/${name}-remote.jar"/>
++ <property name="rjmx-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rjmx-boa.jar"/>
++ <property name="rimpl-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rimpl-boa.jar"/>
++ <property name="rmx4j-boa.jar.file" value="${dist.lib.dir}/boa/${name}-remote-boa.jar"/>
+
+ <property name="tools.jar.file" value="${dist.lib.dir}/${name}-tools.jar"/>
+
+@@ -224,6 +227,7 @@
+ <target name="compile.jmx" description="Compiles the JMX (JSR 3) classes" depends="flags">
+ <mkdir dir="${core.classes.dir}"/>
+ <mkdir dir="${dist.lib.dir}"/>
++ <mkdir dir="${dist.lib.dir}/boa"/>
+
+ <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
+ <patternset refid="mx4j.classes"/>
+@@ -270,6 +274,25 @@
+ </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}">
++ <patternset refid="rjmx.classes"/>
++ </fileset>
++ </jar>
++
++ <jar jarfile="${rimpl-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
++ <fileset dir="${core.classes.dir}">
++ <patternset refid="rimpl.classes"/>
++ </fileset>
++ </jar>
++
++ <jar jarfile="${rmx4j-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
++ <fileset dir="${core.classes.dir}">
++ <patternset refid="rmx4j.classes"/>
++ </fileset>
++ </jar>
++
+ <antcall target="rmic.iiop"/>
+ <antcall target="rmic.iiop.poa"/>
+
+@@ -440,8 +463,7 @@
+ author="true"
+ version="true"
+ use="true"
+- windowtitle="MX4J API"
+- classpathref="classpath">
++ windowtitle="MX4J API">
+ <package name="mx4j.*"/>
+
+ <bottom><![CDATA[<center><small>Copyright © 2001-2003 MX4J Team. All Rights Reserved.</small></center>]]></bottom>
+@@ -454,8 +476,6 @@
+ </target>
+
+ <target name="docs" description="Builds the MX4J documentation">
+- <unzip src="${docbook.dtd.zip.file}" dest="${docs.src.dir}/docbook"/>
+- <unzip src="${docbook.xsl.zip.file}" dest="${docs.src.dir}/docbookx"/>
+ <mkdir dir="${dist.docs.dir}"/>
+
+ <style processor="trax"
+@@ -467,9 +487,6 @@
+ classpathref="lib.classpath"
+ />
+
+- <delete dir="${docs.src.dir}/docbook" quiet="true"/>
+- <delete dir="${docs.src.dir}/docbookx" quiet="true"/>
+-
+ <!-- Bug in Ant forces this move, since destdir of the style task does not work -->
+ <move todir="${dist.docs.dir}">
+ <fileset dir="${basedir}/build">
Added: trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch 2007-03-04 17:10:33 UTC (rev 3033)
@@ -0,0 +1,15 @@
+--- mx4j/build/build.xml.orig Thu Dec 23 20:05:06 2004
++++ mx4j/build/build.xml Thu Dec 23 20:06:16 2004
+@@ -306,9 +306,9 @@
+ <exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
+ <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
+ <exclude name="mx4j/tools/remote/http/jetty/**" unless="jetty.present"/>
+- <exclude name="mx4j/tools/remote/caucho/**" unless="jdk14.present"/>
+- <exclude name="mx4j/tools/remote/**/hessian/**" unless="jdk14.present"/>
+- <exclude name="mx4j/tools/remote/**/burlap/**" unless="jdk14.present"/>
++ <exclude name="mx4j/tools/remote/caucho/**"/>
++ <exclude name="mx4j/tools/remote/**/hessian/**"/>
++ <exclude name="mx4j/tools/remote/**/burlap/**"/>
+ <classpath>
+ <path refid="classpath"/>
+ <pathelement location="${core.classes.dir}"/>
Added: trunk/libmx4j-java/debian/patches/mx4j-docbook.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-docbook.patch 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/patches/mx4j-docbook.patch 2007-03-04 17:10:33 UTC (rev 3033)
@@ -0,0 +1,20 @@
+--- mx4j/src/docs/xsl/mx4j-chunk.xsl.orig Sun Nov 14 16:33:03 2004
++++ mx4j/src/docs/xsl/mx4j-chunk.xsl Thu Dec 23 20:17:30 2004
+@@ -1,6 +1,6 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
+
+- <xsl:import href="../docbookx/html/chunk.xsl"/>
++ <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
+ <xsl:import href="autotoc.xsl"/>
+
+ <xsl:param name="html.stylesheet">styles.css</xsl:param>
+--- mx4j/src/docs/index.xml.orig Sun Nov 14 16:31:54 2004
++++ mx4j/src/docs/index.xml Thu Dec 23 20:19:00 2004
+@@ -1,5 +1,6 @@
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbook/docbookx.dtd" [
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+ <!ENTITY english SYSTEM "english/index.xml">
+
+ <!ENTITY license_en SYSTEM "english/license.xml">
Added: trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch 2007-03-04 17:10:33 UTC (rev 3033)
@@ -0,0 +1,17 @@
+--- mx4j-2.1.0/build/build.xml.orig 2005-03-04 13:46:19.610032808 +0000
++++ mx4j-2.1.0/build/build.xml 2005-03-04 13:50:12.555578739 +0000
+@@ -254,12 +254,14 @@
+ </target>
+
+ <target name="rmic.iiop.poa" description="RMI compiles the remote JMX (JSR 160) classes using the -poa option" if="jdk14.present">
++<!--
+ <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes">
+ <compilerarg value="-poa"/>
+ </rmic>
+ <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes">
+ <compilerarg value="-poa"/>
+ </rmic>
++-->
+ </target>
+
+ <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" unless="jdk14.present">
Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules 2007-03-03 23:40:09 UTC (rev 3032)
+++ trunk/libmx4j-java/debian/rules 2007-03-04 17:10:33 UTC (rev 3033)
@@ -7,11 +7,15 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar log4j-1.2 commons-logging servlet-api-2.4 bcel jython gnumail activation
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+ with_gcj_native := yes
+endif
+DEB_JARS := log4j-1.2 commons-logging servlet-api-2.4 bcel jython gnumail activation axis jaxrpc saaj
+
DEB_ANT_BUILDFILE := build/build.xml
DEB_ANT_BUILD_TARGET := compile.tools
@@ -22,3 +26,8 @@
ln -s mx4j-$(VERSION).jar debian/libmx4j-java/usr/share/java/mx4j.jar
ln -s mx4j-remote-$(VERSION).jar debian/libmx4j-java/usr/share/java/mx4j-remote.jar
ln -s mx4j-tools-$(VERSION).jar debian/libmx4j-java/usr/share/java/mx4j-tools.jar
+
+ifeq ($(with_gcj_native),yes)
+install/libmx4j-java-gcj:: install/libmx4j-java
+ dh_nativejava -plibmx4j-java-gcj
+endif
More information about the pkg-java-commits
mailing list