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

Damien Raude-Morvan drazzib-guest at alioth.debian.org
Thu Jul 16 23:33:21 UTC 2009 

Author: drazzib-guest
Date: 2009-07-16 23:33:21 +0000 (Thu, 16 Jul 2009)
New Revision: 9372

Added:
   trunk/libmx4j-java/debian/README.source
   trunk/libmx4j-java/debian/patches/series
Removed:
   trunk/libmx4j-java/debian/patches/mx4j-remove-invalids-providers.patch
Modified:
   trunk/libmx4j-java/debian/changelog
   trunk/libmx4j-java/debian/control
   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
   trunk/libmx4j-java/debian/rules
Log:
[mx4j-java]

  * Bump Standards-Version to 3.8.2:
    - Move libmx4j-java to "java" section
    - Add a README.source to describe patch system
  * Switch to Quilt patch system:
    - Refresh all patchs
    - Add B-D on quilt
    - Include patchsys-quilt.mk in debian/rules
  * Merge mx4j-remove-invalids-providers patch into mx4j-caucho-build



Added: trunk/libmx4j-java/debian/README.source
===================================================================
--- trunk/libmx4j-java/debian/README.source	                        (rev 0)
+++ trunk/libmx4j-java/debian/README.source	2009-07-16 23:33:21 UTC (rev 9372)
@@ -0,0 +1,9 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+

Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/changelog	2009-07-16 23:33:21 UTC (rev 9372)
@@ -1,8 +1,15 @@
 libmx4j-java (3.0.2-7) UNRELEASED; urgency=low
 
-  * Move libmx4j-java to "java" section
+  * Bump Standards-Version to 3.8.2:
+    - Move libmx4j-java to "java" section
+    - Add a README.source to describe patch system
+  * Switch to Quilt patch system:
+    - Refresh all patchs
+    - Add B-D on quilt
+    - Include patchsys-quilt.mk in debian/rules 
+  * Merge mx4j-remove-invalids-providers patch into mx4j-caucho-build
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 26 Mar 2009 00:01:20 +0100
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 16 Jul 2009 23:41:08 +0200
 
 libmx4j-java (3.0.2-6) unstable; urgency=low
 

Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/control	2009-07-16 23:33:21 UTC (rev 9372)
@@ -5,11 +5,11 @@
 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 (>= 7), default-jdk-builddep, ant,
+Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep, ant, quilt,
   liblog4j1.2-java, libcommons-logging-java,
   libbcel-java (>=5.0), libgnujaf-java, libgnumail-java, libservlet2.4-java,
   jython, libaxis-java
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmx4j-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmx4j-java
 Homepage: http://mx4j.sourceforge.net/

Modified: trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/patches/01-mx4j-javaxssl.patch	2009-07-16 23:33:21 UTC (rev 9372)
@@ -1,5 +1,6 @@
---- ./src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java.orig	2008-01-21 22:57:12.000000000 +0100
-+++ ./src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java	2008-01-21 22:57:52.000000000 +0100
+Description: Replace com.sun.* SSL provider by javax.ssl.* API calls
+--- a/src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java
++++ b/src/tools/mx4j/tools/adaptor/ssl/SSLAdaptorServerSocketFactory.java
 @@ -21,9 +21,9 @@
  import javax.net.ssl.SSLServerSocket;
  import javax.net.ssl.SSLServerSocketFactory;

Modified: trunk/libmx4j-java/debian/patches/mx4j-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-build.patch	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/patches/mx4j-build.patch	2009-07-16 23:33:21 UTC (rev 9372)
@@ -1,50 +1,25 @@
---- 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 @@
+Description: Cleanup build.xml:
+ - Remove docbook unzip/delete (use Debian docbook package)
+ - Generate new boa ZIPs
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -224,6 +224,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">
+       <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII" target="1.3" source="1.3">
           <patternset refid="mx4j.classes"/>
-@@ -270,6 +274,25 @@
-       </javac>
+@@ -265,6 +266,7 @@
        <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 @@
+       <jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
+@@ -417,8 +419,7 @@
           author="true"
           version="true"
           use="true"
@@ -53,8 +28,8 @@
 +         windowtitle="MX4J API">
           <package name="mx4j.*"/>
  
