[pkg-java] r13059 - in trunk/maven-ant-helper: . debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2010-11-03 22:28:38 +0000 (Wed, 03 Nov 2010)
New Revision: 13059

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/debian/control
   trunk/maven-ant-helper/maven-build.xml
Log:
* release to experimental



Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2010-11-03 22:19:03 UTC (rev 13058)
+++ trunk/maven-ant-helper/debian/changelog	2010-11-03 22:28:38 UTC (rev 13059)
@@ -1,4 +1,4 @@
-maven-ant-helper (7.0) UNRELEASED; urgency=low
+maven-ant-helper (7.0) experimental; urgency=low
 
   * Update Standards-Version to 3.9.1, use source format 3.0 (native)  
   * Use default-jdk-doc instead of openjdk-6-doc when linking

Modified: trunk/maven-ant-helper/debian/control
===================================================================
--- trunk/maven-ant-helper/debian/control	2010-11-03 22:19:03 UTC (rev 13058)
+++ trunk/maven-ant-helper/debian/control	2010-11-03 22:28:38 UTC (rev 13059)
@@ -14,7 +14,7 @@
 Package: maven-ant-helper
 Architecture: all
 Section: java
-Depends: ${misc:Depends}, ant, ant-optional, ant-contrib, maven-repo-helper
+Depends: ${misc:Depends}, ant, ant-optional, ant-contrib, maven-repo-helper (>= 1.4)
 Suggests: default-jdk-doc, libmodello-java (>= 1.0), libmaven2-core-java, 
  libmaven-plugin-tools-java, libplexus-component-metadata-java
 Description: helper scripts for building Maven components with ant

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2010-11-03 22:19:03 UTC (rev 13058)
+++ trunk/maven-ant-helper/maven-build.xml	2010-11-03 22:28:38 UTC (rev 13059)
@@ -134,9 +134,9 @@
 
         <loadfile srcfile="${debian.dir}/${bin.package}.poms" property="cleaner.options">
             <filterchain>
-               <linecontains>
-                   <contains value="${pom.name}" />
-               </linecontains>
+               <linecontainsregexp>
+                   <regexp pattern="^${pom.name}$" />
+               </linecontainsregexp>
                <tokenfilter>
                  <containsregex
                      pattern="[^ ]*(.*)"
@@ -158,6 +158,12 @@
         </delete> 
 
         <property name="pom.loc" location="${pom.file}" />
+        <c:if>
+            <not><equals arg1="pom.xml" arg2="${pom.name}"/></not>
+            <then>
+                <c:var name="cleaner.options" value="${cleaner.options} --keep-parent-version" />
+            </then>
+        </c:if>
 
         <java fork="true" dir="." 
            classname="org.debian.maven.repo.POMCleaner">