[pkg-java] r14436 - in tags/maven-reporting-impl: . 2.0.5-1/debian 2.0.5-1/debian/patches

Torsten Werner twerner at alioth.debian.org
Tue Aug 23 21:55:07 UTC 2011


Author: twerner
Date: 2011-08-23 21:55:07 +0000 (Tue, 23 Aug 2011)
New Revision: 14436

Added:
   tags/maven-reporting-impl/2.0.5-1/
   tags/maven-reporting-impl/2.0.5-1/debian/README.source
   tags/maven-reporting-impl/2.0.5-1/debian/TODO
   tags/maven-reporting-impl/2.0.5-1/debian/changelog
   tags/maven-reporting-impl/2.0.5-1/debian/control
   tags/maven-reporting-impl/2.0.5-1/debian/copyright
   tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.doc-base.api
   tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.install
   tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java.poms
   tags/maven-reporting-impl/2.0.5-1/debian/maven.cleanIgnoreRules
   tags/maven-reporting-impl/2.0.5-1/debian/maven.ignoreRules
   tags/maven-reporting-impl/2.0.5-1/debian/maven.properties
   tags/maven-reporting-impl/2.0.5-1/debian/maven.publishedRules
   tags/maven-reporting-impl/2.0.5-1/debian/maven.rules
   tags/maven-reporting-impl/2.0.5-1/debian/orig-tar.sh
   tags/maven-reporting-impl/2.0.5-1/debian/patches/0001-support-doxia-1.1.patch
   tags/maven-reporting-impl/2.0.5-1/debian/patches/series
   tags/maven-reporting-impl/2.0.5-1/debian/rules
   tags/maven-reporting-impl/2.0.5-1/debian/source/
   tags/maven-reporting-impl/2.0.5-1/debian/watch
Removed:
   tags/maven-reporting-impl/2.0.5-1/debian/README.source
   tags/maven-reporting-impl/2.0.5-1/debian/build.properties
   tags/maven-reporting-impl/2.0.5-1/debian/changelog
   tags/maven-reporting-impl/2.0.5-1/debian/control
   tags/maven-reporting-impl/2.0.5-1/debian/copyright
   tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java.poms
   tags/maven-reporting-impl/2.0.5-1/debian/maven.rules
   tags/maven-reporting-impl/2.0.5-1/debian/orig-tar.sh
   tags/maven-reporting-impl/2.0.5-1/debian/patches/doxia1_1.patch
   tags/maven-reporting-impl/2.0.5-1/debian/patches/series
   tags/maven-reporting-impl/2.0.5-1/debian/rules
   tags/maven-reporting-impl/2.0.5-1/debian/watch
Log:
[svn-buildpackage] Tagging maven-reporting-impl 2.0.5-1

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/README.source
===================================================================
--- trunk/maven-reporting-impl/debian/README.source	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/README.source	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.

Copied: tags/maven-reporting-impl/2.0.5-1/debian/README.source (from rev 14435, trunk/maven-reporting-impl/debian/README.source)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/README.source	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/README.source	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,9 @@
+Information about maven-reporting-impl
+------------------------------
+
+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.

