[pkg-java] r7560 - in trunk/maven-clean-plugin/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-07 00:38:09 +0000 (Sun, 07 Dec 2008)
New Revision: 7560

Modified:
   trunk/maven-clean-plugin/debian/control
   trunk/maven-clean-plugin/debian/patches/pom.diff
   trunk/maven-clean-plugin/debian/rules
Log:
final fixes


Modified: trunk/maven-clean-plugin/debian/control
===================================================================
--- trunk/maven-clean-plugin/debian/control	2008-12-07 00:17:49 UTC (rev 7559)
+++ trunk/maven-clean-plugin/debian/control	2008-12-07 00:38:09 UTC (rev 7560)
@@ -4,13 +4,13 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper,
- libmaven-file-management-java
+ libmaven-plugin-tools-java, libmaven-file-management-java
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-clean-plugin
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-clean-plugin/
 Homepage: http://maven.apache.org/plugins/maven-clean-plugin/
 
-Package: maven-clean-plugin
+Package: libmaven-clean-plugin-java
 Architecture: all
 Section: devel
 Depends: ${misc:Depends}, default-jre | java2-runtime, libmaven-file-management-java

Modified: trunk/maven-clean-plugin/debian/patches/pom.diff
===================================================================
--- trunk/maven-clean-plugin/debian/patches/pom.diff	2008-12-07 00:17:49 UTC (rev 7559)
+++ trunk/maven-clean-plugin/debian/patches/pom.diff	2008-12-07 00:38:09 UTC (rev 7560)
@@ -1,7 +1,7 @@
 Index: maven-clean-plugin-2.2/pom.xml
 ===================================================================
 --- maven-clean-plugin-2.2.orig/pom.xml	2007-11-30 00:33:21.000000000 +0100
-+++ maven-clean-plugin-2.2/pom.xml	2008-12-07 01:12:27.000000000 +0100
++++ maven-clean-plugin-2.2/pom.xml	2008-12-07 01:31:45.000000000 +0100
 @@ -21,13 +21,16 @@
  <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/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
@@ -27,15 +27,36 @@
      <dependency>
        <groupId>org.apache.maven</groupId>
        <artifactId>maven-project</artifactId>
-@@ -66,6 +70,7 @@
+@@ -56,15 +60,27 @@
+       <artifactId>maven-plugin-api</artifactId>
+       <version>2.0</version>
+     </dependency>
++    -->
++    <dependency>
++      <groupId>org.apache.maven.shared</groupId>
++      <artifactId>maven-shared-io</artifactId>
++      <version>1.1</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/maven-shared-io.jar</systemPath>
++    </dependency>
+     <dependency>
+       <groupId>org.apache.maven.shared</groupId>
+       <artifactId>file-management</artifactId>
+       <version>1.2</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/file-management.jar</systemPath>
+     </dependency>
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
        <artifactId>plexus-utils</artifactId>
-       <version>1.1</version>
+-      <version>1.1</version>
++      <version>1.4.8</version>
++      <scope>system</scope>
++      <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
      </dependency>
-+    -->
  
      <!-- Test -->
-     <dependency>
-@@ -83,7 +88,17 @@
+@@ -83,7 +99,17 @@
    </contributors>
  
    <build>
@@ -53,7 +74,7 @@
        <plugin>
          <artifactId>maven-surefire-plugin</artifactId>
          <version>2.3</version>
-@@ -92,6 +107,7 @@
+@@ -92,6 +118,7 @@
          <artifactId>maven-source-plugin</artifactId>
          <version>2.0.4</version>
        </plugin>

Modified: trunk/maven-clean-plugin/debian/rules
===================================================================
--- trunk/maven-clean-plugin/debian/rules	2008-12-07 00:17:49 UTC (rev 7559)
+++ trunk/maven-clean-plugin/debian/rules	2008-12-07 00:38:09 UTC (rev 7560)
@@ -16,3 +16,9 @@
 get-orig-source:
 	uscan --force-download
 
+REPO    := /usr/share/maven-repo
+PLUGINS := $(REPO)/org/apache/maven/plugins
+
+binary-post-install/lib$(PACKAGE)-java::
+	dh_install target/*.jar $(PLUGINS)/$(PACKAGE)/$(VERSION)/
+	install -m644 pom.xml $(DEB_DESTDIR)$(PLUGINS)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom