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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-03 18:01:00 +0000 (Mon, 03 Aug 2009)
New Revision: 9535

Added:
   trunk/wagon/debian/maven.ignoreRules
Removed:
   trunk/wagon/debian/libwagon-java-doc.docs
Modified:
   trunk/wagon/debian/changelog
   trunk/wagon/debian/control
   trunk/wagon/debian/libwagon-java-doc.doc-base
   trunk/wagon/debian/rules
Log:
* New upstream version
* Bump up Standards-Version to 3.8.2
* Remove junit and wagon-provider-test dependency from Maven descriptor
* Move api documentation to /usr/share/doc/libwagon-java/api

Modified: trunk/wagon/debian/changelog
===================================================================
--- trunk/wagon/debian/changelog	2009-08-03 17:51:05 UTC (rev 9534)
+++ trunk/wagon/debian/changelog	2009-08-03 18:01:00 UTC (rev 9535)
@@ -1,3 +1,12 @@
+wagon (1.0-beta-6-2) experimental; urgency=low
+
+  * New upstream version
+  * Bump up Standards-Version to 3.8.2
+  * Remove junit and wagon-provider-test dependency from Maven descriptor
+  * Move api documentation to /usr/share/doc/libwagon-java/api
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sat, 25 Jul 2009 18:43:01 +0100
+
 wagon (1.0-beta-5-1) experimental; urgency=low
 
   * New upstream version (Closes: #531444)

Modified: trunk/wagon/debian/control
===================================================================
--- trunk/wagon/debian/control	2009-08-03 17:51:05 UTC (rev 9534)
+++ trunk/wagon/debian/control	2009-08-03 18:01:00 UTC (rev 9535)
@@ -4,9 +4,9 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4), ant, ant-optional, 
                      libxalan2-java,
-                     junit, junit-doc,
+                     junit, junit-doc, openjdk-6-doc,
                      libcommons-httpclient-java,
                      libcommons-net2-java,
                      libjsch-java, libjsch-java-doc,
@@ -15,7 +15,7 @@
                      libplexus-interactivity-api-java, libplexus-interactivity-api-java-doc, 
                      libplexus-utils-java, libplexus-utils-java-doc
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), quilt, default-jdk
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://maven.apache.org/wagon/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/wagon/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/wagon/
@@ -77,7 +77,7 @@
 Package: libwagon-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, classpath-doc,
+Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc,
          libmaven-scm-java-doc,
          libnekohtml-java-doc,
          libplexus-utils-java-doc,

Modified: trunk/wagon/debian/libwagon-java-doc.doc-base
===================================================================
--- trunk/wagon/debian/libwagon-java-doc.doc-base	2009-08-03 17:51:05 UTC (rev 9534)
+++ trunk/wagon/debian/libwagon-java-doc.doc-base	2009-08-03 18:01:00 UTC (rev 9535)
@@ -5,5 +5,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libwagon-java-doc/api/index.html
-Files: /usr/share/doc/libwagon-java-doc/api/*
+Index: /usr/share/doc/libwagon-java/api/index.html
+Files: /usr/share/doc/libwagon-java/api/*

Deleted: trunk/wagon/debian/libwagon-java-doc.docs
===================================================================
--- trunk/wagon/debian/libwagon-java-doc.docs	2009-08-03 17:51:05 UTC (rev 9534)
+++ trunk/wagon/debian/libwagon-java-doc.docs	2009-08-03 18:01:00 UTC (rev 9535)
@@ -1 +0,0 @@
-build/api

Added: trunk/wagon/debian/maven.ignoreRules
===================================================================
--- trunk/wagon/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/wagon/debian/maven.ignoreRules	2009-08-03 18:01:00 UTC (rev 9535)
@@ -0,0 +1,3 @@
+junit junit
+org.apache.maven.wagon wagon-provider-test
+

Modified: trunk/wagon/debian/rules
===================================================================
--- trunk/wagon/debian/rules	2009-08-03 17:51:05 UTC (rev 9534)
+++ trunk/wagon/debian/rules	2009-08-03 18:01:00 UTC (rev 9535)
@@ -35,6 +35,9 @@
 		mh_installjar -plib$(PACKAGE)-java -l wagon-providers/$$MODULE/pom.xml wagon-providers/$$MODULE/build/$$MODULE-$(VERSION).jar; \
 	done
 
+binary-post-install/lib$(PACKAGE)-java-doc::
+	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+
 clean::
 	-rm -rf debian/tmp