[pkg-java] r12046 - in trunk/libcommons-modeler-java/debian: . patches source

Onkar Shinde onkarshinde-guest at alioth.debian.org
Sat Apr 10 19:56:10 UTC 2010 

Author: onkarshinde-guest
Date: 2010-04-10 19:56:10 +0000 (Sat, 10 Apr 2010)
New Revision: 12046

Added:
   trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.install
   trunk/libcommons-modeler-java/debian/patches/series
   trunk/libcommons-modeler-java/debian/source/
   trunk/libcommons-modeler-java/debian/source/format
Removed:
   trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.docs
Modified:
   trunk/libcommons-modeler-java/debian/ant.properties
   trunk/libcommons-modeler-java/debian/changelog
   trunk/libcommons-modeler-java/debian/compat
   trunk/libcommons-modeler-java/debian/control
   trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base
   trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch
   trunk/libcommons-modeler-java/debian/patches/02_mbeans_descriptor_dtd.patch
   trunk/libcommons-modeler-java/debian/rules
Log:
Prepare 2.0.1-5, almost

Modified: trunk/libcommons-modeler-java/debian/ant.properties
===================================================================
--- trunk/libcommons-modeler-java/debian/ant.properties	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/ant.properties	2010-04-10 19:56:10 UTC (rev 12046)
@@ -4,3 +4,5 @@
 jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
 
 junit.jar=/usr/share/java/junit.jar
+ant.build.javac.source=1.4
+ant.build.javac.target=1.4

Modified: trunk/libcommons-modeler-java/debian/changelog
===================================================================
--- trunk/libcommons-modeler-java/debian/changelog	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/changelog	2010-04-10 19:56:10 UTC (rev 12046)
@@ -1,12 +1,24 @@
-libcommons-modeler-java (2.0.1-4.1) UNRELEASED; urgency=low
+libcommons-modeler-java (2.0.1-5) unstable; urgency=low
 
-  * Non-maintainer upload.
+  [ Onkar Shinde ]
+  * Change build dependencies to default-jdk. Set ant properties for
+    target JVM version 1.4. Fixes FTBFS. (Closes: #576978)
+  * Remove runtime JRE dependencies. Remove java-virtual-machine suggests.
+  * Convert patches to quilt format. Convert package to 3.0 format.
+  * Install api docs to /usr/share/java/libcommons-modeler-java/api.
+    Update doc-base file accordingly.
+  * lintian errors/warnings fixed
+    - Section libs -> java.
+    - Standards version 3.7.2 -> 3.8.4.
+    - Add ${misc:Depends} to runtime dependencies.
+    - Update compat version to 5.
+    - Remove XS from VCS-* fields. Fix Vcs-Browser field name.
 
   [ Emmanuel Bourg ]
   * Update of the URLs
   * Rename Jakarta Commons to Apache Commons
 
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 17 Jun 2009 10:52:27 +0200
+ -- Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>  Thu, 08 Apr 2010 22:52:57 +0530
 
 libcommons-modeler-java (2.0.1-4) unstable; urgency=low
 

Modified: trunk/libcommons-modeler-java/debian/compat
===================================================================
--- trunk/libcommons-modeler-java/debian/compat	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/compat	2010-04-10 19:56:10 UTC (rev 12046)
@@ -1 +1 @@
-4
+5

Modified: trunk/libcommons-modeler-java/debian/control
===================================================================
--- trunk/libcommons-modeler-java/debian/control	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/control	2010-04-10 19:56:10 UTC (rev 12046)
@@ -1,22 +1,20 @@
 Source: libcommons-modeler-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Marcus Better <marcus at better.se>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), ant
-Build-Depends-Indep: java-gcj-compat-dev, libcommons-logging-java,
+Build-Depends-Indep: default-jdk, libcommons-logging-java,
                      libcommons-digester-java, libmx4j-java, junit
-Standards-Version: 3.7.2
+Standards-Version: 3.8.4
 Homepage: http://commons.apache.org/modeler/
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libcommons-modeler-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-modeler-java/
 
 Package: libcommons-modeler-java
-Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime,
+Depends: ${misc:Depends}, 
          libmx4j-java, libcommons-logging-java, libcommons-digester-java
-Suggests: java-virtual-machine
 Description: convenience library to use Java Management Extensions (JMX)
  Commons Modeler from the Apache Commons project simplifies using the Java
  Management Extensions (JMX). It provides the following services to
