[pkg-java] r3384 - trunk/wagon/debian

[Paul Cager]

Author: paulcager-guest
Date: 2007-04-29 21:28:33 +0000 (Sun, 29 Apr 2007)
New Revision: 3384

Modified:
   trunk/wagon/debian/build.xml
   trunk/wagon/debian/control
   trunk/wagon/debian/rules
Log:
Include wagon-openpgp

Modified: trunk/wagon/debian/build.xml
===================================================================
--- trunk/wagon/debian/build.xml	2007-04-29 20:04:55 UTC (rev 3383)
+++ trunk/wagon/debian/build.xml	2007-04-29 21:28:33 UTC (rev 3384)
@@ -46,6 +46,7 @@
 	<javac srcdir="${src.dir}"
 		destdir="${build.dir}"
 		debug="on">
+		<include name="wagon-openpgp/src/main/**/*.java"/>
 		<include name="wagon-provider-api/src/main/**/*.java"/>
 		<include name="wagon-providers/*/src/main/**/*.java"/>
 		<exclude name="wagon-providers/wagon-ssh-common-test/**"/>
@@ -100,25 +101,30 @@
 		<include name="org/apache/maven/wagon/providers/ssh/external/**/*.properties" />
 		<include name="org/apache/maven/wagon/providers/ssh/external/*.class" />
 	</jar>
+
+	<jar jarfile="${build.dir}/wagon-openpgp${jar.suffix}"
+		basedir="${build.dir}">
+		<include name="org/apache/maven/wagon/openpgp/*.properties" />
+		<include name="org/apache/maven/wagon/openpgp/*.class" />
+	</jar>
 </target>
 
 <target name="javadoc" depends="init">
 	<mkdir dir="${javadoc.dir}"/>
 	<javadoc 
-		packagenames="org.apache.*"
-		sourcepath="wagon-provider-api/src/main/java"
+		packagenames="org.apache.maven.wagon,org.apache.maven.wagon.authentication,org.apache.maven.wagon.authorization,org.apache.maven.wagon.events,org.apache.maven.wagon.observers,org.apache.maven.wagon.openpgp,org.apache.maven.wagon.providers.file,org.apache.maven.wagon.providers.ftp,org.apache.maven.wagon.providers.http,org.apache.maven.wagon.providers.ssh,org.apache.maven.wagon.providers.ssh.external,org.apache.maven.wagon.providers.ssh.ganymed,org.apache.maven.wagon.providers.ssh.interactive,org.apache.maven.wagon.providers.ssh.jsch,org.apache.maven.wagon.providers.ssh.jsch.interactive,org.apache.maven.wagon.providers.ssh.knownhost,org.apache.maven.wagon.providers.webdav,org.apache.maven.wagon.proxy,org.apache.maven.wagon.repository,org.apache.maven.wagon.resource,org.apache.maven.wagon.shared.http"
+		sourcepath="wagon-openpgp/src/main/java:wagon-provider-api/src/main/java:wagon-providers/wagon-http-lightweight/src/main/java:wagon-providers/wagon-ssh-external/src/main/java:wagon-providers/wagon-ssh-ganymed/src/main/java:wagon-providers/wagon-ssh/src/main/java:wagon-providers/wagon-ssh-common/src/main/java:wagon-providers/wagon-webdav/src/main/java:wagon-providers/wagon-file/src/main/java:wagon-providers/wagon-http/src/main/java:wagon-providers/wagon-http-shared/src/main/java:wagon-providers/wagon-ftp/src/main/java"
 		destdir="${javadoc.dir}"
 		author="true"
 		version="true"
 		windowtitle="${package} API"
 		doctitle="${package} - ${version}"
 		classpath="${java.class.path}" >
-			<fileset dir="wagon-providers" defaultexcludes="yes">
-				<include name="**/*.java"/>
+			<!--
+			<fileset dir="." defaultexcludes="yes">
+				<include name="**/main/java/**/*.java"/>
 			</fileset>
-			<fileset dir="wagon-provider-api/src/main/java" defaultexcludes="yes">
-				<include name="**/*.java"/>
-			</fileset>
+			-->
 	</javadoc>
 </target>
 

Modified: trunk/wagon/debian/control
===================================================================
--- trunk/wagon/debian/control	2007-04-29 20:04:55 UTC (rev 3383)
+++ trunk/wagon/debian/control	2007-04-29 21:28:33 UTC (rev 3384)
@@ -7,7 +7,8 @@
                      libplexus-classworlds-java, libplexus-classworlds-java-doc,
 		     libplexus-utils-java, libplexus-utils-java-doc,
 		     libplexus-component-api-java, libplexus-component-api-java-doc, 
-		     junit, junit-doc, libcommons-net-java, libcommons-httpclient-java
+		     junit, junit-doc, libcommons-net-java, libcommons-httpclient-java,
+		     libcommons-openpgp-java, libcommons-openpgp-java-doc
 Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
 Standards-Version: 3.7.2
 
@@ -17,7 +18,9 @@
 Depends: libplexus-utils-java,
 	 libplexus-classworlds-java,
 	 libplexus-component-api-java,
-         libjtidy-java
+         libjtidy-java,
+         libcommons-httpclient-java,
+	 libcommons-openpgp-java
 Suggests: libwagon-java-doc
 Description: tools to manage Maven artifacts and deployment
  The Wagon project defines a simple API for transfering resources
@@ -54,6 +57,8 @@
     enables Maven to deploy artifacts and sites to SSH servers.
     It uses an external SSH program that has to be already installed
     in the system. Getting files from SSH servers is not fully tested.
+  wagon-openpgp
+    ?????
  .
   Homepage: http://maven.apache.org/wagon/
 

Modified: trunk/wagon/debian/rules
===================================================================
--- trunk/wagon/debian/rules	2007-04-29 20:04:55 UTC (rev 3383)
+++ trunk/wagon/debian/rules	2007-04-29 21:28:33 UTC (rev 3384)
@@ -20,6 +20,7 @@
 			/usr/share/java/jsch.jar \
 			/usr/share/java/ganymed-ssh2.jar \
 			/usr/share/java/jakarta-slide-webdavlib.jar \
+			/usr/share/java/libcommons-openpgp-java.jar \
 			/usr/share/java/junit.jar
 DEB_ANT_BUILD_TARGET := package
 DEB_ANT_BUILDFILE    := ./debian/build.xml
@@ -39,7 +40,7 @@
 	
 
 binary-post-install/lib$(PACKAGE)-java::
-	for i in wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api wagon-ssh wagon-ssh-common wagon-ssh-external; do \
+	for i in wagon-openpgp wagon-file wagon-http-lightweight wagon-http-shared wagon-provider-api wagon-ssh wagon-ssh-common wagon-ssh-external; do \
 	    dh_install -plib$(PACKAGE)-java build/$$i-$(VERSION).jar usr/share/java && \
 	    dh_link -plib$(PACKAGE)-java usr/share/java/$$i-$(VERSION).jar usr/share/java/$$i.jar; \
 	done