[pkg-java] r14535 - trunk/plexus-velocity/debian
Torsten Werner
twerner at alioth.debian.org
Sun Aug 28 21:09:43 UTC 2011
Author: twerner
Date: 2011-08-28 21:09:42 +0000 (Sun, 28 Aug 2011)
New Revision: 14535
Added:
trunk/plexus-velocity/debian/README.source
trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base.api
trunk/plexus-velocity/debian/libplexus-velocity-java-doc.install
trunk/plexus-velocity/debian/maven.cleanIgnoreRules
trunk/plexus-velocity/debian/maven.ignoreRules
trunk/plexus-velocity/debian/maven.properties
trunk/plexus-velocity/debian/maven.publishedRules
Removed:
trunk/plexus-velocity/debian/build.properties
trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base
Modified:
trunk/plexus-velocity/debian/changelog
trunk/plexus-velocity/debian/control
trunk/plexus-velocity/debian/copyright
trunk/plexus-velocity/debian/libplexus-velocity-java.poms
trunk/plexus-velocity/debian/maven.rules
trunk/plexus-velocity/debian/orig-tar.sh
trunk/plexus-velocity/debian/rules
trunk/plexus-velocity/debian/watch
Log:
* Use Maven to build the package.
* Regenerate debian/copyright.
Added: trunk/plexus-velocity/debian/README.source
===================================================================
--- trunk/plexus-velocity/debian/README.source (rev 0)
+++ trunk/plexus-velocity/debian/README.source 2011-08-28 21:09:42 UTC (rev 14535)
@@ -0,0 +1,9 @@
+Information about plexus-velocity
+------------------------------
+
+This package was debianized using the mh_make command
+from the maven-debian-helper package.
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
Deleted: trunk/plexus-velocity/debian/build.properties
===================================================================
--- trunk/plexus-velocity/debian/build.properties 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/build.properties 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1,2 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
Modified: trunk/plexus-velocity/debian/changelog
===================================================================
--- trunk/plexus-velocity/debian/changelog 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/changelog 2011-08-28 21:09:42 UTC (rev 14535)
@@ -6,8 +6,10 @@
* Update Standards-Version: 3.9.1.
* Switch to source format 3.0.
* Change Depends: classpath-doc to default-jdk-doc. (Closes: #567290)
+ * Use Maven to build the package.
+ * Regenerate debian/copyright.
- -- Torsten Werner <twerner at debian.org> Sun, 28 Aug 2011 22:56:35 +0200
+ -- Torsten Werner <twerner at debian.org> Sun, 28 Aug 2011 23:07:08 +0200
plexus-velocity (1.1.7-3) unstable; urgency=low
Modified: trunk/plexus-velocity/debian/control
===================================================================
--- trunk/plexus-velocity/debian/control 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/control 2011-08-28 21:09:42 UTC (rev 14535)
@@ -3,20 +3,19 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>, Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
- libcommons-collections-java,
- libplexus-containers-java, velocity, junit, junit-doc, default-jdk-doc
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libcommons-collections-java, libplexus-container-default-java, default-jdk-doc,
+ libcommons-collections-java-doc, libplexus-container-default-java-doc,
+ libmaven-javadoc-plugin-java
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-velocity
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-velocity
-Homepage: http://plexus.codehaus.org/
+Homepage: http://plexus.codehaus.org/plexus-components/plexus-velocity/
Package: libplexus-velocity-java
Architecture: all
-Section: java
-Depends: ${misc:Depends}, libcommons-collections-java,
- libplexus-containers-java, velocity
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
Suggests: libplexus-velocity-java-doc
Description: Plexus component interface to velocity
The Plexus project provides a full software stack for creating and executing
@@ -41,7 +40,8 @@
Package: libplexus-velocity-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, default-jdk-doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
Suggests: libplexus-velocity-java
Description: API Documentation for plexus-velocity
The Plexus project provides a full software stack for creating and executing
Modified: trunk/plexus-velocity/debian/copyright
===================================================================
--- trunk/plexus-velocity/debian/copyright 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/copyright 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1,237 +1,20 @@
-This package was debianized by
- Trygve Laugstol <trygvis at inamo.no>
- Paul Cager <paul-debian at home.paulcager.org>
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Plexus Velocity Component
+Source: http://plexus.codehaus.org/plexus-components/plexus-velocity/
-The Debian packaging is Copyright (c) 2007 Trygve Laugstol and is licensed under
-the GNU General Public License version 2. On Debian systems, the complete text
-of the GNU General Public License version 2 can be found in
-'/usr/share/common-licenses/GPL-2'.
+Files: *
+Copyright: 2001-2006 Codehaus Foundation
+License: Apache-2.0
+Files: debian/*
+Copyright: 2007 Trygve Laugstol
+ 2011, Torsten Werner <Torsten Werner <twerner at debian.org>>
+License: GPL-2
-plexus-velocity was downloaded from
- http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
-Upstream Authors:
- The Apache Software Foundation
- The Codehaus Foundation
-
-
-Copyright:
- Copyright (C) 2001-2006 Codehaus 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
-
- 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.
-
-/*
- * 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.
- */
+License: GPL-2
+ On Debian GNU/Linux system you can find the complete text of the
+ GPL-2 license in '/usr/share/common-licenses/GPL-2'
Deleted: trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base
===================================================================
--- trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1,9 +0,0 @@
-Document: libplexus-velocity-java
-Title: API Javadoc for libplexus-velocity
-Author: plexus-velocity developers
-Abstract: This is the API Javadoc provided by the libplexus-velocity library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libplexus-velocity-java/api/index.html
-Files: /usr/share/doc/libplexus-velocity-java/api/*
Copied: trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base.api (from rev 14533, trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base)
===================================================================
--- trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base.api (rev 0)
+++ trunk/plexus-velocity/debian/libplexus-velocity-java-doc.doc-base.api 2011-08-28 21:09:42 UTC (rev 14535)
@@ -0,0 +1,10 @@
+Document: libplexus-velocity-java
+Title: API Javadoc for Plexus Velocity Component
+Author: Plexus Velocity Component developers
+Abstract: This is the API Javadoc provided for the
+ libplexus-velocity-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libplexus-velocity-java/api/index.html
+Files: /usr/share/doc/libplexus-velocity-java/api/*
Added: trunk/plexus-velocity/debian/libplexus-velocity-java-doc.install
===================================================================
--- trunk/plexus-velocity/debian/libplexus-velocity-java-doc.install (rev 0)
+++ trunk/plexus-velocity/debian/libplexus-velocity-java-doc.install 2011-08-28 21:09:42 UTC (rev 14535)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libplexus-velocity-java/api
+
Modified: trunk/plexus-velocity/debian/libplexus-velocity-java.poms
===================================================================
--- trunk/plexus-velocity/debian/libplexus-velocity-java.poms 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/libplexus-velocity-java.poms 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1 +1,26 @@
-pom.xml --no-parent
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM or
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar
+# it will be installed with mh_install.
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
+# temporarily for certain artifacts such as Javadoc jars.
+#
+pom.xml --no-parent --has-package-version
Added: trunk/plexus-velocity/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/plexus-velocity/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/plexus-velocity/debian/maven.cleanIgnoreRules 2011-08-28 21:09:42 UTC (rev 14535)
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM before mvn clean is called
+# junit junit jar s/3\\..*/3.x/
+
Added: trunk/plexus-velocity/debian/maven.ignoreRules
===================================================================
--- trunk/plexus-velocity/debian/maven.ignoreRules (rev 0)
+++ trunk/plexus-velocity/debian/maven.ignoreRules 2011-08-28 21:09:42 UTC (rev 14535)
@@ -0,0 +1,16 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
Added: trunk/plexus-velocity/debian/maven.properties
===================================================================
--- trunk/plexus-velocity/debian/maven.properties (rev 0)
+++ trunk/plexus-velocity/debian/maven.properties 2011-08-28 21:09:42 UTC (rev 14535)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/plexus-velocity/debian/maven.publishedRules
===================================================================
--- trunk/plexus-velocity/debian/maven.publishedRules (rev 0)
+++ trunk/plexus-velocity/debian/maven.publishedRules 2011-08-28 21:09:42 UTC (rev 14535)
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
Modified: trunk/plexus-velocity/debian/maven.rules
===================================================================
--- trunk/plexus-velocity/debian/maven.rules 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/maven.rules 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1,4 +1,22 @@
-s/velocity/org.apache.velocity/ * * s/.*/debian/
-commons-collections commons-collections jar s/2\..*/2.x/
-commons-collections commons-collections jar s/3\..*/3.x/
-junit junit jar s/3\..*/3.x/
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-velocity jar s/.*/debian/ * *
+commons-collections commons-collections * s/2\..*/2.x/ * *
+s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
Modified: trunk/plexus-velocity/debian/orig-tar.sh
===================================================================
--- trunk/plexus-velocity/debian/orig-tar.sh 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/orig-tar.sh 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1,19 +1,16 @@
#!/bin/sh -e
-# $2 = version
+VERSION=$2
+TAR=../plexus-velocity_$VERSION.orig.tar.gz
+DIR=plexus-velocity-$VERSION
+TAG=$(echo "plexus-velocity-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-TAR=../plexus-velocity_$2.orig.tar.gz
-DIR=plexus-velocity-$2
-TAG=plexus-velocity-$2
-
-svn export http://svn.codehaus.org/plexus/plexus-components/tags/$TAG/ $DIR
-tar -c -z -f $TAR $DIR
+svn export http://svn.codehaus.org/plexus/plexus-components/tags/${TAG}/ $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
rm -rf $DIR ../$TAG
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
fi
-
Modified: trunk/plexus-velocity/debian/rules
===================================================================
--- trunk/plexus-velocity/debian/rules 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/rules 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1,27 +1,9 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps ant-trax ant-junit junit \
- commons-collections plexus-container-default velocity
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS := build/api
+JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- uscan --download-version $(VERSION) --force-download --rename
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
-
-clean::
- -rm -rf debian/tmp
-
-binary-post-install/lib$(PACKAGE)-java-doc::
- dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
Modified: trunk/plexus-velocity/debian/watch
===================================================================
--- trunk/plexus-velocity/debian/watch 2011-08-28 20:59:07 UTC (rev 14534)
+++ trunk/plexus-velocity/debian/watch 2011-08-28 21:09:42 UTC (rev 14535)
@@ -1,4 +1,4 @@
version=3
-http://svn.codehaus.org/plexus/plexus-components/tags/ \
- plexus-velocity-(.*)/ debian debian/orig-tar.sh
-
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+ http://svn.codehaus.org/plexus/plexus-components/tags/ \
+ plexus-velocity-(\d.*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list