[pkg-java] r8821 - in trunk/ant/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Thu Jul 2 23:47:19 UTC 2009
Author: ludovicc-guest
Date: 2009-07-02 23:47:19 +0000 (Thu, 02 Jul 2009)
New Revision: 8821
Added:
trunk/ant/debian/ant-optional.poms
trunk/ant/debian/ant.poms
trunk/ant/debian/maven.publishedRules
trunk/ant/debian/maven.rules
trunk/ant/debian/patches/11_ant_underscore_dash_fix.patch
Removed:
trunk/ant/debian/ant-optional.links
trunk/ant/debian/ant.install
Modified:
trunk/ant/debian/ant.links
trunk/ant/debian/changelog
trunk/ant/debian/compat
trunk/ant/debian/control
trunk/ant/debian/copyright
trunk/ant/debian/rules
Log:
* New version
Deleted: trunk/ant/debian/ant-optional.links
===================================================================
--- trunk/ant/debian/ant-optional.links 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/ant-optional.links 2009-07-02 23:47:19 UTC (rev 8821)
@@ -1,17 +0,0 @@
-/usr/share/ant/lib/ant-antlr.jar /usr/share/java/ant-antlr.jar
-/usr/share/ant/lib/ant-apache-bcel.jar /usr/share/java/ant-apache-bcel.jar
-/usr/share/ant/lib/ant-apache-bsf.jar /usr/share/java/ant-apache-bsf.jar
-/usr/share/ant/lib/ant-apache-log4j.jar /usr/share/java/ant-apache-log4j.jar
-/usr/share/ant/lib/ant-apache-oro.jar /usr/share/java/ant-apache-oro.jar
-/usr/share/ant/lib/ant-apache-regexp.jar /usr/share/java/ant-apache-regexp.jar
-/usr/share/ant/lib/ant-commons-logging.jar /usr/share/java/ant-commons-logging.jar
-/usr/share/ant/lib/ant-javamail.jar /usr/share/java/ant-javamail.jar
-/usr/share/ant/lib/ant-jdepend.jar /usr/share/java/ant-jdepend.jar
-/usr/share/ant/lib/ant-nodeps.jar /usr/share/java/ant-nodeps.jar
-/usr/share/ant/lib/ant-swing.jar /usr/share/java/ant-swing.jar
-/usr/share/ant/lib/ant-jmf.jar /usr/share/java/ant-jmf.jar
-/usr/share/ant/lib/ant-apache-resolver.jar /usr/share/java/ant-apache-resolver.jar
-/usr/share/ant/lib/ant-commons-net.jar /usr/share/java/ant-commons-net.jar
-/usr/share/ant/lib/ant-jsch.jar /usr/share/java/ant-jsch.jar
-/usr/share/ant/lib/ant-junit.jar /usr/share/java/ant-junit.jar
-/usr/share/ant/lib/ant-trax.jar /usr/share/java/ant-trax.jar
Added: trunk/ant/debian/ant-optional.poms
===================================================================
--- trunk/ant/debian/ant-optional.poms (rev 0)
+++ trunk/ant/debian/ant-optional.poms 2009-07-02 23:47:19 UTC (rev 8821)
@@ -0,0 +1,18 @@
+src/etc/poms/ant-nodeps/pom.xml
+src/etc/poms/ant-antlr/pom.xml
+src/etc/poms/ant-apache-bcel/pom.xml
+src/etc/poms/ant-apache-bsf/pom.xml
+src/etc/poms/ant-apache-log4j/pom.xml
+src/etc/poms/ant-apache-oro/pom.xml
+src/etc/poms/ant-apache-regexp/pom.xml
+src/etc/poms/ant-apache-resolver/pom.xml
+src/etc/poms/ant-commons-logging/pom.xml
+src/etc/poms/ant-commons-net/pom.xml
+src/etc/poms/ant-javamail/pom.xml
+src/etc/poms/ant-jdepend/pom.xml
+src/etc/poms/ant-jmf/pom.xml
+src/etc/poms/ant-jsch/pom.xml
+src/etc/poms/ant-junit/pom.xml
+src/etc/poms/ant-swing/pom.xml
+src/etc/poms/ant-trax/pom.xml
+
Deleted: trunk/ant/debian/ant.install
===================================================================
--- trunk/ant/debian/ant.install 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/ant.install 2009-07-02 23:47:19 UTC (rev 8821)
@@ -1,3 +0,0 @@
-build/lib/ant.jar /usr/share/ant/lib/
-build/lib/ant-launcher.jar /usr/share/ant/lib/
-build/lib/ant-bootstrap.jar /usr/share/ant/etc/
Modified: trunk/ant/debian/ant.links
===================================================================
--- trunk/ant/debian/ant.links 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/ant.links 2009-07-02 23:47:19 UTC (rev 8821)
@@ -1,5 +1,2 @@
/usr/share/ant/bin/ant /usr/bin/ant
-/usr/share/ant/lib/ant.jar /usr/share/java/ant-1.7.jar
-/usr/share/ant/lib/ant.jar /usr/share/java/ant.jar
-/usr/share/ant/lib/ant-launcher.jar /usr/share/java/ant-launcher.jar
/usr/share/ant/etc/ant-bootstrap.jar /usr/share/java/ant-bootstrap.jar
Added: trunk/ant/debian/ant.poms
===================================================================
--- trunk/ant/debian/ant.poms (rev 0)
+++ trunk/ant/debian/ant.poms 2009-07-02 23:47:19 UTC (rev 8821)
@@ -0,0 +1,4 @@
+src/etc/poms/pom.xml --no-parent
+src/etc/poms/ant/pom.xml
+src/etc/poms/ant-launcher/pom.xml
+
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/changelog 2009-07-02 23:47:19 UTC (rev 8821)
@@ -1,7 +1,25 @@
-ant (1.7.1-1) UNRELEASED; urgency=low
+ant (1.7.1-1) unstable; urgency=low
- * XXX Please use .orig.tar.gz from http://ppa.launchpad.net/ubuntu-java/ubuntu/pool/main/a/ant/
+ * XXX Please use .orig.tar.gz from
+ http://ppa.launchpad.net/ubuntu-java/ubuntu/pool/main/a/ant/
+ [Ludovic Claude]
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add Matthias Klose to Uploaders
+ * Move ant-gcj from Recommends to Suggests for ant binary package
+ (closes: #506220)
+ * Add Build-Depends on libjaxp-1.3-java as xml-apis.jar has moved to this
+ package. Add a Suggests on the same package for ant-optional
+ * Add the Maven POMs to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Remove the full text of the Apache 2.0 license
+
+ [Richard A. Johnson]
+ * Added 11_ant_underscore_dash_fix.patch fixes - to _ conversion LP: #296409
+
+ [Matthias Klose]
* New upstream version (bug fix release).
- mainly a bugfix release.
- has extended support for Java6 features.
@@ -14,7 +32,7 @@
- ant: Recommend default-jdk | java-compiler | java-sdk.
* Fix dangling symlink to ant-bootstrap.jar.
- -- Matthias Klose <doko at debian.org> Mon, 20 Oct 2008 12:26:11 +0200
+ -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 03 Jul 2009 00:42:36 +0100
ant (1.7.0-6) unstable; urgency=low
Modified: trunk/ant/debian/compat
===================================================================
--- trunk/ant/debian/compat 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/compat 2009-07-02 23:47:19 UTC (rev 8821)
@@ -1 +1 @@
-4
+6
Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/control 2009-07-02 23:47:19 UTC (rev 8821)
@@ -1,21 +1,21 @@
Source: ant
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), default-jdk-builddep, libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
-Standards-Version: 3.7.3
+Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>,
+ Matthias Klose <doko at debian.org>
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), default-jdk-builddep, maven-repo-helper, libxerces2-java, libbsf-java (>= 2.3.0rc1), liboro-java, libxalan2-java (>= 2.4.0), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, libjaxp1.3-java
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant
Homepage: http://ant.apache.org/
Package: ant
Architecture: all
-Section: devel
Priority: optional
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libxerces2-java
-Recommends: ant-optional, ant-gcj, default-jdk | java-compiler | java-sdk
-Suggests: ant-doc
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libxerces2-java
+Recommends: ant-optional, default-jdk | java-compiler | java-sdk
+Suggests: ant-doc, ant-gcj
Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
Description: Java based build tool like make
@@ -25,9 +25,8 @@
Package: ant-gcj
Architecture: any
-Section: devel
Priority: optional
-Depends: ant, ${shlibs:Depends}
+Depends: ant, ${misc:Depends}, ${shlibs:Depends}
Description: Java based build tool like make
A system independent (i.e. not shell based) build tool that uses XML
files as "Makefiles". This package contains the scripts and the core
@@ -35,11 +34,10 @@
Package: ant-optional
Architecture: all
-Section: devel
Priority: optional
-Depends: ant (= ${source:Version})
+Depends: ${misc:Depends}, ant (= ${source:Version})
Recommends: ant-optional-gcj
-Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, javacc
+Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), libjaxp1.3-java, junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, javacc
Conflicts: libant1.6-java
Replaces: libant1.6-java
Description: Java based build tool like make - optional libraries
@@ -48,9 +46,8 @@
Package: ant-optional-gcj
Architecture: any
-Section: devel
Priority: optional
-Depends: ant-optional, ${shlibs:Depends}
+Depends: ant-optional, ${misc:Depends}, ${shlibs:Depends}
Description: Java based build tool like make - API documentation and manual
A system independent (i.e. not shell based) build tool that uses XML files
as "Makefiles". This package contains the manual of ant as well as the
@@ -60,6 +57,7 @@
Architecture: all
Section: doc
Priority: optional
+Depends: ${misc:Depends}
Suggests: ant
Description: Java based build tool like make - API documentation and manual
A system independent (i.e. not shell based) build tool that uses XML files
Modified: trunk/ant/debian/copyright
===================================================================
--- trunk/ant/debian/copyright 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/copyright 2009-07-02 23:47:19 UTC (rev 8821)
@@ -15,207 +15,18 @@
Copyright: (C) 2000-2008 Apache Foundation
License:
+ 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
-/*
- * 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.
- *
- * 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.
- */
+ 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.
+
+The full text of the Apache license can be found in
+`/usr/share/common-licenses/Apache-2.0'.
+
Added: trunk/ant/debian/maven.publishedRules
===================================================================
--- trunk/ant/debian/maven.publishedRules (rev 0)
+++ trunk/ant/debian/maven.publishedRules 2009-07-02 23:47:19 UTC (rev 8821)
@@ -0,0 +1,2 @@
+s/ant/org.apache.ant/ * * s/.*/debian/
+
Added: trunk/ant/debian/maven.rules
===================================================================
--- trunk/ant/debian/maven.rules (rev 0)
+++ trunk/ant/debian/maven.rules 2009-07-02 23:47:19 UTC (rev 8821)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+
Added: trunk/ant/debian/patches/11_ant_underscore_dash_fix.patch
===================================================================
--- trunk/ant/debian/patches/11_ant_underscore_dash_fix.patch (rev 0)
+++ trunk/ant/debian/patches/11_ant_underscore_dash_fix.patch 2009-07-02 23:47:19 UTC (rev 8821)
@@ -0,0 +1,12 @@
+diff -Nru ant-1.7.1.orig/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
+--- ant-1.7.1.orig/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java 2008-11-10 10:50:29.000000000 -0600
++++ ant-1.7.1/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java 2008-11-10 10:50:49.000000000 -0600
+@@ -120,7 +120,7 @@
+ : rpmBuildCommand);
+ if (topDir != null) {
+ toExecute.createArgument().setValue("--define");
+- toExecute.createArgument().setValue("_topdir" + topDir);
++ toExecute.createArgument().setValue("_topdir " + topDir);
+ }
+
+ toExecute.createArgument().setLine(command);
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2009-07-02 23:35:44 UTC (rev 8820)
+++ trunk/ant/debian/rules 2009-07-02 23:47:19 UTC (rev 8821)
@@ -20,30 +20,38 @@
# needed for building with bootstrap ant
export ANT_HOME := bootstrap
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=false
else
export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=true
endif
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
JAR_PATH := /usr/share/java
CLASSPATH := ${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/gnumail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-commons-resolver-1.1.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar
build-ant: stamp-build-ant
stamp-build-ant:
# doing bootstrapping
- ln -sf /usr/share/java/xml-apis.jar lib/xml-apis.jar
- ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
+ install -d bootstrap/lib
+ ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/bootstrap/lib/xml-apis.jar
+ ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/bootstrap/lib/xercesImpl.jar
/bin/sh bootstrap.sh
-
+ # remove -SNAPSHOT from the versions in the Maven poms
+ perl -p -i -e 's/-SNAPSHOT//g' `find src/etc/poms/ -name pom.xml`
# the rest
/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -lib ${CLASSPATH} -propertyfile debian/ant.properties jars javadocs
-
+ ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/lib/xml-apis.jar
+ ln -sf /usr/share/java/xercesImpl.jar $(DEB_BUILDDIR)/lib/xercesImpl.jar
touch stamp-build-ant
-
install/ant:: build-ant
+ dh_install -pant
+ mh_installpoms -pant
+ mh_installjar -pant -l src/etc/poms/ant/pom.xml build/lib/ant.jar /usr/share/ant/lib/ant.jar
+ mh_installjar -pant -l src/etc/poms/ant-launcher/pom.xml build/lib/ant-launcher.jar /usr/share/ant/lib/ant-launcher.jar
+ dh_install -pant build/lib/ant-bootstrap.jar /usr/share/ant/etc/
# Installing these files does not work with dh_install because of
# the file permissions
mkdir -p debian/ant/usr/share/ant/bin
@@ -52,6 +60,31 @@
install -m 755 src/script/*.pl debian/ant/usr/share/ant/bin
install/ant-optional:: build-ant
+ dh_install -pant-optional src/etc/ant-update.xsl /usr/share/ant/etc/
+ dh_install -pant-optional src/etc/checkstyle /usr/share/ant/etc/
+ mh_installjar -pant-optional -l src/etc/poms/ant-antlr/pom.xml build/lib/ant-antlr.jar /usr/share/ant/lib/ant-antlr.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-apache-bcel/pom.xml build/lib/ant-apache-bcel.jar /usr/share/ant/lib/ant-apache-bcel.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-apache-bsf/pom.xml build/lib/ant-apache-bsf.jar /usr/share/ant/lib/ant-apache-bsf.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-apache-log4j/pom.xml build/lib/ant-apache-log4j.jar /usr/share/ant/lib/ant-apache-log4j.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-apache-oro/pom.xml build/lib/ant-apache-oro.jar /usr/share/ant/lib/ant-apache-oro.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-apache-regexp/pom.xml build/lib/ant-apache-regexp.jar /usr/share/ant/lib/ant-apache-regexp.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar /usr/share/ant/lib/ant-commons-logging.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-commons-net/pom.xml build/lib/ant-commons-net.jar /usr/share/ant/lib/ant-commons-net.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-javamail/pom.xml build/lib/ant-javamail.jar /usr/share/ant/lib/ant-javamail.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-jdepend/pom.xml build/lib/ant-jdepend.jar /usr/share/ant/lib/ant-jdepend.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-jmf/pom.xml build/lib/ant-jmf.jar /usr/share/ant/lib/ant-jmf.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-nodeps/pom.xml build/lib/ant-nodeps.jar /usr/share/ant/lib/ant-nodeps.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
+ mh_installjar -pant-optional -l src/etc/poms/ant-trax/pom.xml build/lib/ant-trax.jar /usr/share/ant/lib/ant-trax.jar
+ #mh_installjar -pant-optional src/etc/poms/ant-testutil/pom.xml ant-testutil/build/ant-testutil-$(VERSION).jar
+ #mh_installjar -pant-optional src/etc/poms/ant-stylebook/pom.xml ant-stylebook/build/ant-stylebook-$(VERSION).jar
+ #mh_installjar -pant-optional src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar
+ #mh_installjar -pant-optional src/etc/poms/ant-netrexx/pom.xml ant-netrexx/build/ant-netrexx-$(VERSION).jar
+ #mh_installjar -pant-optional src/etc/poms/ant-starteam/pom.xml ant-starteam/build/ant-starteam-$(VERSION).jar
+ #mh_installjar -pant-optional src/etc/poms/ant-weblogic/pom.xml ant-weblogic/build/ant-weblogic-$(VERSION).jar
ifeq ($(with_gcj_native),yes)
install/ant-gcj:: install/ant
@@ -74,3 +107,9 @@
-rm -f gjdoc_rawcomment.cache
-rm -rf bin bootstrap build lib/*.jar
-rm -f stamp-build-ant
+ -rm -rf debian/tmp
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
+
+
Property changes on: trunk/ant/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-java-commits
mailing list