@@ -31,6 +29,7 @@
 Package: libcommons-modeler-java-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: libcommons-modeler-java
 Description: documentation and examples for Commons Modeler
  Commons Modeler from the Apache Commons project simplifies using the Java

Modified: trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base
===================================================================
--- trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.doc-base	2010-04-10 19:56:10 UTC (rev 12046)
@@ -5,5 +5,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-modeler-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-modeler-java-doc/api/*
+Index: /usr/share/java/libcommons-modeler-java/api/index.html
+Files: /usr/share/java/libcommons-modeler-java/api/*

Deleted: trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.docs
===================================================================
--- trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.docs	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.docs	2010-04-10 19:56:10 UTC (rev 12046)
@@ -1 +0,0 @@
-dist/docs/api

Copied: trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.install (from rev 12042, trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.docs)
===================================================================
--- trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.install	                        (rev 0)
+++ trunk/libcommons-modeler-java/debian/libcommons-modeler-java-doc.install	2010-04-10 19:56:10 UTC (rev 12046)
@@ -0,0 +1 @@
+dist/docs/api

Modified: trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/patches/01_build_xml.patch	2010-04-10 19:56:10 UTC (rev 12046)
@@ -1,5 +1,7 @@
---- build.xml.orig	2005-09-11 00:29:15.000000000 +0200
-+++ build.xml	2005-09-11 00:28:55.000000000 +0200
+Index: libcommons-modeler-java-2.0.1/build.xml
+===================================================================
+--- libcommons-modeler-java-2.0.1.orig/build.xml	2007-06-22 04:52:44.000000000 +0530
++++ libcommons-modeler-java-2.0.1/build.xml	2010-04-09 00:08:36.000000000 +0530
 @@ -39,8 +39,6 @@
    <property name="base.path"               value="/usr/local" />
    <property name="jaxp.home"               value="${base.path}/jaxp-1.1"/>

Modified: trunk/libcommons-modeler-java/debian/patches/02_mbeans_descriptor_dtd.patch
===================================================================
--- trunk/libcommons-modeler-java/debian/patches/02_mbeans_descriptor_dtd.patch	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/patches/02_mbeans_descriptor_dtd.patch	2010-04-10 19:56:10 UTC (rev 12046)
@@ -1,5 +1,7 @@
---- src/test/org/apache/commons/modeler/mbeans-descriptors.xml.orig	2007-09-30 20:45:12.000000000 +0200
-+++ src/test/org/apache/commons/modeler/mbeans-descriptors.xml	2007-09-30 20:45:37.000000000 +0200
+Index: libcommons-modeler-java-2.0.1/src/test/org/apache/commons/modeler/mbeans-descriptors.xml
+===================================================================
+--- libcommons-modeler-java-2.0.1.orig/src/test/org/apache/commons/modeler/mbeans-descriptors.xml	2007-06-22 04:52:44.000000000 +0530
++++ libcommons-modeler-java-2.0.1/src/test/org/apache/commons/modeler/mbeans-descriptors.xml	2010-04-09 00:12:09.000000000 +0530
 @@ -17,7 +17,7 @@
  -->
  <!DOCTYPE mbeans-descriptors PUBLIC

Added: trunk/libcommons-modeler-java/debian/patches/series
===================================================================
--- trunk/libcommons-modeler-java/debian/patches/series	                        (rev 0)
+++ trunk/libcommons-modeler-java/debian/patches/series	2010-04-10 19:56:10 UTC (rev 12046)
@@ -0,0 +1,2 @@
+01_build_xml.patch
+02_mbeans_descriptor_dtd.patch

Modified: trunk/libcommons-modeler-java/debian/rules
===================================================================
--- trunk/libcommons-modeler-java/debian/rules	2010-04-10 13:19:42 UTC (rev 12045)
+++ trunk/libcommons-modeler-java/debian/rules	2010-04-10 19:56:10 UTC (rev 12046)
@@ -3,9 +3,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
 # Additional JARs to add to the class path, either full path or just the

Added: trunk/libcommons-modeler-java/debian/source/format
===================================================================
--- trunk/libcommons-modeler-java/debian/source/format	                        (rev 0)
+++ trunk/libcommons-modeler-java/debian/source/format	2010-04-10 19:56:10 UTC (rev 12046)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the pkg-java-commits mailing list