[pkg-java] r8803 - trunk/libxerces2-java/debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Thu Jul 2 17:00:43 UTC 2009
Author: ludovicc-guest
Date: 2009-07-02 17:00:42 +0000 (Thu, 02 Jul 2009)
New Revision: 8803
Added:
trunk/libxerces2-java/debian/libxerces2-java.poms
trunk/libxerces2-java/debian/pom.xml
Removed:
trunk/libxerces2-java/debian/libxerces2-java.install
Modified:
trunk/libxerces2-java/debian/changelog
trunk/libxerces2-java/debian/compat
trunk/libxerces2-java/debian/control
trunk/libxerces2-java/debian/copyright
trunk/libxerces2-java/debian/libxerces2-java.links
trunk/libxerces2-java/debian/rules
Log:
* New version
Modified: trunk/libxerces2-java/debian/changelog
===================================================================
--- trunk/libxerces2-java/debian/changelog 2009-07-02 16:43:16 UTC (rev 8802)
+++ trunk/libxerces2-java/debian/changelog 2009-07-02 17:00:42 UTC (rev 8803)
@@ -1,8 +1,19 @@
-libxerces2-java (2.9.1-3) UNRELEASED; urgency=low
+libxerces2-java (2.9.1-3) unstable; urgency=low
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Bump up debhelper to 6
+ * Add the Maven POM to the package,
+ * Add a Build-Depends dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Remove full text of the Apache 2 license from copyright
+
+ [Matthias Klose]
+ * Set java source and target version to 1.4. LP: #264808.
* Depend on default-jre-headless.
- -- Matthias Klose <doko at debian.org> Thu, 31 Jul 2008 11:31:59 +0000
+ -- Ludovic Claude <ludovic.claude at laposte.net> Thu, 07 May 2009 20:44:34 +0100
libxerces2-java (2.9.1-2) unstable; urgency=low
Modified: trunk/libxerces2-java/debian/compat
===================================================================
--- trunk/libxerces2-java/debian/compat 2009-07-02 16:43:16 UTC (rev 8802)
+++ trunk/libxerces2-java/debian/compat 2009-07-02 17:00:42 UTC (rev 8803)
@@ -1 +1 @@
-4
+6
Modified: trunk/libxerces2-java/debian/control
===================================================================
--- trunk/libxerces2-java/debian/control 2009-07-02 16:43:16 UTC (rev 8802)
+++ trunk/libxerces2-java/debian/control 2009-07-02 17:00:42 UTC (rev 8803)
@@ -1,18 +1,18 @@
Source: libxerces2-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>, Marcus Better <marcus at better.se>, Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), default-jdk-builddep, ant, libxml-commons-resolver1.1-java, libjaxp1.3-java, libstylebook-java
-Standards-Version: 3.7.3
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 6), default-jdk-builddep, ant,
+ maven-repo-helper, libxml-commons-resolver1.1-java, libjaxp1.3-java, libstylebook-java
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxerces2-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxerces2-java
Homepage: http://xerces.apache.org/xerces2-j/
Package: libxerces2-java
Architecture: all
-Section: libs
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjaxp1.3-java
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libjaxp1.3-java
Recommends: libxerces2-java-gcj
Suggests: libxerces2-java-doc
Description: Validating XML parser for Java with DOM level 3 support
@@ -41,7 +41,6 @@
Package: libxerces2-java-gcj
Architecture: any
-Section: libs
Depends: libxerces2-java (>= ${source:Version}), libjaxp1.3-java-gcj, ${misc:Depends}, ${shlibs:Depends}
Description: Validating XML parser for Java with DOM level 3 support (native code)
The Xerces2 Java parser is the reference implementation of XNI, the
@@ -52,6 +51,7 @@
Package: libxerces2-java-doc
Architecture: all
Section: doc
+Depends: ${misc:Depends}
Suggests: libxerces2-java, doc-html-w3
Description: Validating XML parser for Java -- Documentation and examples
The Xerces2 Java parser is the reference implementation of XNI, the
Modified: trunk/libxerces2-java/debian/copyright
===================================================================
--- trunk/libxerces2-java/debian/copyright 2009-07-02 16:43:16 UTC (rev 8802)
+++ trunk/libxerces2-java/debian/copyright 2009-07-02 17:00:42 UTC (rev 8803)
@@ -8,208 +8,21 @@
Copyright (C) 1999-2006 The Apache Software Foundation.
Copyright (C) 2000-2001 World Wide Web Consortium.
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ http://www.apache.org/licenses/LICENSE-2.0
- 1. Definitions.
+ 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.
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
+The full text of the license can be found in
+'/usr/share/common-licenses/Apache-2.0'.
- "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.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- 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.
-
Parts of Xerces2 are covered by the following license:
W3C® SOFTWARE NOTICE AND LICENSE
Deleted: trunk/libxerces2-java/debian/libxerces2-java.install
===================================================================
--- trunk/libxerces2-java/debian/libxerces2-java.install 2009-07-02 16:43:16 UTC (rev 8802)
+++ trunk/libxerces2-java/debian/libxerces2-java.install 2009-07-02 17:00:42 UTC (rev 8803)
@@ -1 +0,0 @@
-build/xercesImpl.jar /usr/share/java
Modified: trunk/libxerces2-java/debian/libxerces2-java.links
===================================================================
--- trunk/libxerces2-java/debian/libxerces2-java.links 2009-07-02 16:43:16 UTC (rev 8802)
+++ trunk/libxerces2-java/debian/libxerces2-java.links 2009-07-02 17:00:42 UTC (rev 8803)
@@ -1 +1,2 @@
/usr/share/java/jaxp-1.3.jar /usr/share/java/xmlParserAPIs.jar
+/usr/share/java/jaxp-1.3.jar /usr/share/maven-repo/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar
Added: trunk/libxerces2-java/debian/libxerces2-java.poms
===================================================================
--- trunk/libxerces2-java/debian/libxerces2-java.poms (rev 0)
+++ trunk/libxerces2-java/debian/libxerces2-java.poms 2009-07-02 17:00:42 UTC (rev 8803)
@@ -0,0 +1,2 @@
+debian/pom.xml --no-parent
+
Added: trunk/libxerces2-java/debian/pom.xml
===================================================================
--- trunk/libxerces2-java/debian/pom.xml (rev 0)
+++ trunk/libxerces2-java/debian/pom.xml 2009-07-02 17:00:42 UTC (rev 8803)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
+ </parent>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ <name>Xerces2 Java Parser</name>
+ <description>
+ Xerces2 is the next generation of high performance, fully compliant XML parsers in the
+ Apache Xerces family. This new version of Xerces introduces the Xerces Native Interface (XNI),
+ a complete framework for building parser components and configurations that is extremely
+ modular and easy to program.
+ </description>
+ <url>http://xerces.apache.org/xerces2-j</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.2</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ </build>
+
+</project>
\ No newline at end of file
Modified: trunk/libxerces2-java/debian/rules
===================================================================
--- trunk/libxerces2-java/debian/rules 2009-07-02 16:43:16 UTC (rev 8802)
+++ trunk/libxerces2-java/debian/rules 2009-07-02 17:00:42 UTC (rev 8803)
@@ -1,12 +1,18 @@
#!/usr/bin/make -f
# debian/rules file for libxerces2-java (uses cdbs)
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
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 := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+ANT_OPTS = -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
include /usr/share/gcj/debian_defaults
ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
@@ -23,9 +29,9 @@
DEB_ANT_BUILD_TARGET := jar sampjar javadocs
#docs
-install/libxerces2-java::
- mkdir -p debian/libxerces2-java/usr/share/java
- install -m 644 build/xercesImpl.jar debian/libxerces2-java/usr/share/java/
+install/$(PACKAGE)::
+ mh_installpoms -p$(PACKAGE);
+ mh_installjar -p$(PACKAGE) -l debian/pom.xml $(DEB_BUILDDIR)/build/xercesImpl.jar
ifeq ($(with_gcj_native),yes)
install/libxerces2-java-gcj:: install/libxerces2-java
@@ -34,7 +40,15 @@
clean::
rm -rf build
+ -rm -rf debian/tmp
binary-post-install/libxerces2-java-doc::
dh_install -plibxerces2-java-doc build/docs/javadocs/* \
usr/share/doc/libxerces2-java-doc/api
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
+
+get-orig-pom:
+ wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/xerces/xercesImpl/$(VERSION)/xercesImpl-$(VERSION).pom
+
More information about the pkg-java-commits
mailing list