[pkg-java] r13771 - in tags/maven-debian-helper: . 1.4.3/bin 1.4.3/debian 1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager 1.4.3/share/cdbs/1/class

Damien Raude-Morvan drazzib at alioth.debian.org
Wed Jun 8 22:22:52 UTC 2011


Author: drazzib
Date: 2011-06-08 22:22:51 +0000 (Wed, 08 Jun 2011)
New Revision: 13771

Added:
   tags/maven-debian-helper/1.4.3/
   tags/maven-debian-helper/1.4.3/bin/mh_resolve_dependencies
   tags/maven-debian-helper/1.4.3/debian/changelog
   tags/maven-debian-helper/1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
   tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven-vars.mk
   tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven.mk
Removed:
   tags/maven-debian-helper/1.4.3/bin/mh_resolve_dependencies
   tags/maven-debian-helper/1.4.3/debian/changelog
   tags/maven-debian-helper/1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
   tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven-vars.mk
   tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven.mk
Log:
[svn-buildpackage] Tagging maven-debian-helper 1.4.3

Deleted: tags/maven-debian-helper/1.4.3/bin/mh_resolve_dependencies
===================================================================
--- trunk/maven-debian-helper/bin/mh_resolve_dependencies	2011-06-08 21:36:06 UTC (rev 13769)
+++ tags/maven-debian-helper/1.4.3/bin/mh_resolve_dependencies	2011-06-08 22:22:51 UTC (rev 13771)
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-MH_VERSION=$(ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
-. /usr/share/maven-repo-helper/mh_lib.sh
-
-syntax()
-{
-   echo -e "Usage: mh_revolve_dependencies [option]... <package>"
-   echo -e "Resolve the dependencies and generates the substvars"
-   echo -e "file containing the list of dependent packages."
-   echo -e ""
-   echo -e "Where"
-   echo -e "\t<package> is the name of the binary package,"
-   echo -e "\t  e.g. libcommons-lang-java. Default to the first binary"
-   echo -e "\t  found in the debian/control file"
-   echo -e "Options:"
-   echo -e "\t-h --help: show this text"
-   echo -e "\t-V --version: show the version"
-   echo -e "\t-p<package> --package=<package>: name of the package"
-   echo -e "\t-a --ant: use Ant for the packaging instead of Maven"
-   echo -e "\t-n --non-interactive: non interactive mode, don't ask questions"
-   echo -e "\t-o --offline: don't ever connect to the internet, for Debian build"
-   echo -e "\t  compatibility."
-   echo -e "\t-v --verbose: show more information while running"
-   echo -e ""
-   echo -e "Description:"
-   echo -e "This tool reads the POM files defined in debian/$package.poms"
-   echo -e "and scans the Maven repository in /usr/share/maven-repo."
-   echo -e "It then extracts the dependencies required for the current"
-   echo -e "package and store them in the file debian/$package.substvars"
-   echo -e "where they can be read by debhelper."
-   echo -e "The variables defined are:"
-   echo -e "  maven:Depends - the list of runtime dependencies"
-   echo -e "  maven:OptionalDepends - the list of optional runtime dependencies"
-   echo -e "  maven:CompileDepends - the list of compile-time dependencies"
-   echo -e "  maven:TestDepends - the list of test dependencies"
-   exit 1
-}
-
-ARGS="p package a ant v verbose n non-interactive o offline" parseargs "$@"
-
-PACKAGE=$(getarg p package)
-ANT=$(getarg a ant)
-NON_INTERACTIVE=$(getarg n non-interactive)
-OFFLINE=$(getarg o offline)
-VERBOSE=$(getarg v verbose)
-
-if [ -z "$PACKAGE" ]; then
-    if [ "$ARGC" -gt "0" ]; then
-        PACKAGE="${ARGV[0]}"
-    else
-        PACKAGE=$(dh_listpackages | head -1)
-    fi
-fi
-
-if [ ! -e .debianVersion -a ! -e debian/stamp-poms-patched ]; then
-    touch .debianVersion
-    CREATED_POMS=false
-    if [ ! -e debian/${PACKAGE}.poms ]; then
-        CREATED_POMS=true
-        mh_lspoms $PACKAGE
-    fi
-    mh_patchpoms -p$PACKAGE --keep-pom-version
-    if [ $CREATED_POMS ]; then
-        rm debian/${PACKAGE}.poms
-    fi
-fi
-
-mvn org.debian.maven:maven-packager-utils:$MH_VERSION:dependencies -Dpackage="$PACKAGE" ${ANT:+-DpackageType=ant} -Dmaven.repo.local=/usr/share/maven-repo ${NON_INTERACTIVE:+-Dinteractive=false} ${OFFLINE:+-Doffline=true} ${VERBOSE:+-Dverbose=true} --offline
-
-perl -p -i -e 's/maven\./maven:/' debian/${PACKAGE}.substvars

Copied: tags/maven-debian-helper/1.4.3/bin/mh_resolve_dependencies (from rev 13770, trunk/maven-debian-helper/bin/mh_resolve_dependencies)
===================================================================
--- tags/maven-debian-helper/1.4.3/bin/mh_resolve_dependencies	                        (rev 0)
+++ tags/maven-debian-helper/1.4.3/bin/mh_resolve_dependencies	2011-06-08 22:22:51 UTC (rev 13771)
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+MH_VERSION=$(ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
+. /usr/share/maven-repo-helper/mh_lib.sh
+
+syntax()
+{
+   echo -e "Usage: mh_revolve_dependencies [option]... <package>"
+   echo -e "Resolve the dependencies and generates the substvars"
+   echo -e "file containing the list of dependent packages."
+   echo -e ""
+   echo -e "Where"
+   echo -e "\t<package> is the name of the binary package,"
+   echo -e "\t  e.g. libcommons-lang-java. Default to the first binary"
+   echo -e "\t  found in the debian/control file"
+   echo -e "Options:"
+   echo -e "\t-h --help: show this text"
+   echo -e "\t-V --version: show the version"
+   echo -e "\t-p<package> --package=<package>: name of the package"
+   echo -e "\t-a --ant: use Ant for the packaging instead of Maven"
+   echo -e "\t-j --javadoc: resolve the Javadoc dependencies"
+   echo -e "\t-n --non-interactive: non interactive mode, don't ask questions"
+   echo -e "\t-o --offline: don't ever connect to the internet, for Debian build"
+   echo -e "\t  compatibility."
+   echo -e "\t-v --verbose: show more information while running"
+   echo -e ""
+   echo -e "Description:"
+   echo -e "This tool reads the POM files defined in debian/$package.poms"
+   echo -e "and scans the Maven repository in /usr/share/maven-repo."
+   echo -e "It then extracts the dependencies required for the current"
+   echo -e "package and store them in the file debian/$package.substvars"
+   echo -e "where they can be read by debhelper."
+   echo -e "The variables defined are:"
+   echo -e "  maven:Depends - the list of runtime dependencies"
+   echo -e "  maven:OptionalDepends - the list of optional runtime dependencies"
+   echo -e "  maven:CompileDepends - the list of compile-time dependencies"
+   echo -e "  maven:TestDepends - the list of test dependencies"
+   exit 1
+}
+
+ARGS="p package a ant d javadoc v verbose n non-interactive o offline" parseargs "$@"
+
+PACKAGE=$(getarg p package)
+ANT=$(getarg a ant)
+GEN_JAVADOC=$(getarg j javadoc)
+NON_INTERACTIVE=$(getarg n non-interactive)
+OFFLINE=$(getarg o offline)
+VERBOSE=$(getarg v verbose)
+
+if [ -z "$PACKAGE" ]; then
+    if [ "$ARGC" -gt "0" ]; then
+        PACKAGE="${ARGV[0]}"
+    else
+        PACKAGE=$(dh_listpackages | head -1)
+    fi
+fi
+
+if [ ! -e .debianVersion -a ! -e debian/stamp-poms-patched ]; then
+    touch .debianVersion
+    CREATED_POMS=false
+    if [ ! -e debian/${PACKAGE}.poms ]; then
+        CREATED_POMS=true
+        mh_lspoms $PACKAGE
+    fi
+    mh_patchpoms -p$PACKAGE --keep-pom-version
+    if [ $CREATED_POMS ]; then
+        rm debian/${PACKAGE}.poms
+    fi
+fi
+
+mvn org.debian.maven:maven-packager-utils:$MH_VERSION:dependencies -Dpackage="$PACKAGE" ${ANT:+-DpackageType=ant} ${GEN_JAVADOC:+-DresolveJavadoc=true} -Dmaven.repo.local=/usr/share/maven-repo ${NON_INTERACTIVE:+-Dinteractive=false} ${OFFLINE:+-Doffline=true} ${VERBOSE:+-Dverbose=true} --offline
+
+perl -p -i -e 's/maven\./maven:/' debian/${PACKAGE}.substvars

Deleted: tags/maven-debian-helper/1.4.3/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2011-06-08 21:36:06 UTC (rev 13769)
+++ tags/maven-debian-helper/1.4.3/debian/changelog	2011-06-08 22:22:51 UTC (rev 13771)
@@ -1,265 +0,0 @@
-maven-debian-helper (1.4.3) unstable; urgency=low
-
-  * DependenciesSolver: Don't use Properties.store() method since
-    it escape some chars (like " >\=") from variables.
-    Replace it with simple FileWriter. Closes: #628272.
-  * SysInstallMojo: Send "--keep-elements" flag to POMCleaner if its
-    set in <pkg>.poms file. Thanks to James Page <james.page at canonical.com>.
-    Closes: #613364
-  * mh_resolve_dependencies: Always launch Maven in offline mode
-    with --offline option (as already done on mh_make). Closes: #629356
-  * SysInstallDocMojo, SysInstallMojo: Drop initProperties method and only rely
-    on Maven mojo attributes injection of "debianPackage" and "destPackage".
-    Closes: #628693.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 08 Jun 2011 23:22:11 +0200
-
-maven-debian-helper (1.4.2) unstable; urgency=low
-
-  * mh_resolve_dependencies: Handle --verbose option has described in
-    documentation (it was previously just ignored).
-  * DependenciesSolver: In case we didn't found anything for "jar" type,
-    just check for a "bundle" type inside repository
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 14 May 2011 22:59:17 +0200
-
-maven-debian-helper (1.4.1) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Wed, 09 Feb 2011 21:42:36 +0100
-
-maven-debian-helper (1.4) experimental; urgency=low
-
-  * d/control: Add Recommends on devscripts (which provides licensecheck)
-  * mh_make: 
-     - Improve generated copyright
-     - Fix generated rules for a build using ant
-     - When ignoring dependencies, don't fail the build
-     - When ant is used as the build tool, generate the build.xml file
-       required for multi projects.
-     - use licensecheck as an additional source of information for licenses
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 12 Nov 2010 12:26:37 +0100
-
-maven-debian-helper (1.3) experimental; urgency=low
-
-  * ${maven:Depends} and similar substitution vars: add
-    version constraints when possible
-  * Use dpkg to resolve the dependent packages in ${maven:DocDepends}
-    (Closes: #588114)
-  * Use dpkg to search for the documentation package (Closes: #588114)
-  * mh_make: suggest installing missing dependencies which are not ignored
-    during the build
-  * add property debian.hasPackageVersion property, if true in the
-    repository POM then other packages depending on a POM with this property on
-    will have an addition version constraint generated in ${maven:Depends}
-  * mh_make: detect when debian.hasPackageVersion can be used, ask for the
-    upstream version of the package for confirmation.
-  * d/control: add Recommends: on subversion as it's used by mh_make,
-     add Build-Depends on libmaven-plugin-tools-java and junit
-  * d/build.xml: fix build when previous versions of this package are
-    not already installed on the system.
-  * d/rules: use debian/.mh instead of debian/tmp as temp directory to better
-    comply with Debian policy.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 29 Sep 2010 00:17:34 +0200
-
-maven-debian-helper (1.2) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * debian/control: Update Standards-Version to 3.9.1, no changes
-  * mh_make: fix issue when no-parent option is needed. Thanks Torsten
-    for the report (Closes: #591513)
-  * mh_make: assist with the rules to transform the versions
-  * mh_make: use existing package.poms files if any
-  * maven.mk: all rules in maven.ignoreRules are also used during the
-    clean phase, so there is no need to duplicate them in
-    maven.cleanIgnoreRules also.
-
-  [ Damien Raude-Morvan ]
-  * DependenciesSolver: Fix ClassCastException when using mh_make.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Sep 2010 23:28:02 +0200
-
-maven-debian-helper (1.1) unstable; urgency=low
-
-  * debian/control: Update Standards-Version to 3.9.0, no changes
-  * Fix compilation issues with gcj
-  * mh_make: 
-      - update generated control to use Standards-Version 3.9.0
-      - improve useability and recognize more plugins and extensions
-      - read existing maven rules in debian folder, don't ask twice the
-        same questions.
-  * Support installing build artifacts in different packages with the
-    --package option in the <package>.poms file
-  * Add mvn-build to phony rules to avoid creating a file called
-    mvn-build during the build (Closes: #589635)
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 28 Jun 2010 23:10:50 +0200
-
-maven-debian-helper (1.0) unstable; urgency=low
-
-  * debian/control:
-     - replace Depends: on openjdk-6-jre | java2-runtime by default-jdk
-     - remove Conflits: on old maven-debian-helper as there is already
-       a version constraint for a new version of this package.
-  * mh_make:
-      - supports checking out code from the svn of dev.java.net
-      - use upstream copyright when available for debian/* files
-      - update Standards version, generate with source 3.0 (quilt) package
-        format
-      - mh_make --from-svn: improve package name proposal for URLs
-        containing /tags/
-      - ask to ignore missing dependencies
-  * maven.mk: 
-      - add before-mvn-build:: and after-mvn-build:: targets
-        to be able to insert custom actions before and after running the Maven
-        build
-      - add DEB_MAVEN_INSTALL_TO_USJ variable. Set this variable to false to
-        prevent maven.mk to install the jars in /usr/share/java. This
-        variable defaults to true.
-      - add call to mh_clean to remove temporary files
-  * Add -Duse.maven.repo.local option to maven-debian-plugin:install
-    and install-doc to give the option to deploy artifacts on the
-    local (and temporary) Maven repository used by the Debian build
-    Typical use-case: bootstrapping the build of a project with 
-    some artifacts of the project pre-built and installed in the tmp repo
-    before the normal build is executed. See the antlr3 package for an example
-  * SysInstallMojo: clean the target directory before an installation if the
-    directory is a symlink that was created by copy-repo.sh
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 16 May 2010 14:42:29 +0200
-
-maven-debian-helper (0.12) unstable; urgency=low
-
-  * SysInstallDocMojo: Fix methods override to install -javadoc JAR flavors.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Apr 2010 23:46:22 +0200
-
-maven-debian-helper (0.11) unstable; urgency=low
-
-  * SysInstallMojo: Read generated pom.properties after POMCleaner
-    calls to allow changing groupId and artifactId inside maven.rules
-    (trying to mimic mh_installpom/mh_installjar behavior)
-  * Switch to 3.0 (native) source format
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Apr 2010 21:48:23 +0200
-
-maven-debian-helper (0.10) unstable; urgency=low
-
-  * Add --non-interactive option to mh_lspoms and use it
-    in maven.mk to avoid asking questions during a build
-    (Closes: #574399)
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 24 Mar 2010 23:48:29 +0100
-
-maven-debian-helper (0.9) unstable; urgency=low
-
-  * maven-vars.mk: Fix detection of DEB_DOC_PACKAGE
-    Only exclude first exact match from dh_listpackages result
-    instead of all packages which contains main package name.
-  * maven.mk: Pass DEB_DOC_PACKAGE when invoke DEB_MAVEN_DOC_TARGET.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 01 Mar 2010 21:22:34 +0100
-
-maven-debian-helper (0.8) unstable; urgency=low
-
-  * mh_make falls back on EMAIL when DEBEMAIL is not set
-  * mh_make handles better multi projects
-  * mh_make generates projects following the Debian 3.8.3 policy
-  * Documentation improvements
-  * maven.mk: unpatch the poms in cleanbuilddir, to have a good
-    clean sequence when maven.mk is used with a patch system -
-    clean target -> mvn clean -> rm tmp files -> unpatch pom files
-     -> unpatch files with patch system
-  * Read rules from the Maven repository to force the version of
-    Maven plugins to be the same as in the repository
-  * maven.mk removes some elements from the POM files when their
-    use is against the Debian policy (<repositories> as they
-    imply downloading artifacts from the Internet, 
-    <distributionManagement> as it implies publishing on the net
-    or in a location not controlled by Debian) or when they are
-    not needed and risk pulling out unwanted dependencies
-    (<reports> which is not used if a documentation package is
-    not generated)
-  * maven.mk adds a patch to Maven to disable using the
-    maven-site-plugin when no documentation package is generated.
-    This helps to reduce the amount of build dependencies
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 04 Jan 2010 23:13:29 +0100
-
-maven-debian-helper (0.7) unstable; urgency=low
-
-  [Ludovic Claude]
-  * Make the package more version agnostic. Versions are discovered
-    at runtime
-  * mh_make has a new option, --from-svn, to download automatically
-    the sources from a SVN repository and generate the Debian packaging
-    for the project.
-  * Add apt-file to Recommends: as it's used by mh_lspoms
-    (Closes: #542511)
-
-  [Michael Koch]
-  * Add Recommends: apt-file to maven-debian-helper (Closes: #542511).
-  * Build-Depends on debhelper (>= 7).
-  * Added myself to Uploaders.
-  * Updated Standards-Version to 3.8.3.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 17 Dec 2009 20:09:00 +0100
-
-maven-debian-helper (0.6) unstable; urgency=low
-
-  * Update everything to version 0.6 because 2 scripts have still been at
-    version 0.4. We should make the package more version agnostic.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 16 Aug 2009 15:18:57 +0200
-
-maven-debian-helper (0.5) unstable; urgency=low
-
-  * Update Standards-Version to 3.8.2
-  * Follow the new convention for Javadoc:
-    javadoc in /usr/share/doc/package/api even if it's in package-doc
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 02 Aug 2009 11:42:31 +0100
-
-maven-debian-helper (0.4) experimental; urgency=low
-
-  [Ludovic Claude]
-  * Add myself to Uploaders
-  * Use maven-ant-helper for the build instead of recursively building
-    this package with itself (which required an ugly bootstrap script)
-  * Integrate the cdbs helper with maven-repo-helper, this unifies the
-    way the Maven repository is used, and simplifies the job of the
-    packager as maven-repo-helper takes care of most POM patching work.
-  * Use default-jdk for the build
-  * Change section to java, update Standards-Version to 3.8.1
-  * Generate Javadoc API automatically.
-  * Add mh_make tool to generate Debian packaging automatically from
-    a Maven project.
-    
-  [Torsten Werner]
-  * Implement pom faking.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 14 Jul 2009 20:17:16 +0100
-
-maven-debian-helper (0.3) unstable; urgency=low
-
-  * Implement better exception handling.
-  * Create our own maven repository during build time.
-  * Set version for non plugins to '[$version]' instead of '$version' only.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 25 Jan 2009 23:16:20 +0100
-
-maven-debian-helper (0.2) unstable; urgency=low
-
-  * Rename the bootstrap script.
-  * Add a manpage for mvn-debian.
-
- -- Torsten Werner <twerner at debian.org>  Sat, 17 Jan 2009 12:13:35 +0100
-
-maven-debian-helper (0.1) unstable; urgency=low
-
-  * Initial release. (Closes: #508511)
-
- -- Torsten Werner <twerner at debian.org>  Mon, 05 Jan 2009 11:47:25 +0100

Copied: tags/maven-debian-helper/1.4.3/debian/changelog (from rev 13770, trunk/maven-debian-helper/debian/changelog)
===================================================================
--- tags/maven-debian-helper/1.4.3/debian/changelog	                        (rev 0)
+++ tags/maven-debian-helper/1.4.3/debian/changelog	2011-06-08 22:22:51 UTC (rev 13771)
@@ -0,0 +1,268 @@
+maven-debian-helper (1.4.3) unstable; urgency=low
+
+  * DependenciesSolver: Don't use Properties.store() method since
+    it escape some chars (like " >\=") from variables.
+    Replace it with simple FileWriter. Closes: #628272.
+  * SysInstallMojo: Send "--keep-elements" flag to POMCleaner if its
+    set in <pkg>.poms file. Thanks to James Page <james.page at canonical.com>.
+    Closes: #613364
+  * mh_resolve_dependencies: Always launch Maven in offline mode
+    with --offline option (as already done on mh_make). Closes: #629356
+  * SysInstallDocMojo, SysInstallMojo: Drop initProperties method and only rely
+    on Maven mojo attributes injection of "debianPackage" and "destPackage".
+    Closes: #628693.
+  * mh_resolve_dependencies: New --javadoc param, send from maven.mk CDBS file
+    to automatically compute Javadoc dependencies when there is some *-doc
+    package. Closes: #628703.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 09 Jun 2011 00:11:08 +0200
+
+maven-debian-helper (1.4.2) unstable; urgency=low
+
+  * mh_resolve_dependencies: Handle --verbose option has described in
+    documentation (it was previously just ignored).
+  * DependenciesSolver: In case we didn't found anything for "jar" type,
+    just check for a "bundle" type inside repository
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 14 May 2011 22:59:17 +0200
+
+maven-debian-helper (1.4.1) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 09 Feb 2011 21:42:36 +0100
+
+maven-debian-helper (1.4) experimental; urgency=low
+
+  * d/control: Add Recommends on devscripts (which provides licensecheck)
+  * mh_make: 
+     - Improve generated copyright
+     - Fix generated rules for a build using ant
+     - When ignoring dependencies, don't fail the build
+     - When ant is used as the build tool, generate the build.xml file
+       required for multi projects.
+     - use licensecheck as an additional source of information for licenses
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 12 Nov 2010 12:26:37 +0100
+
+maven-debian-helper (1.3) experimental; urgency=low
+
+  * ${maven:Depends} and similar substitution vars: add
+    version constraints when possible
+  * Use dpkg to resolve the dependent packages in ${maven:DocDepends}
+    (Closes: #588114)
+  * Use dpkg to search for the documentation package (Closes: #588114)
+  * mh_make: suggest installing missing dependencies which are not ignored
+    during the build
+  * add property debian.hasPackageVersion property, if true in the
+    repository POM then other packages depending on a POM with this property on
+    will have an addition version constraint generated in ${maven:Depends}
+  * mh_make: detect when debian.hasPackageVersion can be used, ask for the
+    upstream version of the package for confirmation.
+  * d/control: add Recommends: on subversion as it's used by mh_make,
+     add Build-Depends on libmaven-plugin-tools-java and junit
+  * d/build.xml: fix build when previous versions of this package are
+    not already installed on the system.
+  * d/rules: use debian/.mh instead of debian/tmp as temp directory to better
+    comply with Debian policy.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 29 Sep 2010 00:17:34 +0200
+
+maven-debian-helper (1.2) unstable; urgency=low
+
+  [ Ludovic Claude ]
+  * debian/control: Update Standards-Version to 3.9.1, no changes
+  * mh_make: fix issue when no-parent option is needed. Thanks Torsten
+    for the report (Closes: #591513)
+  * mh_make: assist with the rules to transform the versions
+  * mh_make: use existing package.poms files if any
+  * maven.mk: all rules in maven.ignoreRules are also used during the
+    clean phase, so there is no need to duplicate them in
+    maven.cleanIgnoreRules also.
+
+  [ Damien Raude-Morvan ]
+  * DependenciesSolver: Fix ClassCastException when using mh_make.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Sep 2010 23:28:02 +0200
+
+maven-debian-helper (1.1) unstable; urgency=low
+
+  * debian/control: Update Standards-Version to 3.9.0, no changes
+  * Fix compilation issues with gcj
+  * mh_make: 
+      - update generated control to use Standards-Version 3.9.0
+      - improve useability and recognize more plugins and extensions
+      - read existing maven rules in debian folder, don't ask twice the
+        same questions.
+  * Support installing build artifacts in different packages with the
+    --package option in the <package>.poms file
+  * Add mvn-build to phony rules to avoid creating a file called
+    mvn-build during the build (Closes: #589635)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 28 Jun 2010 23:10:50 +0200
+
+maven-debian-helper (1.0) unstable; urgency=low
+
+  * debian/control:
+     - replace Depends: on openjdk-6-jre | java2-runtime by default-jdk
+     - remove Conflits: on old maven-debian-helper as there is already
+       a version constraint for a new version of this package.
+  * mh_make:
+      - supports checking out code from the svn of dev.java.net
+      - use upstream copyright when available for debian/* files
+      - update Standards version, generate with source 3.0 (quilt) package
+        format
+      - mh_make --from-svn: improve package name proposal for URLs
+        containing /tags/
+      - ask to ignore missing dependencies
+  * maven.mk: 
+      - add before-mvn-build:: and after-mvn-build:: targets
+        to be able to insert custom actions before and after running the Maven
+        build
+      - add DEB_MAVEN_INSTALL_TO_USJ variable. Set this variable to false to
+        prevent maven.mk to install the jars in /usr/share/java. This
+        variable defaults to true.
+      - add call to mh_clean to remove temporary files
+  * Add -Duse.maven.repo.local option to maven-debian-plugin:install
+    and install-doc to give the option to deploy artifacts on the
+    local (and temporary) Maven repository used by the Debian build
+    Typical use-case: bootstrapping the build of a project with 
+    some artifacts of the project pre-built and installed in the tmp repo
+    before the normal build is executed. See the antlr3 package for an example
+  * SysInstallMojo: clean the target directory before an installation if the
+    directory is a symlink that was created by copy-repo.sh
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 16 May 2010 14:42:29 +0200
+
+maven-debian-helper (0.12) unstable; urgency=low
+
+  * SysInstallDocMojo: Fix methods override to install -javadoc JAR flavors.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Apr 2010 23:46:22 +0200
+
+maven-debian-helper (0.11) unstable; urgency=low
+
+  * SysInstallMojo: Read generated pom.properties after POMCleaner
+    calls to allow changing groupId and artifactId inside maven.rules
+    (trying to mimic mh_installpom/mh_installjar behavior)
+  * Switch to 3.0 (native) source format
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Apr 2010 21:48:23 +0200
+
+maven-debian-helper (0.10) unstable; urgency=low
+
+  * Add --non-interactive option to mh_lspoms and use it
+    in maven.mk to avoid asking questions during a build
+    (Closes: #574399)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 24 Mar 2010 23:48:29 +0100
+
+maven-debian-helper (0.9) unstable; urgency=low
+
+  * maven-vars.mk: Fix detection of DEB_DOC_PACKAGE
+    Only exclude first exact match from dh_listpackages result
+    instead of all packages which contains main package name.
+  * maven.mk: Pass DEB_DOC_PACKAGE when invoke DEB_MAVEN_DOC_TARGET.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 01 Mar 2010 21:22:34 +0100
+
+maven-debian-helper (0.8) unstable; urgency=low
+
+  * mh_make falls back on EMAIL when DEBEMAIL is not set
+  * mh_make handles better multi projects
+  * mh_make generates projects following the Debian 3.8.3 policy
+  * Documentation improvements
+  * maven.mk: unpatch the poms in cleanbuilddir, to have a good
+    clean sequence when maven.mk is used with a patch system -
+    clean target -> mvn clean -> rm tmp files -> unpatch pom files
+     -> unpatch files with patch system
+  * Read rules from the Maven repository to force the version of
+    Maven plugins to be the same as in the repository
+  * maven.mk removes some elements from the POM files when their
+    use is against the Debian policy (<repositories> as they
+    imply downloading artifacts from the Internet, 
+    <distributionManagement> as it implies publishing on the net
+    or in a location not controlled by Debian) or when they are
+    not needed and risk pulling out unwanted dependencies
+    (<reports> which is not used if a documentation package is
+    not generated)
+  * maven.mk adds a patch to Maven to disable using the
+    maven-site-plugin when no documentation package is generated.
+    This helps to reduce the amount of build dependencies
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 04 Jan 2010 23:13:29 +0100
+
+maven-debian-helper (0.7) unstable; urgency=low
+
+  [Ludovic Claude]
+  * Make the package more version agnostic. Versions are discovered
+    at runtime
+  * mh_make has a new option, --from-svn, to download automatically
+    the sources from a SVN repository and generate the Debian packaging
+    for the project.
+  * Add apt-file to Recommends: as it's used by mh_lspoms
+    (Closes: #542511)
+
+  [Michael Koch]
+  * Add Recommends: apt-file to maven-debian-helper (Closes: #542511).
+  * Build-Depends on debhelper (>= 7).
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 17 Dec 2009 20:09:00 +0100
+
+maven-debian-helper (0.6) unstable; urgency=low
+
+  * Update everything to version 0.6 because 2 scripts have still been at
+    version 0.4. We should make the package more version agnostic.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 16 Aug 2009 15:18:57 +0200
+
+maven-debian-helper (0.5) unstable; urgency=low
+
+  * Update Standards-Version to 3.8.2
+  * Follow the new convention for Javadoc:
+    javadoc in /usr/share/doc/package/api even if it's in package-doc
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 02 Aug 2009 11:42:31 +0100
+
+maven-debian-helper (0.4) experimental; urgency=low
+
+  [Ludovic Claude]
+  * Add myself to Uploaders
+  * Use maven-ant-helper for the build instead of recursively building
+    this package with itself (which required an ugly bootstrap script)
+  * Integrate the cdbs helper with maven-repo-helper, this unifies the
+    way the Maven repository is used, and simplifies the job of the
+    packager as maven-repo-helper takes care of most POM patching work.
+  * Use default-jdk for the build
+  * Change section to java, update Standards-Version to 3.8.1
+  * Generate Javadoc API automatically.
+  * Add mh_make tool to generate Debian packaging automatically from
+    a Maven project.
+    
+  [Torsten Werner]
+  * Implement pom faking.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 14 Jul 2009 20:17:16 +0100
+
+maven-debian-helper (0.3) unstable; urgency=low
+
+  * Implement better exception handling.
+  * Create our own maven repository during build time.
+  * Set version for non plugins to '[$version]' instead of '$version' only.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 25 Jan 2009 23:16:20 +0100
+
+maven-debian-helper (0.2) unstable; urgency=low
+
+  * Rename the bootstrap script.
+  * Add a manpage for mvn-debian.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 17 Jan 2009 12:13:35 +0100
+
+maven-debian-helper (0.1) unstable; urgency=low
+
+  * Initial release. (Closes: #508511)
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 05 Jan 2009 11:47:25 +0100

Deleted: tags/maven-debian-helper/1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java	2011-06-08 21:36:06 UTC (rev 13769)
+++ tags/maven-debian-helper/1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java	2011-06-08 22:22:51 UTC (rev 13771)
@@ -1,144 +0,0 @@
-package org.debian.maven.packager;
-
-/*
- * Copyright 2009 Ludovic Claude.
- *
- * 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.
- */
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.maven.project.MavenProject;
-
-/**
- * Analyze the Maven dependencies and extract the list of dependent packages,
- * reusable as subvars in the Debian control file and the list of POM files
- * to use and the rules if they did not exist already.
- *
- * @goal dependencies
- * @aggregator
- * @requiresDependencyResolution
- * @phase process-sources
- * 
- * @author Ludovic Claude
- */
-public class DependenciesMojo
-        extends AbstractMojo {
-
-    /**
-     * The Maven Project Object
-     *
-     * @parameter expression="${project}"
-     * @readonly
-     * @required
-     */
-    protected MavenProject project;
-    /**
-     * A list of every project in this reactor; provided by Maven
-     * @parameter expression="${project.collectedProjects}"
-     */
-    protected List collectedProjects;
-    /**
-     * Location of the file.
-     * @parameter expression="${debian.directory}"
-     *   default-value="debian"
-     */
-    protected File outputDirectory;
-    /**
-     * Name of the package (e.g. 'commons-lang')
-     * @parameter expression="${package}"
-     * @required
-     */
-    protected String packageName;
-    /**
-     * Type of the package (e.g. 'maven' or 'ant')
-     * @parameter expression="${packageType}" default-value="maven"
-     */
-    protected String packageType;
-    /**
-     * Location for the list of POMs file.
-     * @required
-     * @parameter expression="debian/${package}.poms"
-     */
-    protected File listOfPoms;
-    /**
-     * Location of the Maven repository
-     *
-     * @parameter expression="${maven.repo.local}" default-value="/usr/share/maven-repo"
-     */
-    protected File mavenRepo;
-    /**
-     * Interactive execution will ask questions to the user
-     * @parameter expression="${interactive}" default-value="true"
-     */
-    protected boolean interactive;
-    /**
-     * Offline prevents any download from Internet
-     * @parameter expression="${offline}" default-value="false"
-     */
-    protected boolean offline;
-    /**
-     * Try to be verbose
-     * @parameter expression="${verbose}" default-value="false"
-     */
-    protected boolean verbose;
-
-    public void execute()
-            throws MojoExecutionException {
-        File f = outputDirectory;
-        if (!f.exists()) {
-            f.mkdirs();
-        }
-
-        DependenciesSolver solver = new DependenciesSolver();
-
-        File basedir = project.getBasedir();
-        List projects = new ArrayList();
-        projects.add(project.getFile());
-        if (collectedProjects != null) {
-            for (Iterator i = collectedProjects.iterator(); i.hasNext();) {
-                MavenProject subProject = (MavenProject) i.next();
-                projects.add(subProject.getFile());
-            }
-        }
-
-        solver.setBaseDir(basedir);
-        solver.setMavenRepo(mavenRepo);
-        solver.setOutputDirectory(outputDirectory);
-        solver.setPackageName(packageName);
-        solver.setPackageType(packageType);
-        solver.setInteractive(interactive);
-        solver.setOffline(offline);
-        solver.setListOfPoms(listOfPoms);
-        solver.setVerbose(verbose);
-
-        if (solver.getListOfPOMs().getFirstPOM() == null && collectedProjects != null) {
-            for (Iterator i = collectedProjects.iterator(); i.hasNext();) {
-                MavenProject subProject = (MavenProject) i.next();
-                solver.getListOfPOMs().addPOM(subProject.getFile());
-            }
-        }
-
-        solver.solveDependencies();
-
-        solver.saveListOfPoms();
-        solver.saveMavenRules();
-        solver.saveSubstvars();
-    }
-
-}

Copied: tags/maven-debian-helper/1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java (from rev 13770, trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java)
===================================================================
--- tags/maven-debian-helper/1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java	                        (rev 0)
+++ tags/maven-debian-helper/1.4.3/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java	2011-06-08 22:22:51 UTC (rev 13771)
@@ -0,0 +1,150 @@
+package org.debian.maven.packager;
+
+/*
+ * Copyright 2009 Ludovic Claude.
+ *
+ * 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.
+ */
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Analyze the Maven dependencies and extract the list of dependent packages,
+ * reusable as subvars in the Debian control file and the list of POM files
+ * to use and the rules if they did not exist already.
+ *
+ * @goal dependencies
+ * @aggregator
+ * @requiresDependencyResolution
+ * @phase process-sources
+ * 
+ * @author Ludovic Claude
+ */
+public class DependenciesMojo
+        extends AbstractMojo {
+
+    /**
+     * The Maven Project Object
+     *
+     * @parameter expression="${project}"
+     * @readonly
+     * @required
+     */
+    protected MavenProject project;
+    /**
+     * A list of every project in this reactor; provided by Maven
+     * @parameter expression="${project.collectedProjects}"
+     */
+    protected List collectedProjects;
+    /**
+     * Location of the file.
+     * @parameter expression="${debian.directory}"
+     *   default-value="debian"
+     */
+    protected File outputDirectory;
+    /**
+     * Name of the package (e.g. 'commons-lang')
+     * @parameter expression="${package}"
+     * @required
+     */
+    protected String packageName;
+    /**
+     * Type of the package (e.g. 'maven' or 'ant')
+     * @parameter expression="${packageType}" default-value="maven"
+     */
+    protected String packageType;
+    /**
+     * Should we also resolve Javadoc dependencies
+     * @parameter expression="${resolveJavadoc}" default-value="false"
+     */
+    protected boolean resolveJavadoc;
+    /**
+     * Location for the list of POMs file.
+     * @required
+     * @parameter expression="debian/${package}.poms"
+     */
+    protected File listOfPoms;
+    /**
+     * Location of the Maven repository
+     *
+     * @parameter expression="${maven.repo.local}" default-value="/usr/share/maven-repo"
+     */
+    protected File mavenRepo;
+    /**
+     * Interactive execution will ask questions to the user
+     * @parameter expression="${interactive}" default-value="true"
+     */
+    protected boolean interactive;
+    /**
+     * Offline prevents any download from Internet
+     * @parameter expression="${offline}" default-value="false"
+     */
+    protected boolean offline;
+    /**
+     * Try to be verbose
+     * @parameter expression="${verbose}" default-value="false"
+     */
+    protected boolean verbose;
+
+    public void execute()
+            throws MojoExecutionException {
+        File f = outputDirectory;
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        DependenciesSolver solver = new DependenciesSolver();
+
+        File basedir = project.getBasedir();
+        List projects = new ArrayList();
+        projects.add(project.getFile());
+        if (collectedProjects != null) {
+            for (Iterator i = collectedProjects.iterator(); i.hasNext();) {
+                MavenProject subProject = (MavenProject) i.next();
+                projects.add(subProject.getFile());
+            }
+        }
+
+        solver.setBaseDir(basedir);
+        solver.setMavenRepo(mavenRepo);
+        solver.setOutputDirectory(outputDirectory);
+        solver.setPackageName(packageName);
+        solver.setPackageType(packageType);
+        solver.setGenerateJavadoc(resolveJavadoc);
+        solver.setInteractive(interactive);
+        solver.setOffline(offline);
+        solver.setListOfPoms(listOfPoms);
+        solver.setVerbose(verbose);
+
+        if (solver.getListOfPOMs().getFirstPOM() == null && collectedProjects != null) {
+            for (Iterator i = collectedProjects.iterator(); i.hasNext();) {
+                MavenProject subProject = (MavenProject) i.next();
+                solver.getListOfPOMs().addPOM(subProject.getFile());
+            }
+        }
+
+        solver.solveDependencies();
+
+        solver.saveListOfPoms();
+        solver.saveMavenRules();
+        solver.saveSubstvars();
+    }
+
+}

Deleted: tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk	2011-06-08 21:36:06 UTC (rev 13769)
+++ tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven-vars.mk	2011-06-08 22:22:51 UTC (rev 13771)
@@ -1,108 +0,0 @@
-# This file is based on ant-vars.mk
-
-# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
-# Copyright © 2008 Torsten Werner <twerner at debian.org>
-# Description: Defines useful variables for packages which use Maven
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_maven_vars
-_cdbs_class_maven_vars = 1
-
-# Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.43)
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.4)
-
-# Maven home directory.  Doesn't need to be changed except when using
-# nonstandard Maven installations.
-MAVEN_HOME = /usr/share/maven2
-
-MAVEN_DEBIAN_VERSION = $(shell ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
-MAVEN_CLASSCONF = /etc/maven2/m2-debian.conf
-
-# The home directory of the Java Runtime Environment (JRE) or Java Development
-# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
-# JAVA_HOME_DIRS to multiple possible home directories. The first existing
-# directory from this list is used for JAVA_HOME. You can also override
-# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java.
-JAVA_HOME = $(shell for jh in $(JAVA_HOME_DIRS); do if [ -x "$$jh/bin/java" ]; then \
-	    echo $${jh}; exit 0; fi; done)
-JAVACMD   = $(JAVA_HOME)/bin/java
-
-# You can list all Java ARchives (JARs) to be added to the class path in
-# DEB_JARS, either with their full path or just the basename if the JAR is
-# in /usr/share/java. You may also ommit the ".jar" extension. Non-existing
-# files will silently be ignored. tools.jar is automatically added to the
-# end of the class path if it exists in the JDK's lib directory.
-# You can override the complete class path using DEB_CLASSPATH.
-DEB_JARS_BASE = /usr/share/java
-DEB_CLASSPATH = $(MAVEN_HOME)/boot/classworlds.jar:$(shell for jar in $(DEB_JARS); do \
-		if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
-		if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
-		if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
-		if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
-		done; \
-		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
-
-# Extra arguments for the Maven command line.
-DEB_MAVEN_ARGS = 
-
-# Extra arguments for the mh_patchpoms command line
-DEB_PATCHPOMS_ARGS =
-
-# If true, install the Maven jars to /usr/share/java automatically
-DEB_MAVEN_INSTALL_TO_USJ = true
-
-# The name of the binary package that gets the jar files installed. The
-# first package by default.
-DEB_JAR_PACKAGE = $(firstword $(shell dh_listpackages))
-
-# The name of the package containing the documentation. The second package
-# by default. Leave empty to skip generating documentation.
-DEB_DOC_PACKAGE = $(firstword $(shell dh_listpackages | grep -v "^$(DEB_JAR_PACKAGE)$$" | grep "\-doc$$"))
-
-# Property file for Maven, defaults to debian/maven.properties if it exists.
-# You may define additional properties. Please note that command-line
-# arguments in MAVEN_ARGS (see below) override the settings in pom.xml and
-# the property file.
-DEB_MAVEN_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/maven.properties && echo $(CURDIR)/debian/maven.properties)
-
-# You can specify additional JVM arguments in MAVEN_OPTS and Maven
-# command-line arguments in MAVEN_ARGS. You can additionally define
-# MAVEN_ARGS_<package> for each individual package.
-DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
-		 $(JAVA_OPTS) -Dclassworlds.conf=$(MAVEN_CLASSCONF) \
-		 org.codehaus.classworlds.Launcher \
-		 -s/etc/maven2/settings-debian.xml \
-		 -Dmaven.repo.local=$(DEB_MAVEN_REPO) \
-		 $(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS))
-
-# Targets to invoke for building, installing, testing and cleaning up.
-# Building uses the default target from build.xml, installing and testing is
-# only called if the corresponding variable is set. You can also specify
-# multiple targets for each step.
-DEB_MAVEN_BUILD_TARGET = package
-DEB_MAVEN_INSTALL_TARGET = org.debian.maven:maven-debian-plugin:$(MAVEN_DEBIAN_VERSION):install
-DEB_MAVEN_CHECK_TARGET =
-DEB_MAVEN_CLEAN_TARGET = clean
-DEB_MAVEN_DOC_TARGET = javadoc:jar
-DEB_MAVEN_INSTALL_DOC_TARGET = org.debian.maven:maven-debian-plugin:$(MAVEN_DEBIAN_VERSION):install-doc
-
-endif

Copied: tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven-vars.mk (from rev 13770, trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk)
===================================================================
--- tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven-vars.mk	                        (rev 0)
+++ tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven-vars.mk	2011-06-08 22:22:51 UTC (rev 13771)
@@ -0,0 +1,111 @@
+# This file is based on ant-vars.mk
+
+# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
+# Copyright © 2008 Torsten Werner <twerner at debian.org>
+# Description: Defines useful variables for packages which use Maven
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_maven_vars
+_cdbs_class_maven_vars = 1
+
+# Declare Build-Deps for packages using this file
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.43)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.4)
+
+# Maven home directory.  Doesn't need to be changed except when using
+# nonstandard Maven installations.
+MAVEN_HOME = /usr/share/maven2
+
+MAVEN_DEBIAN_VERSION = $(shell ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
+MAVEN_CLASSCONF = /etc/maven2/m2-debian.conf
+
+# The home directory of the Java Runtime Environment (JRE) or Java Development
+# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
+# JAVA_HOME_DIRS to multiple possible home directories. The first existing
+# directory from this list is used for JAVA_HOME. You can also override
+# JAVACMD in case you don't want to use the default JAVA_HOME/bin/java.
+JAVA_HOME = $(shell for jh in $(JAVA_HOME_DIRS); do if [ -x "$$jh/bin/java" ]; then \
+	    echo $${jh}; exit 0; fi; done)
+JAVACMD   = $(JAVA_HOME)/bin/java
+
+# You can list all Java ARchives (JARs) to be added to the class path in
+# DEB_JARS, either with their full path or just the basename if the JAR is
+# in /usr/share/java. You may also ommit the ".jar" extension. Non-existing
+# files will silently be ignored. tools.jar is automatically added to the
+# end of the class path if it exists in the JDK's lib directory.
+# You can override the complete class path using DEB_CLASSPATH.
+DEB_JARS_BASE = /usr/share/java
+DEB_CLASSPATH = $(MAVEN_HOME)/boot/classworlds.jar:$(shell for jar in $(DEB_JARS); do \
+		if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+		if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+		if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+		if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+		done; \
+		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
+
+# Extra arguments for the Maven command line.
+DEB_MAVEN_ARGS = 
+
+# Extra arguments for the mh_patchpoms command line
+DEB_PATCHPOMS_ARGS =
+
+# Extra arguments for the mh_resolve_dependencies command line
+DEB_RESOLVEDEP_ARGS =
+
+# If true, install the Maven jars to /usr/share/java automatically
+DEB_MAVEN_INSTALL_TO_USJ = true
+
+# The name of the binary package that gets the jar files installed. The
+# first package by default.
+DEB_JAR_PACKAGE = $(firstword $(shell dh_listpackages))
+
+# The name of the package containing the documentation. The second package
+# by default. Leave empty to skip generating documentation.
+DEB_DOC_PACKAGE = $(firstword $(shell dh_listpackages | grep -v "^$(DEB_JAR_PACKAGE)$$" | grep "\-doc$$"))
+
+# Property file for Maven, defaults to debian/maven.properties if it exists.
+# You may define additional properties. Please note that command-line
+# arguments in MAVEN_ARGS (see below) override the settings in pom.xml and
+# the property file.
+DEB_MAVEN_PROPERTYFILE = $(shell test -f $(CURDIR)/debian/maven.properties && echo $(CURDIR)/debian/maven.properties)
+
+# You can specify additional JVM arguments in MAVEN_OPTS and Maven
+# command-line arguments in MAVEN_ARGS. You can additionally define
+# MAVEN_ARGS_<package> for each individual package.
+DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -noverify -cp $(DEB_CLASSPATH) \
+		 $(JAVA_OPTS) -Dclassworlds.conf=$(MAVEN_CLASSCONF) \
+		 org.codehaus.classworlds.Launcher \
+		 -s/etc/maven2/settings-debian.xml \
+		 -Dmaven.repo.local=$(DEB_MAVEN_REPO) \
+		 $(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS))
+
+# Targets to invoke for building, installing, testing and cleaning up.
+# Building uses the default target from build.xml, installing and testing is
+# only called if the corresponding variable is set. You can also specify
+# multiple targets for each step.
+DEB_MAVEN_BUILD_TARGET = package
+DEB_MAVEN_INSTALL_TARGET = org.debian.maven:maven-debian-plugin:$(MAVEN_DEBIAN_VERSION):install
+DEB_MAVEN_CHECK_TARGET =
+DEB_MAVEN_CLEAN_TARGET = clean
+DEB_MAVEN_DOC_TARGET = javadoc:jar
+DEB_MAVEN_INSTALL_DOC_TARGET = org.debian.maven:maven-debian-plugin:$(MAVEN_DEBIAN_VERSION):install-doc
+
+endif

Deleted: tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven.mk	2011-06-08 21:36:06 UTC (rev 13769)
+++ tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven.mk	2011-06-08 22:22:51 UTC (rev 13771)
@@ -1,146 +0,0 @@
-# This file is based on ant.mk
-
-# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
-# Copyright © 2008 Torsten Werner <twerner at debian.org>
-# Copyright © 2009 Ludovic Claude <ludovic.claude at laposte.net>
-# Description: Builds and cleans packages which have an Maven pom.xml file
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_maven
-_cdbs_class_maven = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-include $(_cdbs_class_path)/maven-vars.mk$(_cdbs_makefile_suffix)
-
-DEB_MAVEN_REPO := $(CURDIR)/debian/maven-repo
-
-JAVA_OPTS = \
-  $(shell test -n "$(DEB_MAVEN_PROPERTYFILE)" && echo -Dproperties.file.manual=$(DEB_MAVEN_PROPERTYFILE))
-
-DEB_PHONY_RULES += maven-sanity-check before-mvn-build mvn-build after-mvn-build patch-poms unpatch-poms
-
-cdbs_use_maven_substvars := $(shell grep -q "{maven:\w*Depends}" debian/control && echo yes)
-cdbs_new_poms_file := $(shell test ! -f debian/$(DEB_JAR_PACKAGE).poms && echo yes)
-cdbs_new_maven_rules_file := $(shell test ! -f debian/maven.rules && echo yes)
-
-maven-sanity-check:
-	@if ! test -x "$(JAVACMD)"; then \
-		echo "You must specify a valid JAVA_HOME or JAVACMD!"; \
-		exit 1; \
-	fi
-	@if ! test -r "$(MAVEN_HOME)/boot/classworlds.jar"; then \
-		echo "You must specify a valid MAVEN_HOME directory!"; \
-		exit 1; \
-	fi
-
-debian/$(DEB_JAR_PACKAGE).poms:
-	mh_lspoms --non-interactive --offline -p$(DEB_JAR_PACKAGE)
-
-debian/maven.rules:
-	mh_lspoms --non-interactive --offline -p$(DEB_JAR_PACKAGE) --force
-
-ifeq (, $(DEB_DOC_PACKAGE))
-DEB_PATCHPOMS_ARGS += --build-no-docs
-debian/stamp-maven-build: override MAVEN_CLASSCONF = /etc/maven2/m2-debian-nodocs.conf
-endif
-
-debian/stamp-poms-patched: debian/maven-repo
-	mh_patchpoms -p$(DEB_JAR_PACKAGE) --debian-build --keep-pom-version --maven-repo=$(DEB_MAVEN_REPO) $(DEB_PATCHPOMS_ARGS)
-	touch debian/stamp-poms-patched
-
-patch-poms: debian/$(DEB_JAR_PACKAGE).poms debian/maven.rules debian/stamp-poms-patched
-
-unpatch-poms: debian/$(DEB_JAR_PACKAGE).poms
-	mh_unpatchpoms -p$(DEB_JAR_PACKAGE)
-	$(RM) -f debian/stamp-poms-patched
-
-debian/maven-repo:
-	/usr/share/maven-debian-helper/copy-repo.sh $(CURDIR)/debian
-
-post-patches:: patch-poms
-
-clean:: unpatch-poms
-	mh_clean
-
-common-build-arch common-build-indep:: maven-sanity-check debian/stamp-maven-build
-debian/stamp-maven-build: debian/maven-repo before-mvn-build mvn-build after-mvn-build
-mvn-build:
-	# before-build target may be used to unpatch the pom files, so we need to check if
-	# patching the pom files is needed here, normally not
-	if [ ! -f pom.xml.save ]; then \
-		$(MAKE) -f debian/rules patch-poms; \
-	fi
-	$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET)
-	touch $@
-# Placeholders to insert custom processing before and after a Maven build
-before-mvn-build::
-after-mvn-build::
-
-cleanbuilddir:: DEB_PATCHPOMS_ARGS += --ignore-rules=debian/maven.ignoreRules --clean-ignore-rules=debian/maven.cleanIgnoreRules
-cleanbuilddir:: maven-sanity-check post-patches debian/maven-repo
-	-$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CLEAN_TARGET)
-	$(RM) -r $(DEB_MAVEN_REPO) debian/stamp-maven-build
-	$(if $(cdbs_new_poms_file), $(RM) debian/$(DEB_JAR_PACKAGE).poms)
-	$(if $(cdbs_new_maven_rules_file), $(RM) debian/maven.rules)
-	$(if $(cdbs_use_maven_substvars), $(RM) debian/*.substvars)
-	$(MAKE) -f debian/rules unpatch-poms
-
-# extra arguments for the installation step
-PLUGIN_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_JAR_PACKAGE) -Dmaven.repo.local=$(DEB_MAVEN_REPO) -Dinstall.to.usj=$(DEB_MAVEN_INSTALL_TO_USJ)
-
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
-	$(if $(DEB_MAVEN_INSTALL_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_INSTALL_TARGET), at echo "DEB_MAVEN_INSTALL_TARGET unset, skipping default maven.mk common-install target")
-	$(if $(cdbs_use_maven_substvars), mh_resolve_dependencies --non-interactive --offline -p$(DEB_JAR_PACKAGE))
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-common-build-arch common-build-indep:: debian/stamp-maven-check
-debian/stamp-maven-check: debian/stamp-maven-build
-	$(if $(DEB_MAVEN_CHECK_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_CHECK_TARGET), at echo "DEB_MAVEN_CHECK_TARGET unset, not running checks")
-	$(if $(DEB_MAVEN_CHECK_TARGET),touch $@)
-
-clean:: 
-	$(if $(DEB_MAVEN_CHECK_TARGET),$(RM) debian/stamp-maven-check)
-endif
-
-ifneq (,$(DEB_DOC_PACKAGE))
-# extra arguments for the installation step
-PLUGIN_DOC_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_DOC_PACKAGE)
-
-common-build-arch common-build-indep:: debian/stamp-maven-doc
-debian/stamp-maven-doc: debian/stamp-maven-build
-	if [ ! -f pom.xml.save ]; then \
-		$(MAKE) -f debian/rules patch-poms; \
-	fi
-	$(if $(DEB_MAVEN_DOC_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_DOC_ARGS) $(DEB_MAVEN_DOC_TARGET), at echo "DEB_MAVEN_DOC_TARGET unset, not generating documentation")
-	$(if $(DEB_MAVEN_DOC_TARGET),touch $@)
-
-common-install-impl:: 
-	$(if $(DEB_MAVEN_INSTALL_DOC_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_DOC_ARGS) $(DEB_MAVEN_INSTALL_DOC_TARGET), at echo "DEB_MAVEN_INSTALL_DOC_TARGET unset, skipping documentation maven.mk common-install target")
-	$(if $(cdbs_use_maven_substvars), cp debian/$(DEB_JAR_PACKAGE).substvars debian/$(DEB_DOC_PACKAGE).substvars)
-	# cleanup generated docs
-	$(RM) -f target/apidocs/*.sh target/apidocs/options 
-
-clean:: 
-	$(if $(DEB_MAVEN_DOC_TARGET),$(RM) debian/stamp-maven-doc)
-endif
-
-endif

Copied: tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven.mk (from rev 13770, trunk/maven-debian-helper/share/cdbs/1/class/maven.mk)
===================================================================
--- tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven.mk	                        (rev 0)
+++ tags/maven-debian-helper/1.4.3/share/cdbs/1/class/maven.mk	2011-06-08 22:22:51 UTC (rev 13771)
@@ -0,0 +1,150 @@
+# This file is based on ant.mk
+
+# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
+# Copyright © 2008 Torsten Werner <twerner at debian.org>
+# Copyright © 2009 Ludovic Claude <ludovic.claude at laposte.net>
+# Description: Builds and cleans packages which have an Maven pom.xml file
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_maven
+_cdbs_class_maven = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/maven-vars.mk$(_cdbs_makefile_suffix)
+
+DEB_MAVEN_REPO := $(CURDIR)/debian/maven-repo
+
+JAVA_OPTS = \
+  $(shell test -n "$(DEB_MAVEN_PROPERTYFILE)" && echo -Dproperties.file.manual=$(DEB_MAVEN_PROPERTYFILE))
+
+DEB_PHONY_RULES += maven-sanity-check before-mvn-build mvn-build after-mvn-build patch-poms unpatch-poms
+
+cdbs_use_maven_substvars := $(shell grep -q "{maven:\w*Depends}" debian/control && echo yes)
+cdbs_new_poms_file := $(shell test ! -f debian/$(DEB_JAR_PACKAGE).poms && echo yes)
+cdbs_new_maven_rules_file := $(shell test ! -f debian/maven.rules && echo yes)
+
+maven-sanity-check:
+	@if ! test -x "$(JAVACMD)"; then \
+		echo "You must specify a valid JAVA_HOME or JAVACMD!"; \
+		exit 1; \
+	fi
+	@if ! test -r "$(MAVEN_HOME)/boot/classworlds.jar"; then \
+		echo "You must specify a valid MAVEN_HOME directory!"; \
+		exit 1; \
+	fi
+
+debian/$(DEB_JAR_PACKAGE).poms:
+	mh_lspoms --non-interactive --offline -p$(DEB_JAR_PACKAGE)
+
+debian/maven.rules:
+	mh_lspoms --non-interactive --offline -p$(DEB_JAR_PACKAGE) --force
+
+ifeq (, $(DEB_DOC_PACKAGE))
+DEB_PATCHPOMS_ARGS += --build-no-docs
+debian/stamp-maven-build: override MAVEN_CLASSCONF = /etc/maven2/m2-debian-nodocs.conf
+endif
+
+debian/stamp-poms-patched: debian/maven-repo
+	mh_patchpoms -p$(DEB_JAR_PACKAGE) --debian-build --keep-pom-version --maven-repo=$(DEB_MAVEN_REPO) $(DEB_PATCHPOMS_ARGS)
+	touch debian/stamp-poms-patched
+
+patch-poms: debian/$(DEB_JAR_PACKAGE).poms debian/maven.rules debian/stamp-poms-patched
+
+unpatch-poms: debian/$(DEB_JAR_PACKAGE).poms
+	mh_unpatchpoms -p$(DEB_JAR_PACKAGE)
+	$(RM) -f debian/stamp-poms-patched
+
+debian/maven-repo:
+	/usr/share/maven-debian-helper/copy-repo.sh $(CURDIR)/debian
+
+post-patches:: patch-poms
+
+clean:: unpatch-poms
+	mh_clean
+
+common-build-arch common-build-indep:: maven-sanity-check debian/stamp-maven-build
+debian/stamp-maven-build: debian/maven-repo before-mvn-build mvn-build after-mvn-build
+mvn-build:
+	# before-build target may be used to unpatch the pom files, so we need to check if
+	# patching the pom files is needed here, normally not
+	if [ ! -f pom.xml.save ]; then \
+		$(MAKE) -f debian/rules patch-poms; \
+	fi
+	$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET)
+	touch $@
+# Placeholders to insert custom processing before and after a Maven build
+before-mvn-build::
+after-mvn-build::
+
+cleanbuilddir:: DEB_PATCHPOMS_ARGS += --ignore-rules=debian/maven.ignoreRules --clean-ignore-rules=debian/maven.cleanIgnoreRules
+cleanbuilddir:: maven-sanity-check post-patches debian/maven-repo
+	-$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CLEAN_TARGET)
+	$(RM) -r $(DEB_MAVEN_REPO) debian/stamp-maven-build
+	$(if $(cdbs_new_poms_file), $(RM) debian/$(DEB_JAR_PACKAGE).poms)
+	$(if $(cdbs_new_maven_rules_file), $(RM) debian/maven.rules)
+	$(if $(cdbs_use_maven_substvars), $(RM) debian/*.substvars)
+	$(MAKE) -f debian/rules unpatch-poms
+
+# extra arguments for the installation step
+PLUGIN_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_JAR_PACKAGE) -Dmaven.repo.local=$(DEB_MAVEN_REPO) -Dinstall.to.usj=$(DEB_MAVEN_INSTALL_TO_USJ)
+
+ifneq (, $(DEB_DOC_PACKAGE))
+DEB_RESOLVEDEP_ARGS += --javadoc
+endif
+
+common-install-arch common-install-indep:: common-install-impl
+common-install-impl::
+	$(if $(DEB_MAVEN_INSTALL_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_INSTALL_TARGET), at echo "DEB_MAVEN_INSTALL_TARGET unset, skipping default maven.mk common-install target")
+	$(if $(cdbs_use_maven_substvars), mh_resolve_dependencies --non-interactive --offline -p$(DEB_JAR_PACKAGE) $(DEB_RESOLVEDEP_ARGS) )
+
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+common-build-arch common-build-indep:: debian/stamp-maven-check
+debian/stamp-maven-check: debian/stamp-maven-build
+	$(if $(DEB_MAVEN_CHECK_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_CHECK_TARGET), at echo "DEB_MAVEN_CHECK_TARGET unset, not running checks")
+	$(if $(DEB_MAVEN_CHECK_TARGET),touch $@)
+
+clean:: 
+	$(if $(DEB_MAVEN_CHECK_TARGET),$(RM) debian/stamp-maven-check)
+endif
+
+ifneq (,$(DEB_DOC_PACKAGE))
+# extra arguments for the installation step
+PLUGIN_DOC_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_DOC_PACKAGE)
+
+common-build-arch common-build-indep:: debian/stamp-maven-doc
+debian/stamp-maven-doc: debian/stamp-maven-build
+	if [ ! -f pom.xml.save ]; then \
+		$(MAKE) -f debian/rules patch-poms; \
+	fi
+	$(if $(DEB_MAVEN_DOC_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_DOC_ARGS) $(DEB_MAVEN_DOC_TARGET), at echo "DEB_MAVEN_DOC_TARGET unset, not generating documentation")
+	$(if $(DEB_MAVEN_DOC_TARGET),touch $@)
+
+common-install-impl:: 
+	$(if $(DEB_MAVEN_INSTALL_DOC_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_DOC_ARGS) $(DEB_MAVEN_INSTALL_DOC_TARGET), at echo "DEB_MAVEN_INSTALL_DOC_TARGET unset, skipping documentation maven.mk common-install target")
+	$(if $(cdbs_use_maven_substvars), cp debian/$(DEB_JAR_PACKAGE).substvars debian/$(DEB_DOC_PACKAGE).substvars)
+	# cleanup generated docs
+	$(RM) -f target/apidocs/*.sh target/apidocs/options 
+
+clean:: 
+	$(if $(DEB_MAVEN_DOC_TARGET),$(RM) debian/stamp-maven-doc)
+endif
+
+endif




More information about the pkg-java-commits mailing list