[libcommons-modeler-java] 20/39: Prepare 2.0.1-5, almost
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Oct 26 21:43:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libcommons-modeler-java.
commit 570ebe4d1176df2cfc3f54f9e880d7b8bc14f229
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date: Sat Apr 10 19:56:10 2010 +0000
Prepare 2.0.1-5, almost
---
debian/ant.properties | 2 ++
debian/changelog | 20 ++++++++++++++++----
debian/compat | 2 +-
debian/control | 11 +++++------
debian/libcommons-modeler-java-doc.doc-base | 4 ++--
...-doc.docs => libcommons-modeler-java-doc.install} | 0
debian/patches/01_build_xml.patch | 6 ++++--
debian/patches/02_mbeans_descriptor_dtd.patch | 6 ++++--
debian/patches/series | 2 ++
debian/rules | 3 +--
debian/source/format | 1 +
11 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index 8f89bdc..1cbd917 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -4,3 +4,5 @@ jmx.jar=/usr/share/java/mx4j-jmx.jar
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
diff --git a/debian/changelog b/debian/changelog
index 44557a7..437e6fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,24 @@
-libcommons-modeler-java (2.0.1-4.1) UNRELEASED; urgency=low
-
- * Non-maintainer upload.
+libcommons-modeler-java (2.0.1-5) unstable; urgency=low
+
+ [ 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
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 35a891c..5fb4f09 100644
--- a/debian/control
+++ b/debian/control
@@ -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 @@ Description: convenience library to use Java Management Extensions (JMX)
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
diff --git a/debian/libcommons-modeler-java-doc.doc-base b/debian/libcommons-modeler-java-doc.doc-base
index 49786cd..7c33195 100644
--- a/debian/libcommons-modeler-java-doc.doc-base
+++ b/debian/libcommons-modeler-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the Commons Modeler library.
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/*
diff --git a/debian/libcommons-modeler-java-doc.docs b/debian/libcommons-modeler-java-doc.install
similarity index 100%
rename from debian/libcommons-modeler-java-doc.docs
rename to debian/libcommons-modeler-java-doc.install
diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch
index 32367f5..bcfc2fa 100644
--- a/debian/patches/01_build_xml.patch
+++ b/debian/patches/01_build_xml.patch
@@ -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"/>
diff --git a/debian/patches/02_mbeans_descriptor_dtd.patch b/debian/patches/02_mbeans_descriptor_dtd.patch
index 6a1b4c3..5b366c8 100644
--- a/debian/patches/02_mbeans_descriptor_dtd.patch
+++ b/debian/patches/02_mbeans_descriptor_dtd.patch
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e2dab79
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_build_xml.patch
+02_mbeans_descriptor_dtd.patch
diff --git a/debian/rules b/debian/rules
index bf3d728..6f6d5e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-modeler-java.git
More information about the pkg-java-commits
mailing list