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 bb0fd58d864c599e8f0bb7517a79887d49ebf727
Author: Marcus Better <mar...@better.se>
Date: Tue Jul 31 21:41:02 2007 +0000
Preliminary update for new upstream version 2.0.1.
---
debian/ant.properties | 3 +
debian/changelog | 8 +
debian/control | 17 +-
debian/copyright | 248 +++++++++++++++++++++-------
debian/libcommons-modeler-java-doc.doc-base | 9 +
debian/libcommons-modeler-java-doc.examples | 2 +-
debian/libcommons-modeler-java.docs | 4 +-
debian/patches/01_build_xml.patch | 20 ---
debian/rules | 3 -
9 files changed, 217 insertions(+), 97 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index f2c568e..8f89bdc 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,3 +1,6 @@
commons-digester.jar=/usr/share/java/commons-digester.jar
commons-logging.jar=/usr/share/java/commons-logging.jar
+jmx.jar=/usr/share/java/mx4j-jmx.jar
+jmx-tools.jar=${jmx.lib}/mx4j-tools.jar
+
junit.jar=/usr/share/java/junit.jar
diff --git a/debian/changelog b/debian/changelog
index ebeac2f..44afd22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcommons-modeler-java (2.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * The API has changed incompatibly in this release. See the release
+ notes for details.
+
+ -- Marcus Better <mar...@better.se> Fri, 01 Jun 2007 16:07:58 +0200
+
libcommons-modeler-java (1.1-9) unstable; urgency=low
* Use java-gcj-compat instead of kaffe.
diff --git a/debian/control b/debian/control
index 6035937..c2f5ab2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,18 @@ Source: libcommons-modeler-java
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs (>= 0.4.8), java-gcj-compat-dev,
ant, libcommons-logging-java, libcommons-digester-java, libmx4j-java
+Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>,
Marcus Better <mar...@better.se>
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8), java-gcj-compat-dev, ant,
libcommons-logging-java, libcommons-digester-java, libmx4j-java
Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libcommons-modeler-java
+XS-Vcs-Browse:
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, libmx4j-java,
libcommons-logging-java, libcommons-digester-java
Suggests: java-virtual-machine
-Description: A convenience library to use Java Management Extensions (JMX)
+Description: 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
application developers who wish to make their applications manageable via JMX:
@@ -21,18 +23,17 @@ Description: A convenience library to use Java Management
Extensions (JMX)
* Supplies a base Model MBean implementation class that can be used
for all management activities where the attribute accesses or
operation calls are simply reflected on to the managed object.
- .
- Homepage: http://jakarta.apache.org/commons/modeler/
+ .
+ Homepage: http://jakarta.apache.org/commons/modeler/
Package: libcommons-modeler-java-doc
Section: doc
Architecture: all
Suggests: libcommons-modeler-java
-Description: Javadoc API documentation and examples for Commons Modeler
+Description: documentation and examples for Commons Modeler
Commons Modeler from the Apache Jakarta project simplifies using the Java
Management Extensions (JMX).
.
- This package contains the Javadoc API documentation and examples.
+ This package contains the API Javadoc and examples.
.
Homepage: http://jakarta.apache.org/commons/modeler/
-
diff --git a/debian/copyright b/debian/copyright
index 049c78c..a2556b7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,65 +1,189 @@
This package was debianized by Takashi Okamoto <t...@debian.org> on
Wed, 11 Sep 2002 21:09:56 +0900.
-It was downloaded from http://jakarta.apache.org/commons/modeler.html
-
-Upstream Authors: Craig R. McClanahan, Remy Maucherat, Amy Roh,
- Costin Manolache, Yoav Shapira
-
-Copyright:
-/*
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apa...@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
+It is currently maintained by the Debian Java Maintainers
+<pkg-java-maintainers@lists.alioth.debian.org>.
+
+It was downloaded from <http://jakarta.apache.org/commons/modeler.html>.
+
+Upstream Authors: Bill Barker, Costin Manolache, Craig R. McClanahan,
+Davanum Srinivas, Yoav Shapira
+
+Copyright (C) 1999-2006 The Apache Software Foundation.
+
+Copyright (C) 2007 Marcus Better (Debian packaging)
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
diff --git a/debian/libcommons-modeler-java-doc.doc-base
b/debian/libcommons-modeler-java-doc.doc-base
new file mode 100644
index 0000000..b60285b
--- /dev/null
+++ b/debian/libcommons-modeler-java-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libcommons-modeler-java
+Title: API Javadoc for Commons Modeler
+Author: Commons Modeler developers
+Abstract: This is the API Javadoc provided by the Commons Modeler library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-modeler-java-doc/apidocs/index.html
+Files: /usr/share/doc/libcommons-modeler-java-doc/apidocs/*
diff --git a/debian/libcommons-modeler-java-doc.examples
b/debian/libcommons-modeler-java-doc.examples
index 5ebbf2f..b87bd56 100644
--- a/debian/libcommons-modeler-java-doc.examples
+++ b/debian/libcommons-modeler-java-doc.examples
@@ -1 +1 @@
-src/test/org/apache/commons/modeler/demo
+dist/demo.tar.gz
diff --git a/debian/libcommons-modeler-java.docs
b/debian/libcommons-modeler-java.docs
index a2e214f..3a80a29 100644
--- a/debian/libcommons-modeler-java.docs
+++ b/debian/libcommons-modeler-java.docs
@@ -1,3 +1 @@
-RELEASE-NOTES.txt
-RELEASE-NOTES-1.1.txt
-STATUS.html
+dist/RELEASE-NOTES.txt
diff --git a/debian/patches/01_build_xml.patch
b/debian/patches/01_build_xml.patch
deleted file mode 100644
index 273f391..0000000
--- a/debian/patches/01_build_xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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}"
-- optimize="${compile.optimize}">
-+ optimize="${compile.optimize}" target="1.3">
- <classpath refid="compile.classpath"/>
- <exclude name="org/apache/commons/modeler/ant/*PropertyHelper.java"
unless="ant16.available" />
- <exclude
name="org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java"
unless="digester.available" />
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 447c8e1..01e63df
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,8 @@
# debian/rules file for libcommons-modeler-java (uses cdbs)
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-
JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
@@ -22,4 +20,3 @@ API_VERSION := $(shell dpkg-parsechangelog | egrep
'^Version:' | cut -f2 -d'
install/lib$(LIBRARY_PACKAGE)-java::
install -m 644 dist/$(LIBRARY_PACKAGE).jar
debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar
debian/$(cdbs_curpkg)/usr/share/java/$(LIBRARY_PACKAGE).jar
-
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libcommons-modeler-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
