[pkg-java] r11786 - in trunk/maven-debian-helper: debian share/cdbs/1/class

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-03-01 20:23:25 +0000 (Mon, 01 Mar 2010)
New Revision: 11786

Modified:
   trunk/maven-debian-helper/debian/changelog
   trunk/maven-debian-helper/debian/control
   trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
   trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
Log:
* 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.

Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2010-03-01 04:39:54 UTC (rev 11785)
+++ trunk/maven-debian-helper/debian/changelog	2010-03-01 20:23:25 UTC (rev 11786)
@@ -1,3 +1,12 @@
+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

Modified: trunk/maven-debian-helper/debian/control
===================================================================
--- trunk/maven-debian-helper/debian/control	2010-03-01 04:39:54 UTC (rev 11785)
+++ trunk/maven-debian-helper/debian/control	2010-03-01 20:23:25 UTC (rev 11786)
@@ -2,12 +2,13 @@
 Section: java
 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>, Michael Koch <konqueror at gmx.de>
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
+ Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>> 4), ant-optional, help2man
 Build-Depends-Indep: maven-repo-helper (>> 0.5),
  junit, testng, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
  libmaven2-core-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-debian-helper/
 Homepage: http://wiki.debian.org/Java/MavenBuilder

Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk	2010-03-01 04:39:54 UTC (rev 11785)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk	2010-03-01 20:23:25 UTC (rev 11786)
@@ -73,7 +73,7 @@
 
 # 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$"))
+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

Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven.mk	2010-03-01 04:39:54 UTC (rev 11785)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven.mk	2010-03-01 20:23:25 UTC (rev 11786)
@@ -112,14 +112,14 @@
 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 $(DEB_MAVEN_DOC_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_DOC_TARGET), at echo "DEB_MAVEN_DOC_TARGET unset, not generating documentation")
+	$(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 $@)
 
-# extra arguments for the installation step
-PLUGIN_DOC_ARGS = -Ddebian.dir=$(CURDIR)/debian -Ddebian.package=$(DEB_DOC_PACKAGE)
-
 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)