[pkg-java] r7683 - trunk/plexus-i18n/debian
twerner at alioth.debian.org
twerner at alioth.debian.org
Tue Dec 16 22:24:31 UTC 2008
Author: twerner
Date: 2008-12-16 22:24:31 +0000 (Tue, 16 Dec 2008)
New Revision: 7683
Added:
trunk/plexus-i18n/debian/components.xml
Modified:
trunk/plexus-i18n/debian/
trunk/plexus-i18n/debian/changelog
trunk/plexus-i18n/debian/control
trunk/plexus-i18n/debian/copyright
trunk/plexus-i18n/debian/rules
Log:
* Add plexus component descriptor.
* Add myself to Uploaders.
* Do no longer quote the full text of the Apache-2.0 license in
debian/copyright.
Property changes on: trunk/plexus-i18n/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/plexus-i18n/debian/changelog
===================================================================
--- trunk/plexus-i18n/debian/changelog 2008-12-16 16:31:47 UTC (rev 7682)
+++ trunk/plexus-i18n/debian/changelog 2008-12-16 22:24:31 UTC (rev 7683)
@@ -1,10 +1,17 @@
-plexus-i18n (1.0-beta-7+svn6675-2) UNRELEASED; urgency=low
+plexus-i18n (1.0-beta-7+svn6675-2) experimental; urgency=low
+ [ Michael Koch ]
* Updated watch file to ignore '+svn...' part.
* Added myself to Uploaders.
- -- Michael Koch <konqueror at gmx.de> Sat, 19 Apr 2008 09:33:22 +0200
+ [ Torsten Werner ]
+ * Add plexus component descriptor.
+ * Add myself to Uploaders.
+ * Do no longer quote the full text of the Apache-2.0 license in
+ debian/copyright.
+ -- Torsten Werner <twerner at debian.org> Tue, 16 Dec 2008 23:23:54 +0100
+
plexus-i18n (1.0-beta-7+svn6675-1) unstable; urgency=low
* New upstream release, to correct license problems (resulting in
Added: trunk/plexus-i18n/debian/components.xml
===================================================================
--- trunk/plexus-i18n/debian/components.xml (rev 0)
+++ trunk/plexus-i18n/debian/components.xml 2008-12-16 22:24:31 UTC (rev 7683)
@@ -0,0 +1,9 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ <implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
+ <description></description>
+ </component>
+ </components>
+</component-set>
Modified: trunk/plexus-i18n/debian/control
===================================================================
--- trunk/plexus-i18n/debian/control 2008-12-16 16:31:47 UTC (rev 7682)
+++ trunk/plexus-i18n/debian/control 2008-12-16 22:24:31 UTC (rev 7683)
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>
+Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>
Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java, junit, maven-ant-helper (>= 3), libplexus-container-default-java (>= 1.0-alpha-9-stable-1), libplexus-utils-java (>= 1:1.4.1)
Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
Standards-Version: 3.7.2
Modified: trunk/plexus-i18n/debian/copyright
===================================================================
--- trunk/plexus-i18n/debian/copyright 2008-12-16 16:31:47 UTC (rev 7682)
+++ trunk/plexus-i18n/debian/copyright 2008-12-16 22:24:31 UTC (rev 7683)
@@ -22,189 +22,10 @@
License:
Licensed under the Apache License, Version 2.0 (the "License")
- Apache License, Version 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:
-
- 1. You must give any other recipients of the Work or Derivative
- Works a copy of this License; and
-
- 2. You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- 3. 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
-
- 4. 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.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+The full text of the license can be found in
+`/usr/share/common-licenses/Apache-2.0'.
+
Source files DefaultI18NTest.java and I18NTokenizerTest.java are
licensed under version 1.1 of the license:
The Apache Software License, Version 1.1
Modified: trunk/plexus-i18n/debian/rules
===================================================================
--- trunk/plexus-i18n/debian/rules 2008-12-16 16:31:47 UTC (rev 7682)
+++ trunk/plexus-i18n/debian/rules 2008-12-16 22:24:31 UTC (rev 7683)
@@ -22,6 +22,10 @@
SVN_REV := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/.*+svn//' | sed 's/-.*//')
SVN := http://svn.codehaus.org/plexus/plexus-components/trunk/$(PACKAGE) -r $(SVN_REV)
+makebuilddir/lib$(PACKAGE)-java::
+ install -d build/classes/META-INF/plexus/
+ install -m644 debian/components.xml build/classes/META-INF/plexus/
+
get-orig-source:
echo "Getting version $(VERSION) from $(SVN)"
rm -rf orig_tmp
More information about the pkg-java-commits
mailing list