The following commit has been merged in the master branch:
commit ee62ef641f80c7ae05aec94412714514c56b8e60
Author: Damien Raude-Morvan <draz...@debian.org>
Date:   Mon Nov 28 19:56:56 2011 +0100

    Team upload.
    
    * Team upload.
    * Re-enable shade plugin to conform to upstream behavior.

diff --git a/debian/changelog b/debian/changelog
index 38d7b6c..29bbf18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven-ant-tasks (2.1.3-2) unstable; urgency=low
+
+  * Team upload.
+  * Re-enable shade plugin to conform to upstream behavior.
+  * Bump Standards-Version to 3.9.2: no changes needed.
+
+ -- Damien Raude-Morvan <draz...@debian.org>  Thu, 08 Dec 2011 00:54:32 +0100
+
 maven-ant-tasks (2.1.3-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f0b1155..af85276 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,21 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Ramakrishnan Muthukrishnan <rkrish...@debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper
-Build-Depends-Indep: libmaven2-core-java, libmaven-invoker-plugin-java, ant, 
libmaven-assembly-plugin-java
-Standards-Version: 3.9.0
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
+Build-Depends-Indep: ant,
+                     libmaven-assembly-plugin-java,
+                     libmaven-invoker-plugin-java,
+                     libmaven-parent-java,
+                     libmaven-shade-plugin-java,
+                     libmaven2-core-java
+Standards-Version: 3.9.2
 Homepage: http://maven.apache.org/ant-tasks/index.html
 Vcs-Git: git://git.debian.org/pkg-java/maven-ant-tasks.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/maven-ant-tasks.git;a=summary
 
 Package: libmaven-ant-tasks-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: use Maven's artifact handling features from Ant
  The Mavent Ant Tasks allow several of Maven's artifact handling features to
  be used from within an Ant build. These include:
@@ -22,4 +27,3 @@ Description: use Maven's artifact handling features from Ant
    * Artifact deployment - deployment to a Maven repository (file integrated,
      other with extensions)
    * POM processing - for reading and writing a Maven 2 pom.xml file.
-
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..b92d537
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+org.apache.maven maven-parent pom s/.*/debian/ * *
+classworlds classworlds * s/.*/debian/ * *
+junit junit * s/.*/3.x/ * *
+org.codehaus.plexus plexus-container-default * s/.*/1.0-alpha/ * *
diff --git a/debian/patches/0001-remove-shade-plugin.patch 
b/debian/patches/0001-remove-shade-plugin.patch
deleted file mode 100644
index 385c953..0000000
--- a/debian/patches/0001-remove-shade-plugin.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Ramakrishnan Muthukrishnan <rkrish...@debian.org>
-Date: Tue, 27 Sep 2011 18:58:43 +0200
-Subject: remove shade plugin
-
-Remove the portions of pom which use the shade plugin.
----
- pom.xml |   58 ++--------------------------------------------------------
- 1 files changed, 2 insertions(+), 56 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 7097520..05486bb 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -22,11 +22,6 @@
- <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-   <modelVersion>4.0.0</modelVersion>
- 
--  <parent>
--    <groupId>org.apache.maven</groupId>
--    <artifactId>maven-parent</artifactId>
--    <version>19</version>
--  </parent>
- 
-   <groupId>org.apache.maven</groupId>
-   <artifactId>maven-ant-tasks</artifactId>
-@@ -141,12 +136,12 @@
-     <dependency>
-       <groupId>classworlds</groupId>
-       <artifactId>classworlds</artifactId>
--      <version>1.1-alpha-2</version>
-+      <version>1.1</version>
-     </dependency>
-     <dependency>
-       <groupId>junit</groupId>
-       <artifactId>junit</artifactId>
--      <version>3.8.1</version>
-+      <version>3.8.2</version>
-       <scope>test</scope>
-     </dependency>
-     <dependency>
-@@ -228,10 +223,6 @@
-           </configuration>
-         </plugin>
-         <plugin>
--          <artifactId>maven-shade-plugin</artifactId>
--          <version>1.4</version>
--        </plugin>
--        <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-release-plugin</artifactId>
-           <configuration>
-@@ -240,51 +231,6 @@
-         </plugin>
-       </plugins>
-     </pluginManagement>
--    <plugins>
--      <plugin>
--        <groupId>org.apache.maven.plugins</groupId>
--        <artifactId>maven-shade-plugin</artifactId>
--        <executions>
--          <execution>
--            <phase>package</phase>
--            <goals>
--              <goal>shade</goal>
--            </goals>
--            <configuration>
--              <createDependencyReducedPom>false</createDependencyReducedPom>
--              
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
--              <transformers>
--                <transformer 
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
 />
--              </transformers>
--              <artifactSet>
--                <excludes>
--                  <exclude>junit:junit</exclude>
--                  <exclude>jtidy:jtidy</exclude>
--                  <exclude>xml-apis:xml-apis</exclude>
--                  <exclude>org.apache.ant:ant</exclude>
--                  <exclude>org.apache.ant:ant-launcher</exclude>
--                  
<exclude>backport-util-concurrent:backport-util-concurrent</exclude>
--                </excludes>
--              </artifactSet>
--              <relocations>
--                <relocation>
--                  <pattern>org.codehaus.plexus.util</pattern>
--                  
<shadedPattern>org.apache.maven.artifact.ant.shaded</shadedPattern>
--                  <excludes>
--                    <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
--                    <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
--                  </excludes>
--                </relocation>
--                <relocation>
--                  
<pattern>edu.emory.mathcs.backport.java.util.concurrent</pattern>
--                  <shadedPattern>java.util.concurrent</shadedPattern>
--                </relocation>
--              </relocations>
--            </configuration>
--          </execution>
--        </executions>
--      </plugin>
--    </plugins>
-   </build>
- 
-   <profiles>
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d283bd7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-remove-shade-plugin.patch

-- 
repository for the debian packaging of maven-ant-tasks.

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to