[pkg-java] r15665 - in trunk/maven-debian-helper: debian maven-packager-utils/src/main/resources

[Damien Raude-Morvan]

Author: drazzib
Date: 2012-01-08 12:50:08 +0000 (Sun, 08 Jan 2012)
New Revision: 15665

Modified:
   trunk/maven-debian-helper/debian/changelog
   trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.xml.vm
Log:
maven-packager-utils/src/main/resources/build.xml.vm: package-module ant
macro is always needed (at least for root module).

Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2012-01-08 12:09:30 UTC (rev 15664)
+++ trunk/maven-debian-helper/debian/changelog	2012-01-08 12:50:08 UTC (rev 15665)
@@ -1,5 +1,6 @@
 maven-debian-helper (1.5) UNRELEASED; urgency=low
 
+  [ Ludovic Claude ]
   * Install jars in /usr/share/java (Closes: #636660)
   * Now requires Java 1.5 or better to compile and run.
   * Remove velocity.log after running mh_make (Closes: #641261)
@@ -12,8 +13,12 @@
   * Run unit tests during the build,
   * d/control: add B-D on libcommons-io-java as it's used by the junit tests.
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 28 Oct 2011 16:07:26 +0200
+  [ Damien Raude-Morvan ]
+  * maven-packager-utils/src/main/resources/build.xml.vm: package-module ant
+    macro is always needed (at least for root module).
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 08 Jan 2012 13:49:06 +0100
+
 maven-debian-helper (1.4.5) unstable; urgency=low
 
   * SysInstallMojo: Support "finalName" attribute to override

Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.xml.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.xml.vm	2012-01-08 12:09:30 UTC (rev 15664)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/build.xml.vm	2012-01-08 12:50:08 UTC (rev 15665)
@@ -16,7 +16,6 @@
         </sequential>
     </macrodef>
 
-#if ($containsJars)
     <macrodef name="package-module">
         <attribute name="dir"/>
         <sequential>
@@ -28,7 +27,6 @@
         </sequential>
     </macrodef>
 
-#end
 #if ($containsPlugins)
     <macrodef name="package-plugin-module">
         <attribute name="dir"/>