-          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2003 MX4J Team. All Rights Reserved.</small></center>]]></bottom>
-@@ -454,8 +476,6 @@
+          <bottom><![CDATA[<center><small>Copyright &#169; 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
+@@ -431,8 +432,6 @@
     </target>
  
     <target name="docs" description="Builds the MX4J documentation">
@@ -63,7 +38,7 @@
        <mkdir dir="${dist.docs.dir}"/>
  
        <style processor="trax"
-@@ -467,9 +487,6 @@
+@@ -444,9 +443,6 @@
           classpathref="lib.classpath"
           />
  

Modified: trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch	2009-07-16 23:33:21 UTC (rev 9372)
@@ -1,6 +1,30 @@
---- 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 @@
+Description: Exclude some providers from build:
+ - caucho
+ - hessian
+ - burlap
+--- a/src/etc/JMXConnectorProvider-tools.provider
++++ b/src/etc/JMXConnectorProvider-tools.provider
+@@ -1,7 +1,3 @@
+-mx4j.tools.remote.provider.burlap.ClientProvider
+-mx4j.tools.remote.provider.burlap.ssl.ClientProvider
+-mx4j.tools.remote.provider.hessian.ClientProvider
+-mx4j.tools.remote.provider.hessian.ssl.ClientProvider
+ mx4j.tools.remote.provider.local.ClientProvider
+ mx4j.tools.remote.provider.soap.ClientProvider
+ mx4j.tools.remote.provider.soap.ssl.ClientProvider
+--- a/src/etc/JMXConnectorServerProvider-tools.provider
++++ b/src/etc/JMXConnectorServerProvider-tools.provider
+@@ -1,7 +1,3 @@
+-mx4j.tools.remote.provider.burlap.ServerProvider
+-mx4j.tools.remote.provider.burlap.ssl.ServerProvider
+-mx4j.tools.remote.provider.hessian.ServerProvider
+-mx4j.tools.remote.provider.hessian.ssl.ServerProvider
+ mx4j.tools.remote.provider.local.ServerProvider
+ mx4j.tools.remote.provider.soap.ServerProvider
+ mx4j.tools.remote.provider.soap.ssl.ServerProvider
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -323,9 +323,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"/>

Modified: trunk/libmx4j-java/debian/patches/mx4j-docbook.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-docbook.patch	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/patches/mx4j-docbook.patch	2009-07-16 23:33:21 UTC (rev 9372)
@@ -1,5 +1,7 @@
---- 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
+Description: Remove relative URI usage to resolve DTD location
+ Instead, set full URL and let XML Catalog resolve this.
+--- a/src/docs/xsl/mx4j-chunk.xsl
++++ b/src/docs/xsl/mx4j-chunk.xsl
 @@ -1,6 +1,6 @@
  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
  
@@ -8,8 +10,8 @@
    <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
+--- a/src/docs/index.xml
++++ b/src/docs/index.xml
 @@ -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" [

Modified: trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	2009-07-16 23:33:21 UTC (rev 9372)
@@ -1,24 +1,26 @@
---- 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 @@
+Description: Remove rmic compiling
+Last-Update: 2009-07-16
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -250,8 +250,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 @@
+@@ -259,8 +261,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"/>
-+      -->
++-->
+       <antcall target="rmic.iiop"/>
  
-       <jar jarfile="${rjmx-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
-          <fileset dir="${core.classes.dir}">
+       <jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">

Deleted: trunk/libmx4j-java/debian/patches/mx4j-remove-invalids-providers.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-remove-invalids-providers.patch	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/patches/mx4j-remove-invalids-providers.patch	2009-07-16 23:33:21 UTC (rev 9372)
@@ -1,20 +0,0 @@
---- trunk~/src/etc/JMXConnectorProvider-tools.provider	2006-10-13 01:12:17.000000000 +0200
-+++ trunk/src/etc/JMXConnectorProvider-tools.provider	2008-11-30 01:58:22.000000000 +0100
-@@ -1,7 +1,3 @@
--mx4j.tools.remote.provider.burlap.ClientProvider
--mx4j.tools.remote.provider.burlap.ssl.ClientProvider
--mx4j.tools.remote.provider.hessian.ClientProvider
--mx4j.tools.remote.provider.hessian.ssl.ClientProvider
- mx4j.tools.remote.provider.local.ClientProvider
- mx4j.tools.remote.provider.soap.ClientProvider
- mx4j.tools.remote.provider.soap.ssl.ClientProvider
---- trunk~/src/etc/JMXConnectorServerProvider-tools.provider	2006-10-13 01:12:17.000000000 +0200
-+++ trunk/src/etc/JMXConnectorServerProvider-tools.provider	2008-11-30 01:58:36.000000000 +0100
-@@ -1,7 +1,3 @@
--mx4j.tools.remote.provider.burlap.ServerProvider
--mx4j.tools.remote.provider.burlap.ssl.ServerProvider
--mx4j.tools.remote.provider.hessian.ServerProvider
--mx4j.tools.remote.provider.hessian.ssl.ServerProvider
- mx4j.tools.remote.provider.local.ServerProvider
- mx4j.tools.remote.provider.soap.ServerProvider
- mx4j.tools.remote.provider.soap.ssl.ServerProvider

Added: trunk/libmx4j-java/debian/patches/series
===================================================================
--- trunk/libmx4j-java/debian/patches/series	                        (rev 0)
+++ trunk/libmx4j-java/debian/patches/series	2009-07-16 23:33:21 UTC (rev 9372)
@@ -0,0 +1,5 @@
+mx4j-no-iiop.patch
+01-mx4j-javaxssl.patch
+mx4j-build.patch
+mx4j-caucho-build.patch
+mx4j-docbook.patch

Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules	2009-07-16 21:44:51 UTC (rev 9371)
+++ trunk/libmx4j-java/debian/rules	2009-07-16 23:33:21 UTC (rev 9372)
@@ -4,8 +4,8 @@
 export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java

More information about the pkg-java-commits mailing list