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

Niels Thykier nthykier-guest at alioth.debian.org
Sun Jan 24 21:50:21 UTC 2010 

Author: nthykier-guest
Date: 2010-01-24 21:50:21 +0000 (Sun, 24 Jan 2010)
New Revision: 11403

Added:
   trunk/libmx4j-java/debian/core-MANIFEST.MF
   trunk/libmx4j-java/debian/remote-MANIFEST.MF
   trunk/libmx4j-java/debian/source/
   trunk/libmx4j-java/debian/source/format
Modified:
   trunk/libmx4j-java/debian/changelog
   trunk/libmx4j-java/debian/control
   trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
   trunk/libmx4j-java/debian/rules
Log:
  * Added myself to Uploaders.
  * Updated java dependencies.
  * Injected OSGi metadata into mx4j.jar and mx4j-remote.jar
  * Added javahelper to Build-Depends and have it handle jar installation.
  * Refreshed mx4j-caucho-build.patch
  * Changed source format to 3.0 (quilt).
    - Removed README.source, no longer needed.


Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog	2010-01-24 20:42:55 UTC (rev 11402)
+++ trunk/libmx4j-java/debian/changelog	2010-01-24 21:50:21 UTC (rev 11403)
@@ -7,6 +7,15 @@
   * Remove Arnaud Vandyck from Uploaders
   * Update my email address
 
+  [ Niels Thykier ]
+  * Added myself to Uploaders.
+  * Updated java dependencies.
+  * Injected OSGi metadata into mx4j.jar and mx4j-remote.jar
+  * Added javahelper to Build-Depends and have it handle jar installation.
+  * Refreshed mx4j-caucho-build.patch
+  * Changed source format to 3.0 (quilt).
+    - Removed README.source, no longer needed.
+
  -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 15:16:21 +0100
 
 libmx4j-java (3.0.2-7) unstable; urgency=low

Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control	2010-01-24 20:42:55 UTC (rev 11402)
+++ trunk/libmx4j-java/debian/control	2010-01-24 21:50:21 UTC (rev 11403)
@@ -2,11 +2,12 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Michael Koch <konqueror at gmx.de> Damien Raude-Morvan <drazzib at debian.org>
-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
+Uploaders: Stefan Gybas <sgybas at debian.org>, Michael Koch <konqueror at gmx.de>,
+ Damien Raude-Morvan <drazzib at debian.org>, Niels Thykier <niels at thykier.net>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep, ant,
+               liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0),
+               libgnujaf-java, libgnumail-java, libservlet2.4-java, jython, 
+               libaxis-java, javahelper
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmx4j-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmx4j-java
@@ -14,8 +15,12 @@
 
 Package: libmx4j-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless | java1-runtime-headless | java2-runtime | java1-runtime, liblog4j1.2-java, libbcel-java (>=5.0)
-Suggests: libservlet2.4-java, libgnumail-java, jython
+Depends: default-jre-headless | java6-runtime-headless |
+         java5-runtime-headless | java2-runtime-headless,
+         libbcel-java (>=5.0),
+         liblog4j1.2-java,
+         ${misc:Depends}
+Suggests: libservlet2.4-java, libgnumail-java, jython, libjetty-java
 Description: An open source implementation of the JMX(TM) technology
  JMX defines the architecture, the patterns , the API and services to 
  build manageable Java applications. It provide flexible framework to

Added: trunk/libmx4j-java/debian/core-MANIFEST.MF
===================================================================
--- trunk/libmx4j-java/debian/core-MANIFEST.MF	                        (rev 0)
+++ trunk/libmx4j-java/debian/core-MANIFEST.MF	2010-01-24 21:50:21 UTC (rev 11403)
@@ -0,0 +1,10 @@
+Bundle-Vendor: MX4J
+Bundle-Localization: plugin
+Bundle-Name: Java Management Extensions API
+Bundle-SymbolicName: javax.management
+Export-Package: javax.management,javax.management.loading,javax.manage
+ ment.modelmbean,javax.management.monitor,javax.management.openmbean,j
+ avax.management.relation,javax.management.timer
+Bundle-Version: 1.2.0.v200803061811
+Bundle-ManifestVersion: 2
+