Copied: tags/maven-reporting-impl/2.0.5-1/debian/TODO (from rev 14435, trunk/maven-reporting-impl/debian/TODO)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/TODO	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/TODO	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1 @@
+- fix tests

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/build.properties
===================================================================
--- trunk/maven-reporting-impl/debian/build.properties	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/build.properties	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,3 +0,0 @@
-javadoc.dir=target/api
-build.directory=target
-maven.test.skip=true

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/changelog
===================================================================
--- trunk/maven-reporting-impl/debian/changelog	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/changelog	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,40 +0,0 @@
-maven-reporting-impl (2.0.4.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Build-Depends on debhelper >= 7.
-  * Added debian/README.source.
-  * Added myself to Uploaders.
-  * Updated Standards-Version to 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 22:26:24 +0200
-
-maven-reporting-impl (2.0.4.1-4) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Fri, 14 Aug 2009 15:14:02 +0200
-
-maven-reporting-impl (2.0.4.1-3) experimental; urgency=low
-
-  * Change section to java, bump up Standards-Version to 3.8.1
-  * Add the Maven POM 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 Depends on Java runtimes as it is a library
-  * Replace the dependency on maven2 to libmaven2-core-java
-  * Add a Build-Depends on quilt and use it to patch a file for doxia 1.1
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 14 May 2009 17:39:00 +0100
-
-maven-reporting-impl (2.0.4.1-2) unstable; urgency=low
-
-  * Fix Vcs-* and Homepage headers in debian/control.
-
- -- Torsten Werner <twerner at debian.org>  Fri, 26 Dec 2008 01:08:03 +0100
-
-maven-reporting-impl (2.0.4.1-1) unstable; urgency=low
-
-  * Initial release. (Closes: #507910)
-
- -- Torsten Werner <twerner at debian.org>  Thu, 04 Dec 2008 19:29:26 +0100

Copied: tags/maven-reporting-impl/2.0.5-1/debian/changelog (from rev 14435, trunk/maven-reporting-impl/debian/changelog)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/changelog	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/changelog	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,50 @@
+maven-reporting-impl (2.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update Standards-Version: 3.9.1.
+  * Switch to source format 3.0.
+  * Refresh patch.
+  * Use Maven to build the package but do not build tests because they FTBFS.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 23 Aug 2011 23:43:26 +0200
+
+maven-reporting-impl (2.0.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Depends on debhelper >= 7.
+  * Added debian/README.source.
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Sat, 26 Sep 2009 22:26:24 +0200
+
+maven-reporting-impl (2.0.4.1-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 14 Aug 2009 15:14:02 +0200
+
+maven-reporting-impl (2.0.4.1-3) experimental; urgency=low
+
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Add the Maven POM 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 Depends on Java runtimes as it is a library
+  * Replace the dependency on maven2 to libmaven2-core-java
+  * Add a Build-Depends on quilt and use it to patch a file for doxia 1.1
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 14 May 2009 17:39:00 +0100
+
+maven-reporting-impl (2.0.4.1-2) unstable; urgency=low
+
+  * Fix Vcs-* and Homepage headers in debian/control.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 26 Dec 2008 01:08:03 +0100
+
+maven-reporting-impl (2.0.4.1-1) unstable; urgency=low
+
+  * Initial release. (Closes: #507910)
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 04 Dec 2008 19:29:26 +0100

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/control
===================================================================
--- trunk/maven-reporting-impl/debian/control	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/control	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,35 +0,0 @@
-Source: maven-reporting-impl
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, quilt, default-jdk
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
- libmaven2-core-java, libdoxia-java, libcommons-validator-java, 
- libplexus-utils-java, libdoxia-sitetools-java
-Standards-Version: 3.8.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-reporting-impl
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-reporting-impl
-Homepage: http://maven.apache.org/shared/maven-reporting-impl/
-
-Package: libmaven-reporting-impl-java
-Architecture: all
-Depends: libmaven2-core-java, libdoxia-java, libcommons-validator-java,
- libplexus-utils-java, libdoxia-sitetools-java, ${misc:Depends}
-Description: Maven Reporting API Implementation
- Maven is a software project management and comprehension tool. Based on the
- concept of a project object model (POM), Maven can manage a project's build,
- reporting and documentation from a central piece of information.
- .
- Maven's primary goal is to allow a developer to comprehend the complete
- state of a development effort in the shortest period of time. In order to
- attain this goal there are several areas of concern that Maven attempts
- to deal with:
- .
-    * Making the build process easy
-    * Providing a uniform build system
-    * Providing quality project information
-    * Providing guidelines for best practices development
-    * Allowing transparent migration to new features
- .
- This package implements the Maven Reporting API.

Copied: tags/maven-reporting-impl/2.0.5-1/debian/control (from rev 14435, trunk/maven-reporting-impl/debian/control)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/control	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/control	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,60 @@
+Source: maven-reporting-impl
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libcommons-validator-java, libdoxia-java, libdoxia-sitetools-java, libmaven-doxia-tools-java,  
+ libmaven2-core-java, libplexus-utils-java, default-jdk-doc, libdoxia-java-doc,  
+ libmaven2-core-java-doc, libplexus-utils-java-doc, libmaven-javadoc-plugin-java 
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-reporting-impl
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-reporting-impl
+Homepage: http://maven.apache.org/shared/maven-reporting-impl/
+
+Package: libmaven-reporting-impl-java
+Architecture: all
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libmaven-reporting-impl-java-doc
+Description: Maven Reporting API Implementation
+ Maven is a software project management and comprehension tool. Based on the
+ concept of a project object model (POM), Maven can manage a project's build,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+    * Making the build process easy
+    * Providing a uniform build system
+    * Providing quality project information
+    * Providing guidelines for best practices development
+    * Allowing transparent migration to new features
+ .
+ This package implements the Maven Reporting API.
+
+Package: libmaven-reporting-impl-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libmaven-reporting-impl-java
+Description: Documentation for Maven Reporting API Implementation
+ Maven is a software project management and comprehension tool. Based on the
+ concept of a project object model (POM), Maven can manage a project's build,
+ reporting and documentation from a central piece of information.
+ .
+ Maven's primary goal is to allow a developer to comprehend the complete
+ state of a development effort in the shortest period of time. In order to
+ attain this goal there are several areas of concern that Maven attempts
+ to deal with:
+ .
+    * Making the build process easy
+    * Providing a uniform build system
+    * Providing quality project information
+    * Providing guidelines for best practices development
+    * Allowing transparent migration to new features
+ .
+ This package contains the API documentation of libmaven-reporting-impl-java.

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/copyright
===================================================================
--- trunk/maven-reporting-impl/debian/copyright	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/copyright	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,29 +0,0 @@
-This package was debianized by Torsten Werner <twerner at debian.org>.
-
-The Debian packaging is Copyright (c) 2008 Torsten Werner and is
-licensed under the GNU General Public License version 3. On Debian
-systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL-3'.
-
-It was downloaded from <http://maven.apache.org>.
-
-Upstream author: Vincent Siveton <vincent.siveton at gmail.com>
-
-Copyright: 2001-2005 Apache Software 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.
-
-On Debian systems, the complete text of the Apache License
-version 2.0 can be found in /usr/share/common-licenses/Apache-2.0

Copied: tags/maven-reporting-impl/2.0.5-1/debian/copyright (from rev 14435, trunk/maven-reporting-impl/debian/copyright)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/copyright	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/copyright	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,16 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Maven Reporting Implementation
+Upstream-Contact:  Vincent Siveton <vincent.siveton at gmail.com> as Java Developer 
+Source: http://maven.apache.org/shared/maven-reporting-impl/
+
+Files: *
+Copyright: 2001-2011, Vincent Siveton <vincent.siveton at gmail.com>
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2008-2011, Torsten Werner <twerner at debian.org>
+License: Apache-2.0
+
+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'

Copied: tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.doc-base.api (from rev 14435, trunk/maven-reporting-impl/debian/libmaven-reporting-impl-java-doc.doc-base.api)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.doc-base.api	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.doc-base.api	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,10 @@
+Document: libmaven-reporting-impl-java
+Title: API Javadoc for Maven Reporting Implementation
+Author: Maven Reporting Implementation developers
+Abstract: This is the API Javadoc provided for the
+ libmaven-reporting-impl-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmaven-reporting-impl-java/api/index.html
+Files: /usr/share/doc/libmaven-reporting-impl-java/api/*

Copied: tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.install (from rev 14435, trunk/maven-reporting-impl/debian/libmaven-reporting-impl-java-doc.install)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.install	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java-doc.install	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmaven-reporting-impl-java/api
+

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java.poms
===================================================================
--- trunk/maven-reporting-impl/debian/libmaven-reporting-impl-java.poms	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java.poms	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1 +0,0 @@
-pom.xml --no-parent

Copied: tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java.poms (from rev 14435, trunk/maven-reporting-impl/debian/libmaven-reporting-impl-java.poms)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java.poms	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/libmaven-reporting-impl-java.poms	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,26 @@
+# 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

Copied: tags/maven-reporting-impl/2.0.5-1/debian/maven.cleanIgnoreRules (from rev 14435, trunk/maven-reporting-impl/debian/maven.cleanIgnoreRules)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/maven.cleanIgnoreRules	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/maven.cleanIgnoreRules	2011-08-23 21:55:07 UTC (rev 14436)
@@ -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/
+

Copied: tags/maven-reporting-impl/2.0.5-1/debian/maven.ignoreRules (from rev 14435, trunk/maven-reporting-impl/debian/maven.ignoreRules)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/maven.ignoreRules	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/maven.ignoreRules	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,17 @@
+# 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/
+
+junit-addons junit-addons * * * *

Copied: tags/maven-reporting-impl/2.0.5-1/debian/maven.properties (from rev 14435, trunk/maven-reporting-impl/debian/maven.properties)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/maven.properties	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/maven.properties	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+maven.test.skip=true
+

Copied: tags/maven-reporting-impl/2.0.5-1/debian/maven.publishedRules (from rev 14435, trunk/maven-reporting-impl/debian/maven.publishedRules)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/maven.publishedRules	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/maven.publishedRules	2011-08-23 21:55:07 UTC (rev 14436)
@@ -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/
+

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/maven.rules
===================================================================
--- trunk/maven-reporting-impl/debian/maven.rules	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/maven.rules	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1 +0,0 @@
-junit junit jar s/3\..*/3.x/

Copied: tags/maven-reporting-impl/2.0.5-1/debian/maven.rules (from rev 14435, trunk/maven-reporting-impl/debian/maven.rules)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/maven.rules	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/maven.rules	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,19 @@
+# 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.apache.maven.reporting maven-reporting-impl jar s/.*/debian/ * *

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/orig-tar.sh
===================================================================
--- trunk/maven-reporting-impl/debian/orig-tar.sh	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/orig-tar.sh	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-TAR=../maven-reporting-impl_$2.orig.tar.gz
-DIR=maven-reporting-impl-$2
-TAG=maven-reporting-impl-$2
-
-svn export http://svn.apache.org/repos/asf/maven/shared/tags/$TAG $DIR
-tar -c -z -f $TAR $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"
-fi

Copied: tags/maven-reporting-impl/2.0.5-1/debian/orig-tar.sh (from rev 14435, trunk/maven-reporting-impl/debian/orig-tar.sh)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/orig-tar.sh	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/orig-tar.sh	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../maven-reporting-impl_$VERSION.orig.tar.gz
+DIR=maven-reporting-impl-$VERSION
+TAG=$(echo "maven-reporting-impl-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
+
+svn export http://svn.apache.org/repos/asf/maven/shared/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"
+fi

Copied: tags/maven-reporting-impl/2.0.5-1/debian/patches/0001-support-doxia-1.1.patch (from rev 14434, trunk/maven-reporting-impl/debian/patches/0001-support-doxia-1.1.patch)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/patches/0001-support-doxia-1.1.patch	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/patches/0001-support-doxia-1.1.patch	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,22 @@
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Tue, 23 Aug 2011 23:30:58 +0200
+Subject: [PATCH] support doxia 1.1
+
+---
+ .../apache/maven/reporting/sink/SinkFactory.java   |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java b/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
+index 2a51f13..dd716c5 100644
+--- a/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
++++ b/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
+@@ -19,7 +19,7 @@ package org.apache.maven.reporting.sink;
+  * under the License.
+  */
+ 
+-import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
++import org.apache.maven.doxia.sink.render.RenderingContext;
+ import org.apache.maven.doxia.sink.Sink;
+ import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.apache.maven.doxia.siterenderer.RendererException;
+-- 

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/patches/doxia1_1.patch
===================================================================
--- trunk/maven-reporting-impl/debian/patches/doxia1_1.patch	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/patches/doxia1_1.patch	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,11 +0,0 @@
---- a/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
-+++ b/src/main/java/org/apache/maven/reporting/sink/SinkFactory.java
-@@ -16,7 +16,7 @@
-  * limitations under the License.
-  */
- 
--import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
-+import org.apache.maven.doxia.sink.render.RenderingContext;
- import org.apache.maven.doxia.sink.Sink;
- import org.apache.maven.doxia.siterenderer.Renderer;
- import org.apache.maven.doxia.siterenderer.RendererException;

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/patches/series
===================================================================
--- trunk/maven-reporting-impl/debian/patches/series	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/patches/series	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1 +0,0 @@
-doxia1_1.patch

Copied: tags/maven-reporting-impl/2.0.5-1/debian/patches/series (from rev 14434, trunk/maven-reporting-impl/debian/patches/series)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/patches/series	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/patches/series	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1 @@
+0001-support-doxia-1.1.patch

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/rules
===================================================================
--- trunk/maven-reporting-impl/debian/rules	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/rules	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,26 +0,0 @@
-#!/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/rules/patchsys-quilt.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := ant-nodeps doxia-sink-api doxia-site-renderer maven-core maven-reporting-api \
-  maven-plugin-api maven-project doxia-module-xhtml doxia-core doxia-logging-api \
-  doxia-decoration-model commons-validator plexus-utils
-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             := target/api
-
-get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
-
-clean::
-	-rm -rf debian/tmp

Copied: tags/maven-reporting-impl/2.0.5-1/debian/rules (from rev 14435, trunk/maven-reporting-impl/debian/rules)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/rules	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/rules	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Deleted: tags/maven-reporting-impl/2.0.5-1/debian/watch
===================================================================
--- trunk/maven-reporting-impl/debian/watch	2011-08-23 21:21:33 UTC (rev 14433)
+++ tags/maven-reporting-impl/2.0.5-1/debian/watch	2011-08-23 21:55:07 UTC (rev 14436)
@@ -1,3 +0,0 @@
-version=3
-http://svn.apache.org/repos/asf/maven/shared/tags/ maven-reporting-impl-(.*)/ \
-  debian debian/orig-tar.sh

Copied: tags/maven-reporting-impl/2.0.5-1/debian/watch (from rev 14435, trunk/maven-reporting-impl/debian/watch)
===================================================================
--- tags/maven-reporting-impl/2.0.5-1/debian/watch	                        (rev 0)
+++ tags/maven-reporting-impl/2.0.5-1/debian/watch	2011-08-23 21:55:07 UTC (rev 14436)
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+  http://svn.apache.org/repos/asf/maven/shared/tags/ \
+  maven-reporting-impl-(\d.*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list