[libcommons-modeler-java] 08/39: libcommons-modeler-java (1.1-7) unstable; urgency=low

[Emmanuel Bourg]

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 67f956f089f361c86bc8f05a4bc8c4831e606773
Author: Wolfgang Bär <wbaer at gmx.de>
Date:   Sun Sep 11 10:36:54 2005 +0000

    libcommons-modeler-java (1.1-7) unstable; urgency=low
    
      * Updated build.xml patch to include fix for building
        in top level directory (closes: #326163)
      * Added kaffe | java1-runtime | java2-runtime to depends
      * Added java-virtual-machine as suggests
      * Changed DEB_ANT_INSTALL_TARGET into DEB_ANT_BUILD_TARGET
        so javadocs is only build once
---
 debian/changelog                    | 13 +++++++++++++
 debian/control                      |  3 ++-
 debian/dirs                         |  2 +-
 debian/libcommons-modeler-java.docs |  1 -
 debian/patches/01_build_xml.patch   | 15 ++++++++++++---
 debian/rules                        |  2 +-
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec1a292..d128030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libcommons-modeler-java (1.1-7) unstable; urgency=low
+
+  * Updated build.xml patch to include fix for building
+    in top level directory (closes: #326163)
+  * Added kaffe | java1-runtime | java2-runtime to depends
+  * Added java-virtual-machine as suggests
+  * Changed DEB_ANT_INSTALL_TARGET into DEB_ANT_BUILD_TARGET
+    so javadocs is only build once
+
+  * Upload sponsored by Petter Reinholdtsen  
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sun, 11 Sep 2005 00:30:12 +0200
+
 libcommons-modeler-java (1.1-6) unstable; urgency=low
 
   * libant1.6-java to ant transition
diff --git a/debian/control b/debian/control
index 493ba5a..6ce6efa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Standards-Version: 3.6.2
 
 Package: libcommons-modeler-java
 Architecture: all
-Depends: libmx4j-java, libcommons-logging-java, libcommons-digester-java
+Depends: kaffe | java1-runtime | java2-runtime, libmx4j-java, libcommons-logging-java, libcommons-digester-java
+Suggests: java-virtual-machine
 Description: A convenience library to use Java Management Extensions (JMX)
  Commons Modeler from the Apache Jakarta project simplifies using the Java
  Management Extensions (JMX). It provides the following services to
diff --git a/debian/dirs b/debian/dirs
index f5cd8f2..13c9f03 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1 @@
-usr/share/java
\ No newline at end of file
+usr/share/java
diff --git a/debian/libcommons-modeler-java.docs b/debian/libcommons-modeler-java.docs
index 0100168..a2e214f 100644
--- a/debian/libcommons-modeler-java.docs
+++ b/debian/libcommons-modeler-java.docs
@@ -1,4 +1,3 @@
 RELEASE-NOTES.txt
 RELEASE-NOTES-1.1.txt
 STATUS.html
-
diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch
index dd81a42..273f391 100644
--- a/debian/patches/01_build_xml.patch
+++ b/debian/patches/01_build_xml.patch
@@ -1,6 +1,15 @@
---- build.xml.orig	2003-07-29 02:50:44.000000000 +0200
-+++ build.xml	2005-08-04 22:19:22.000000000 +0200
-@@ -157,7 +157,7 @@
+--- build.xml.orig	2005-09-11 00:29:15.000000000 +0200
++++ build.xml	2005-09-11 00:28:55.000000000 +0200
+@@ -23,8 +23,6 @@
+   <property name="base.path"               value="/usr/local" />
+   <property name="jaxp.home"               value="${base.path}/jaxp-1.1"/>
+   <property name="junit.home"              value="${base.path}/junit3.7"/>
+-  <property name="commons.home"            location="../../jakarta-commons"/>
+-  <property name="sandbox.home"            location="../../jakarta-commons-sandbox"/>
+   <property name="digester.home"           value="${commons.home}/digester"/>
+   <property name="jmx.home"                value="${base.path}/jmx-ri_1.0.1/jmx"/>
+   <property name="logging.home"            value="${commons.home}/logging"/>
+@@ -157,7 +155,7 @@
             destdir="${build.home}/classes"
               debug="${compile.debug}"
         deprecation="${compile.deprecation}"
diff --git a/debian/rules b/debian/rules
index 37e0960..ac54304 100644
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ DEB_JARS := mx4j commons-digester commons-logging $(ANT_HOME)/lib/ant-launcher.j
 DEB_ANT_COMPILER := jikes
 
 # Ant targets to call
-DEB_ANT_INSTALL_TARGET := dist
+DEB_ANT_BUILD_TARGET := dist
 
 LIBRARY_PACKAGE := commons-modeler
 API_VERSION     := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-modeler-java.git