Modified: trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch	2010-01-24 20:42:55 UTC (rev 11402)
+++ trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch	2010-01-24 21:50:21 UTC (rev 11403)
@@ -2,8 +2,10 @@
  - caucho
  - hessian
  - burlap
---- a/src/etc/JMXConnectorProvider-tools.provider
-+++ b/src/etc/JMXConnectorProvider-tools.provider
+Index: mx4j-3.0.2/src/etc/JMXConnectorProvider-tools.provider
+===================================================================
+--- mx4j-3.0.2.orig/src/etc/JMXConnectorProvider-tools.provider	2010-01-24 20:58:38.694282555 +0100
++++ mx4j-3.0.2/src/etc/JMXConnectorProvider-tools.provider	2010-01-24 20:58:49.741284458 +0100
 @@ -1,7 +1,3 @@
 -mx4j.tools.remote.provider.burlap.ClientProvider
 -mx4j.tools.remote.provider.burlap.ssl.ClientProvider
@@ -12,8 +14,10 @@
  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
+Index: mx4j-3.0.2/src/etc/JMXConnectorServerProvider-tools.provider
+===================================================================
+--- mx4j-3.0.2.orig/src/etc/JMXConnectorServerProvider-tools.provider	2010-01-24 20:58:38.726282127 +0100
++++ mx4j-3.0.2/src/etc/JMXConnectorServerProvider-tools.provider	2010-01-24 20:58:49.741284458 +0100
 @@ -1,7 +1,3 @@
 -mx4j.tools.remote.provider.burlap.ServerProvider
 -mx4j.tools.remote.provider.burlap.ssl.ServerProvider
@@ -22,9 +26,11 @@
  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 @@
+Index: mx4j-3.0.2/build/build.xml
+===================================================================
+--- mx4j-3.0.2.orig/build/build.xml	2010-01-24 20:58:48.406283597 +0100
++++ mx4j-3.0.2/build/build.xml	2010-01-24 20:58:49.749304797 +0100
+@@ -302,9 +302,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"/>

Added: trunk/libmx4j-java/debian/remote-MANIFEST.MF
===================================================================
--- trunk/libmx4j-java/debian/remote-MANIFEST.MF	                        (rev 0)
+++ trunk/libmx4j-java/debian/remote-MANIFEST.MF	2010-01-24 21:50:21 UTC (rev 11403)
@@ -0,0 +1,8 @@
+Bundle-Vendor: MX4J
+Bundle-Localization: plugin
+Bundle-Name: Java Management Remote Extensions API
+Bundle-SymbolicName: javax.management.remote
+Export-Package: javax.management.remote,javax.management.remote.rmi
+Bundle-Version: 3.0.2
+Bundle-ManifestVersion: 2
+

Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules	2010-01-24 20:42:55 UTC (rev 11402)
+++ trunk/libmx4j-java/debian/rules	2010-01-24 21:50:21 UTC (rev 11403)
@@ -4,7 +4,6 @@
 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
 
 JAVA_HOME := /usr/lib/jvm/default-java
@@ -20,12 +19,10 @@
 DEB_ANT_BUILD_TARGET := compile.tools
 
 install/libmx4j-java::
-	install -m 644 dist/lib/mx4j.jar debian/libmx4j-java/usr/share/java/mx4j-$(VERSION).jar
-	install -m 644 dist/lib/mx4j-remote.jar debian/libmx4j-java/usr/share/java/mx4j-remote-$(VERSION).jar
-	install -m 644 dist/lib/mx4j-tools.jar debian/libmx4j-java/usr/share/java/mx4j-tools-$(VERSION).jar
-	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
+	jar umf debian/remote-MANIFEST.MF  dist/lib/mx4j-remote.jar
+	jar umf debian/core-MANIFEST.MF dist/lib/mx4j.jar
+	jh_installlibs -plibmx4j-java dist/lib/mx4j.jar \
+	               dist/lib/mx4j-remote.jar dist/lib/mx4j-tools.jar
 
 ifeq ($(with_gcj_native),yes)
 install/libmx4j-java-gcj:: install/libmx4j-java

Added: trunk/libmx4j-java/debian/source/format
===================================================================
--- trunk/libmx4j-java/debian/source/format	                        (rev 0)
+++ trunk/libmx4j-java/debian/source/format	2010-01-24 21:50:21 UTC (rev 11403)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list