Fri Jul 28 13:29:09 UTC 2017

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-doxia-tools.

commit 3d5596016048b54c30311d41b4a1f04515b1fd87
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Sun Jul 12 00:23:23 2009 +0000

    * New upstream version, add myself to Uploaders
    * Change section to java, bump up Standards-Version to 3.8.1
    * Bump up debhelper to 6
    * Add the Maven POM to the package,
    * Add a Build-Depends-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
    * Use default-jdk for the build
    * Remove the patch for the POM as it's no longer needed, use ant for
      the build instead of Maven (to avoid circular build dependencies from
      maven-debian-helper)
    * Add a dependency on doxia-sitetools and maven2-core
    * Remove the dependency on doxia, as it is transitively reachable from
      doxia-sitetools
---
 debian/build.properties               |   4 ++
 debian/changelog                      |  20 +++++++
 debian/compat                         |   2 +-
 debian/control                        |  15 +++--
 debian/copyright                      |   2 +-
 debian/libmaven-doxia-tools-java.poms |   1 +
 debian/maven-settings.xml             |   9 +++
 debian/maven.properties               |   1 -
 debian/maven.rules                    |   2 +
 debian/patches/pom.diff               | 109 ----------------------------------
 debian/patches/series                 |   1 -
 debian/rules                          |  23 ++++++-
 12 files changed, 68 insertions(+), 121 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
new file mode 100644
index 0000000..43828cd
--- /dev/null
+++ b/debian/build.properties
@@ -0,0 +1,4 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
+maven.generate.target=org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata
diff --git a/debian/changelog b/debian/changelog
index a79c348..8183455 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+maven-doxia-tools (1.0.2-1) experimental; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Bump up debhelper to 6
+  * Add the Maven POM to the package,
+  * Add a Build-Depends-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
+  * Use default-jdk for the build
+  * Remove the patch for the POM as it's no longer needed, use ant for
+    the build instead of Maven (to avoid circular build dependencies from
+    maven-debian-helper)
+  * Add a dependency on doxia-sitetools and maven2-core
+  * Remove the dependency on doxia, as it is transitively reachable from
+    doxia-sitetools
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 15 May 2009 00:49:08 +0100
+
 maven-doxia-tools (1.0.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #508837)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/control b/debian/control
index 3099e5e..7b5b7bb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,22 @@
 Source: maven-doxia-tools
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt, maven-debian-helper,
- libplexus-maven-plugin-java, libcommons-io-java, libplexus-i18n-java
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 6), cdbs, default-jdk, quilt
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ junit, libmaven-plugin-tools-java, libplexus-component-metadata-java (>= 1.0~beta3.0.7),
+ libdoxia-sitetools-java, libcommons-io-java, 
+ libplexus-container-default-java, libmaven2-core-java
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-doxia-tools
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-doxia-tools/
 Homepage: http://maven.apache.org/shared/maven-doxia-tools/
 
 Package: libmaven-doxia-tools-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime, libcommons-io-java,
- libplexus-i18n-java
+Depends: ${misc:Depends}, libdoxia-sitetools-java, libcommons-io-java, 
+ libplexus-container-default-java, libmaven2-core-java
 Description: utilities for integrating Doxia in Maven
  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,
diff --git a/debian/copyright b/debian/copyright
index 62da51b..5d29254 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ 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'.
+found in '/usr/share/common-licenses/GPL-3'.
 
 The package was downloaded from
 <http://maven.apache.org/shared/maven-doxia-tools>.
diff --git a/debian/libmaven-doxia-tools-java.poms b/debian/libmaven-doxia-tools-java.poms
new file mode 100644
index 0000000..43e746b
--- /dev/null
+++ b/debian/libmaven-doxia-tools-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent
diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml
new file mode 100644
index 0000000..01f8769
--- /dev/null
+++ b/debian/maven-settings.xml
@@ -0,0 +1,9 @@
+<!--
+  This is a minimal settings.xml that switches maven to offline mode
+  and uses the Debian repo as the local repo.
+-->
+
+<settings>
+  <localRepository>/usr/share/maven-repo</localRepository>
+  <offline>true</offline>
+</settings>
diff --git a/debian/maven.properties b/debian/maven.properties
deleted file mode 100644
index d823014..0000000
--- a/debian/maven.properties
+++ /dev/null
@@ -1 +0,0 @@
-maven.test.skip = true
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..eaebf63
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha-.*/1.0-alpha/
+
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
deleted file mode 100644
index 93b7276..0000000
--- a/debian/patches/pom.diff
+++ /dev/null
@@ -1,109 +0,0 @@
-Index: maven-doxia-tools-1.0.1/pom.xml
-===================================================================
---- maven-doxia-tools-1.0.1.orig/pom.xml	2008-06-08 21:38:17.000000000 +0200
-+++ maven-doxia-tools-1.0.1/pom.xml	2008-12-15 23:58:39.000000000 +0100
-@@ -22,12 +22,14 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
- 
-+  <!--
-   <parent>
-     <groupId>org.apache.maven.shared</groupId>
-     <artifactId>maven-shared-components</artifactId>
-     <version>9</version>
-     <relativePath>../pom.xml</relativePath>
-   </parent>
-+  -->
- 
-   <groupId>org.apache.maven.shared</groupId>
-   <artifactId>maven-doxia-tools</artifactId>
-@@ -55,6 +57,7 @@
-       <plugin>
-         <groupId>org.codehaus.plexus</groupId>
-         <artifactId>plexus-maven-plugin</artifactId>
-+	<version>${org.codehaus.plexus.plexus-maven-plugin.version}</version>
-         <executions>
-           <execution>
-             <id>create-component-descriptor</id>
-@@ -72,12 +75,22 @@
-       <groupId>commons-io</groupId>
-       <artifactId>commons-io</artifactId>
-       <version>1.4</version>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/commons-io.jar</systemPath>
-     </dependency>
- 
-     <!-- maven -->
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-project</artifactId>
-+      <version>2.0.9</version>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/maven2.jar</systemPath>
-+    </dependency>
-+    <!--
-+    <dependency>
-+      <groupId>org.apache.maven</groupId>
-+      <artifactId>maven-project</artifactId>
-       <version>2.0</version>
-     </dependency>
-     <dependency>
-@@ -100,12 +113,15 @@
-       <artifactId>maven-reporting-api</artifactId>
-       <version>2.0.4</version>
-     </dependency>
-+    -->
- 
-     <!-- doxia-sitetools -->
-     <dependency>
-       <groupId>org.apache.maven.doxia</groupId>
-       <artifactId>doxia-decoration-model</artifactId>
-       <version>${doxia-sitetools.version}</version>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/doxia-decoration-model.jar</systemPath>
-     </dependency>
- 
-     <!-- Plexus -->
-@@ -113,11 +129,15 @@
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-container-default</artifactId>
-       <version>1.0-alpha-9</version>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/plexus-container-default-1.0.jar</systemPath>
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-i18n</artifactId>
-       <version>1.0-beta-7</version>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/plexus-i18n.jar</systemPath>
-       <exclusions>
-         <exclusion>
-           <groupId>org.codehaus.plexus</groupId>
-@@ -127,17 +147,26 @@
-     </dependency>
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-interpolation</artifactId>
-+      <version>${org.codehaus.plexus.plexus-interpolation.version}</version>
-+    </dependency>
-+    <!--
-+    <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-       <version>1.4.5</version>
-     </dependency>
-+    -->
- 
-     <!-- test -->
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven.shared</groupId>
-       <artifactId>maven-plugin-testing-harness</artifactId>
-       <version>1.0</version>
-       <scope>test</scope>
-     </dependency>
-+    -->
-   </dependencies>
- 
-   <reporting>
diff --git a/debian/patches/series b/debian/patches/series
index b51f923..8429b21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-pom.diff
 plexus-interpolation.diff
diff --git a/debian/rules b/debian/rules
index b23788c..4287e33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,29 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+# Need to specify the exact version of the Plexus plugin (from plexus-component-metadata package) used here
+PLEXUS_PLUGIN_VERSION:= 1.0-beta-3.0.7
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-nodeps doxia-core doxia-logging-api doxia-sink-api doxia-decoration-model.jar doxia-doc-renderer \
+ doxia-site-renderer commons-io plexus-i18n plexus-container-default-alpha plexus-utils plexus-interpolation \
+ maven-core maven-project maven-artifact maven-artifact-manager maven-model maven-reporting-api
+DEB_ANT_BUILD_TARGET := package
+DEB_ANT_BUILDFILE    := debian/build.xml
+DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dplexus-component-metadata.version=$(PLEXUS_PLUGIN_VERSION)
+API_DOCS             := target/api
+
+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
 
 get-orig-source:
 	uscan --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-doxia-tools.git

