This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master-1.x
in repository wagon.

commit 1ecc74f47ea13a0be21aaa106420356f33a05872
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date:   Mon Aug 3 18:01:00 2009 +0000

    * 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
---
 debian/changelog                  | 9 +++++++++
 debian/control                    | 8 ++++----
 debian/libwagon-java-doc.doc-base | 4 ++--
 debian/libwagon-java-doc.docs     | 1 -
 debian/maven.ignoreRules          | 3 +++
 debian/rules                      | 3 +++
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d1661f..ac50d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.cla...@laposte.net>  Sat, 25 Jul 2009 18:43:01 
+0100
+
 wagon (1.0-beta-5-1) experimental; urgency=low
 
   * New upstream version (Closes: #531444)
diff --git a/debian/control b/debian/control
index 01277e4..10faf0f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-deb...@home.paulcager.org>, Torsten Werner 
<twer...@debian.org>,
  Ludovic Claude <ludovic.cla...@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 @@ Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 
4), ant, ant-option
                      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 @@ Description: tools to manage Maven artifacts and deployment
 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,
diff --git a/debian/libwagon-java-doc.doc-base 
b/debian/libwagon-java-doc.doc-base
index a545372..bde7be6 100644
--- a/debian/libwagon-java-doc.doc-base
+++ b/debian/libwagon-java-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the Wagon library.
 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/*
diff --git a/debian/libwagon-java-doc.docs b/debian/libwagon-java-doc.docs
deleted file mode 100644
index e5e6d3a..0000000
--- a/debian/libwagon-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/api
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..d6051bf
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,3 @@
+junit junit
+org.apache.maven.wagon wagon-provider-test
+
diff --git a/debian/rules b/debian/rules
index eb4143f..a8536d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,9 @@ binary-post-install/lib$(PACKAGE)-java::
                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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/wagon.git

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to