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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-10 15:04:19 +0000 (Wed, 10 Dec 2008)
New Revision: 7632

Added:
   trunk/plexus-cdc/debian/patches/
   trunk/plexus-cdc/debian/patches/pom.diff
   trunk/plexus-cdc/debian/patches/series
Modified:
   trunk/plexus-cdc/debian/
   trunk/plexus-cdc/debian/maven.mk
   trunk/plexus-cdc/debian/rules
Log:
package builds now



Property changes on: trunk/plexus-cdc/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/plexus-cdc/debian/maven.mk
===================================================================
--- trunk/plexus-cdc/debian/maven.mk	2008-12-10 14:59:58 UTC (rev 7631)
+++ trunk/plexus-cdc/debian/maven.mk	2008-12-10 15:04:19 UTC (rev 7632)
@@ -50,7 +50,7 @@
 	$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET)
 	touch $@
 
-clean:: maven-sanity-check
+cleanbuilddir:: maven-sanity-check apply-patches
 	-$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CLEAN_TARGET)
 	$(RM) debian/stamp-maven-build
 

Added: trunk/plexus-cdc/debian/patches/pom.diff
===================================================================
--- trunk/plexus-cdc/debian/patches/pom.diff	                        (rev 0)
+++ trunk/plexus-cdc/debian/patches/pom.diff	2008-12-10 15:04:19 UTC (rev 7632)
@@ -0,0 +1,80 @@
+Index: plexus-cdc-1.0~alpha14/pom.xml
+===================================================================
+--- plexus-cdc-1.0~alpha14.orig/pom.xml	2008-12-10 15:50:22.000000000 +0100
++++ plexus-cdc-1.0~alpha14/pom.xml	2008-12-08 12:24:07.000000000 +0100
+@@ -6,13 +6,16 @@
+ 
+     <modelVersion>4.0.0</modelVersion>
+ 
++    <!--
+     <parent>
+         <groupId>org.codehaus.plexus</groupId>
+         <artifactId>plexus-tools</artifactId>
+         <version>1.0.11</version>
+     </parent>
++    -->
+ 
+     <artifactId>plexus-cdc</artifactId>
++    <groupId>org.codehaus.plexus</groupId>
+     <name>Plexus Component Descriptor Creator</name>
+     <version>1.0-alpha-14</version>
+ 
+@@ -21,6 +24,8 @@
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-api</artifactId>
+             <version>1.4.3</version>
++	    <scope>system</scope>
++	    <systemPath>/usr/share/java/slf4j-api.jar</systemPath>
+         </dependency>
+         <!--
+         NOTE: When QDox 1.7 is fuly cooked should update this and consider using it to provide source-level
+@@ -36,12 +41,30 @@
+             <groupId>com.thoughtworks.qdox</groupId>
+             <artifactId>qdox</artifactId>
+             <version>1.6.3</version>
++	    <scope>system</scope>
++	    <systemPath>/usr/share/java/qdox.jar</systemPath>
+         </dependency>
+         <dependency>
+             <groupId>jdom</groupId>
+             <artifactId>jdom</artifactId>
+             <version>1.0</version>
++	    <scope>system</scope>
++	    <systemPath>/usr/share/java/jdom1.jar</systemPath>
+         </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>
++	  <systemPath>/usr/share/java/plexus-container-default.jar</systemPath>
++	</dependency>
+         <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-simple</artifactId>
+@@ -50,6 +73,18 @@
+         </dependency>
+     </dependencies>
+ 
++    <build>
++      <pluginManagement>
++	<plugins>
++	  <plugin>
++	    <groupId>org.apache.maven.plugins</groupId>
++	    <artifactId>maven-resources-plugin</artifactId>
++	    <version>2.3</version>
++	  </plugin>
++	</plugins>
++      </pluginManagement>
++    </build>
++
+     <scm>
+         <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1.0.11/plexus-cdc</connection>
+         <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1.0.11/plexus-cdc</developerConnection>

Added: trunk/plexus-cdc/debian/patches/series
===================================================================
--- trunk/plexus-cdc/debian/patches/series	                        (rev 0)
+++ trunk/plexus-cdc/debian/patches/series	2008-12-10 15:04:19 UTC (rev 7632)
@@ -0,0 +1 @@
+pom.diff

Modified: trunk/plexus-cdc/debian/rules
===================================================================
--- trunk/plexus-cdc/debian/rules	2008-12-10 14:59:58 UTC (rev 7631)
+++ trunk/plexus-cdc/debian/rules	2008-12-10 15:04:19 UTC (rev 7632)
@@ -8,10 +8,6 @@
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g" | sed 's,~alpha,-alpha-,')
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
 DEB_JARS             := plexus-utils plexus-interpolation
-#DEB_ANT_BUILD_TARGET := package #javadoc
-#DEB_ANT_BUILDFILE    := debian/build.xml
-#DEB_ANT_ARGS         := -Dversion=$(VERSION)
-API_DOCS             := build/api
 
 get-orig-source:
 	sh -e debian/orig-tar.sh
@@ -20,6 +16,6 @@
 DEST := $(REPO)/org/codehaus/plexus
 
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install build/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/
+	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