[pkg-java] r7661 - in trunk/plexus-cdc/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-14 20:34:29 +0000 (Sun, 14 Dec 2008)
New Revision: 7661

Modified:
   trunk/plexus-cdc/debian/patches/pom.diff
   trunk/plexus-cdc/debian/rules
Log:
use the newest maven-debian-helper


Modified: trunk/plexus-cdc/debian/patches/pom.diff
===================================================================
--- trunk/plexus-cdc/debian/patches/pom.diff	2008-12-14 20:25:36 UTC (rev 7660)
+++ trunk/plexus-cdc/debian/patches/pom.diff	2008-12-14 20:34:29 UTC (rev 7661)
@@ -2,8 +2,8 @@
 
 Index: plexus-cdc-1.0~alpha14/pom.xml
 ===================================================================
---- plexus-cdc-1.0~alpha14.orig/pom.xml	2008-12-12 13:01:05.000000000 +0100
-+++ plexus-cdc-1.0~alpha14/pom.xml	2008-12-12 13:04:41.000000000 +0100
+--- plexus-cdc-1.0~alpha14.orig/pom.xml	2008-07-25 01:56:09.000000000 +0200
++++ plexus-cdc-1.0~alpha14/pom.xml	2008-12-14 21:31:42.000000000 +0100
 @@ -21,6 +21,8 @@
              <groupId>org.slf4j</groupId>
              <artifactId>slf4j-api</artifactId>
@@ -13,7 +13,7 @@
          </dependency>
          <!--
          NOTE: When QDox 1.7 is fuly cooked should update this and consider using it to provide source-level
-@@ -36,12 +38,30 @@
+@@ -36,12 +38,23 @@
              <groupId>com.thoughtworks.qdox</groupId>
              <artifactId>qdox</artifactId>
              <version>1.6.3</version>
@@ -29,13 +29,6 @@
          </dependency>
 +	<dependency>
 +	  <groupId>org.codehaus.plexus</groupId>
-+	  <artifactId>plexus-utils</artifactId>
-+	  <version>1.5.6</version>
-+	  <scope>system</scope>
-+	  <systemPath>/usr/share/java/plexus-utils.jar</systemPath>
-+	</dependency>
-+	<dependency>
-+	  <groupId>org.codehaus.plexus</groupId>
 +	  <artifactId>plexus-container-default</artifactId>
 +	  <version>1.0-alpha-9-stable-1</version>
 +	  <scope>system</scope>

Modified: trunk/plexus-cdc/debian/rules
===================================================================
--- trunk/plexus-cdc/debian/rules	2008-12-14 20:25:36 UTC (rev 7660)
+++ trunk/plexus-cdc/debian/rules	2008-12-14 20:34:29 UTC (rev 7661)
@@ -4,16 +4,7 @@
 include /usr/share/cdbs/1/class/maven.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-PACKAGE   := $(DEB_SOURCE_PACKAGE)
-VERSION   := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's,~alpha,-alpha-,')
 JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 
 get-orig-source:
 	sh -e debian/orig-tar.sh
-
-DEST := $(DEB_MAVEN_REPO)/org/codehaus/plexus
-
-binary-post-install/lib$(PACKAGE)-java::
-	dh_install target/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/
-	install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom
-	dh_link $(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar