Author: nthykier-guest Date: 2009-11-21 11:27:56 +0000 (Sat, 21 Nov 2009) New Revision: 11094
Modified: trunk/avalon-framework/debian/build.xml trunk/avalon-framework/debian/changelog trunk/avalon-framework/debian/compat trunk/avalon-framework/debian/control trunk/avalon-framework/debian/copyright trunk/avalon-framework/debian/rules Log: avalon-framework (4.2.0-5) unstable; urgency=low * Moved some Build-Depends-Indep to Build-Depends, since they were used to clean the build. * Change Build-Depends to use default-jdk instead of java-gcj-compat. * Depend on "headless" versions of java. (Closes: #551546) * Bumped debhelper to compat 7. * Bumped Standards-Version to 3.8.3. - Changed section to java. - Refer to apache2 license rather than quoting it. - Added Homepage and Vcs-* fields. * Corrected spelling in description. * Added missing ${misc:Depends}. * Set source "1.3" for the java-doc generation to deal javadoc errors. -- Niels Thykier <ni...@thykier.net> Sat, 21 Nov 2009 12:27:27 +0100 Modified: trunk/avalon-framework/debian/build.xml =================================================================== --- trunk/avalon-framework/debian/build.xml 2009-11-20 15:57:22 UTC (rev 11093) +++ trunk/avalon-framework/debian/build.xml 2009-11-21 11:27:56 UTC (rev 11094) @@ -25,16 +25,16 @@ <target name="compile" depends="prepare"> <javac srcdir="${api.dir}" - destdir="${build.dir}" debug="true" nowarn="true" target="1.3"/> + destdir="${build.dir}" debug="true" nowarn="true" source="1.3" target="1.3"/> <javac srcdir="${impl.dir}" - destdir="${build.dir}" debug="true" nowarn="true" target="1.3"/> + destdir="${build.dir}" debug="true" nowarn="true" source="1.3" target="1.3"/> </target> <target name="compile-tests" depends="compile"> <javac srcdir="api/src/test" - destdir="${test.dir}" debug="true" nowarn="true" target="1.3" classpath="${build.dir}"/> + destdir="${test.dir}" debug="true" nowarn="true" classpath="${build.dir}"/> <javac srcdir="impl/src/test" - destdir="${test.dir}" debug="true" nowarn="true" target="1.3" classpath="${build.dir}"/> + destdir="${test.dir}" debug="true" nowarn="true" classpath="${build.dir}"/> </target> <target name="jar" depends="compile-tests"> @@ -44,7 +44,7 @@ </target> <target name="doc"> - <javadoc destdir="${doc.dir}"> + <javadoc destdir="${doc.dir}" source="1.3"> <fileset dir="${api.dir}"/> <fileset dir="${impl.dir}"/> </javadoc> Modified: trunk/avalon-framework/debian/changelog =================================================================== --- trunk/avalon-framework/debian/changelog 2009-11-20 15:57:22 UTC (rev 11093) +++ trunk/avalon-framework/debian/changelog 2009-11-21 11:27:56 UTC (rev 11094) @@ -1,3 +1,20 @@ +avalon-framework (4.2.0-5) unstable; urgency=low + + * Moved some Build-Depends-Indep to Build-Depends, since they were + used to clean the build. + * Change Build-Depends to use default-jdk instead of java-gcj-compat. + * Depend on "headless" versions of java. (Closes: #551546) + * Bumped debhelper to compat 7. + * Bumped Standards-Version to 3.8.3. + - Changed section to java. + - Refer to apache2 license rather than quoting it. + - Added Homepage and Vcs-* fields. + * Corrected spelling in description. + * Added missing ${misc:Depends}. + * Set source "1.3" for the java-doc generation to deal javadoc errors. + + -- Niels Thykier <ni...@thykier.net> Sat, 21 Nov 2009 12:27:27 +0100 + avalon-framework (4.2.0-4) unstable; urgency=low * Use java-gcj-compat instead of kaffe. Closes: #445704. Modified: trunk/avalon-framework/debian/compat =================================================================== --- trunk/avalon-framework/debian/compat 2009-11-20 15:57:22 UTC (rev 11093) +++ trunk/avalon-framework/debian/compat 2009-11-21 11:27:56 UTC (rev 11094) @@ -1 +1 @@ -5 +7 Modified: trunk/avalon-framework/debian/control =================================================================== --- trunk/avalon-framework/debian/control 2009-11-20 15:57:22 UTC (rev 11093) +++ trunk/avalon-framework/debian/control 2009-11-21 11:27:56 UTC (rev 11094) @@ -1,16 +1,20 @@ Source: avalon-framework -Section: libs +Section: java 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 (>= 5), cdbs -Build-Depends-Indep: java-gcj-compat-dev, ant-optional, liblog4j1.2-java, liblogkit-java, libxalan2-java, junit -Standards-Version: 3.7.2 +Uploaders: Arnaud Vandyck <av...@debian.org>, Michael Koch <konque...@gmx.de>, + Niels Thykier <ni...@thykier.net> +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional +Build-Depends-Indep: liblog4j1.2-java, liblogkit-java, libxalan2-java, junit +Standards-Version: 3.8.3 +Homepage: http://excalibur.apache.org/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/avalon-framework +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/avalon-framework Package: libavalon-framework-java Architecture: all -Section: libs -Depends: java-gcj-compat | java1-runtime | java2-runtime +Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, + ${misc:Depends} Suggests: libavalon-framework-java-doc Description: Common framework for Java server applications The Avalon framework consists of interfaces that define @@ -21,7 +25,8 @@ Package: libavalon-framework-java-doc Architecture: all Section: doc +Depends: ${misc:Depends} Suggests: libavalon-framework-java Description: Documentation for Avalon framework - This is the api documentation for Avalon which is a common framework + This is the API documentation for Avalon which is a common framework for Java server applications. Modified: trunk/avalon-framework/debian/copyright =================================================================== --- trunk/avalon-framework/debian/copyright 2009-11-20 15:57:22 UTC (rev 11093) +++ trunk/avalon-framework/debian/copyright 2009-11-21 11:27:56 UTC (rev 11094) @@ -15,184 +15,8 @@ Stefano Mazzocchi stef...@apache.org Leo Simons m...@leosimons.com -Copyright: +Copyright: 1997-2004 The Apache Software Foundation. +License: Apache 2.0 -/* - - 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. - -*/ - +On Debian systems, the complete text of the Apache 2.0 License +can be found in `/usr/share/common-licenses/Apache-2.0'. Modified: trunk/avalon-framework/debian/rules =================================================================== --- trunk/avalon-framework/debian/rules 2009-11-20 15:57:22 UTC (rev 11093) +++ trunk/avalon-framework/debian/rules 2009-11-21 11:27:56 UTC (rev 11094) @@ -6,7 +6,7 @@ VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-) -JAVA_HOME := /usr/lib/jvm/java-gcj +JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar logkit log4j-1.2 xalan2 $(ANT_HOME)/lib/ant-junit.jar junit _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits