[plexus-compiler] 02/02: Revert to maven-debian-helper for building since maven-ant-helper can't be used to generate the plexus descriptors yet

Emmanuel Bourg ebourg-guest at alioth.debian.org
Wed Nov 6 13:35:22 UTC 2013 

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

ebourg-guest pushed a commit to branch master
in repository plexus-compiler.

commit ed3b7a259833ee76e78b43bc002f33c3778ee9ba
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 6 14:29:41 2013 +0100

    Revert to maven-debian-helper for building since maven-ant-helper can't be used to generate the plexus descriptors yet
---
 debian/README.source                            |    2 +-
 debian/TODO                                     |    1 -
 debian/changelog                                |   10 ++--------
 debian/control                                  |    6 +++---
 debian/libplexus-compiler-java-doc.doc-base.api |    7 -------
 debian/libplexus-compiler-java-doc.install      |    9 +--------
 debian/rules                                    |   16 ++++------------
 7 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index e742305..c7852af 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
 Information about plexus-compiler
-------------------------------
+---------------------------------
 
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
diff --git a/debian/TODO b/debian/TODO
index c77a16a..abb1190 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,2 +1 @@
-- fix javadoc build
 - build disabled plexus-aspectj-compiler module
diff --git a/debian/changelog b/debian/changelog
index e1e9173..c2b7c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,8 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
 
   [ Ludovic Claude ]
   * New upstream version, add myself to Uploaders
-  * d/rules: use debhelper and Ant for the build as Maven
-    is a build dependency of plexus-compiler
-  * d/control: Remove Build-Depends on cdbs, maven-debian-helper,
-    libplexus-component-metadata-java
-  * Add Build-Depends on maven-repo-helper, ant-optional, maven-ant-helper,
-    default-jdk-doc, libmaven2-core-java-doc,
+  * d/control: Remove Build-Depends on libplexus-component-metadata-java
+  * Add Build-Depends on default-jdk-doc, libmaven2-core-java-doc,
     libplexus-container-default-java-doc, libplexus-utils-java-doc
   * Add dependency on libecj-java,
   * Remove dependency on libaspectj-java, as plexus-aspectj-compiler
@@ -19,14 +15,12 @@ plexus-compiler (1.8.3-1) UNRELEASED; urgency=low
   * d/patches: remove old patches, not needed anymore as the parent POM
     is now packaged and contains the same information,
     add a patch to fix the failing unit tests
-  * d/libplexus-compiler-java-doc.install: install Javadoc for each module
 
   [ Emmanuel Bourg ]
   * Added a patch to compile with the Eclipse compiler available in Debian
   * debian/control:
     - Updated Standards-Version to 3.9.5 (no changes)
   * Build depend on debhelper >= 9
-  * debian/rules: Improved the clean target to allow rebuilds
   * debian/copyright: Updated the Format URI to 1.0
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 03 Jan 2012 00:27:31 +0100
diff --git a/debian/control b/debian/control
index 512ff20..ceb4592 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>,
            Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: ant-optional,
+Build-Depends: cdbs,
                debhelper (>= 9),
                default-jdk,
-               maven-ant-helper (>= 7.1),
-               maven-repo-helper (>= 1.5)
+               maven-debian-helper (>= 1.5)
 Build-Depends-Indep: default-jdk-doc,
                      junit (>= 3.8.2),
                      libcommons-lang-java (>= 2.0),
                      libecj-java,
+                     libmaven-javadoc-plugin-java,
                      libmaven2-core-java,
                      libmaven2-core-java-doc,
                      libplexus-container-default-java,
diff --git a/debian/libplexus-compiler-java-doc.doc-base.api b/debian/libplexus-compiler-java-doc.doc-base.api
index 2777b12..30381b9 100644
--- a/debian/libplexus-compiler-java-doc.doc-base.api
+++ b/debian/libplexus-compiler-java-doc.doc-base.api
@@ -8,10 +8,3 @@ Section: Programming
 Format: HTML
 Index: /usr/share/doc/libplexus-compiler-java/api/index.html
 Files: /usr/share/doc/libplexus-compiler-java/api/*
-       /usr/share/doc/libplexus-compiler-java/plexus-compiler-test/*
-       /usr/share/doc/libplexus-compiler-java/plexus-compiler-manager/*
-       /usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-csharp/*
-       /usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-eclipse/*
-       /usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-jikes/*
-       /usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-javac/*
-
diff --git a/debian/libplexus-compiler-java-doc.install b/debian/libplexus-compiler-java-doc.install
index 96cda28..41cbff9 100644
--- a/debian/libplexus-compiler-java-doc.install
+++ b/debian/libplexus-compiler-java-doc.install
@@ -1,8 +1 @@
-plexus-compiler-api/target/apidocs/* usr/share/doc/libplexus-compiler-java/api/
-plexus-compiler-test/target/apidocs/* usr/share/doc/libplexus-compiler-java/plexus-compiler-test/
-plexus-compiler-manager/target/apidocs/* usr/share/doc/libplexus-compiler-java/plexus-compiler-manager/
-plexus-compilers/plexus-compiler-csharp/target/apidocs/* usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-csharp/
-plexus-compilers/plexus-compiler-eclipse/target/apidocs/* usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-eclipse/
-plexus-compilers/plexus-compiler-jikes/target/apidocs/* usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-jikes/
-plexus-compilers/plexus-compiler-javac/target/apidocs/* usr/share/doc/libplexus-compiler-java/plexus-compilers/plexus-compiler-javac/
-
+target/site/apidocs/* usr/share/doc/libplexus-compiler-java/api/
diff --git a/debian/rules b/debian/rules
index b2e548c..ba49f3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,10 @@
 #!/usr/bin/make -f
 
-DEB_SOURCE_PACKAGE   := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
-export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -Dversion=$(DEB_UPSTREAM_VERSION) -f debian/build.xml
-
-%:
-	dh $@ --buildsystem=ant --with maven_repo_helper
-
-override_dh_auto_clean:
-	dh_auto_clean
-	mh_unpatchpoms -plibplexus-compiler-java
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:aggregate
 
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-compiler.git

More information about the pkg-java-commits mailing list