[trilead-ssh2] 04/10: Imported Debian patch 211-3

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository trilead-ssh2.

commit 4e7ad17a9ed1858417e673ec26c2d1d1994b4243
Author: Matthew Johnson <mjj29 at debian.org>
Date:   Sat Dec 12 10:33:09 2009 +0000

    Imported Debian patch 211-3
---
 debian/changelog                     |  6 ++++++
 debian/compat                        |  2 +-
 debian/control                       |  4 ++--
 debian/libtrilead-ssh2-java.doc-base |  9 ---------
 debian/libtrilead-ssh2-java.javadoc  | 14 +-------------
 debian/rules                         |  2 --
 6 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 843318a..11745d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+trilead-ssh2 (211-3) unstable; urgency=low
+
+  * Use javahelper rather than dh_javadoc 
+
+ -- Matthew Johnson <mjj29 at debian.org>  Sat, 12 Dec 2009 10:33:09 +0000
+
 trilead-ssh2 (211-2) unstable; urgency=low
 
   * Change to debhelper 7
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index e005e7a..abc6885 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: trilead-ssh2
 Section: java
 Priority: optional
 Maintainer: Matthew Johnson <mjj29 at debian.org>
-Build-Depends: debhelper (>> 7), javahelper (>=0.20)
-Build-Depends-Indep: default-jdk, gjdoc
+Build-Depends: debhelper (>> 7), javahelper (>=0.25)
+Build-Depends-Indep: default-jdk
 Standards-Version: 3.7.3
 Homepage: http://www.trilead.com/Products/Trilead-SSH-2-Java/
 
diff --git a/debian/libtrilead-ssh2-java.doc-base b/debian/libtrilead-ssh2-java.doc-base
deleted file mode 100644
index 1b0fc9c..0000000
--- a/debian/libtrilead-ssh2-java.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libtrilead-ssh2-java
-Title: API JavaDoc for libtrilead-ssh2-java
-Author: Trilead AG
-Abstract: This the API JavaDoc provided by Trilead AG for libtrilead-ssh2-java
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libtrilead-ssh2-java/api/
-Files: /usr/share/doc/libtrilead-ssh2-java/api/*.html
diff --git a/debian/libtrilead-ssh2-java.javadoc b/debian/libtrilead-ssh2-java.javadoc
index ad208dc..ce83b25 100644
--- a/debian/libtrilead-ssh2-java.javadoc
+++ b/debian/libtrilead-ssh2-java.javadoc
@@ -1,13 +1 @@
-com.trilead.ssh2
-com.trilead.ssh2.channel
-com.trilead.ssh2.transport
-com.trilead.ssh2.signature
-com.trilead.ssh2.packets
-com.trilead.ssh2.crypto
-com.trilead.ssh2.crypto.cipher
-com.trilead.ssh2.crypto.dh
-com.trilead.ssh2.crypto.digest
-com.trilead.ssh2.sftp
-com.trilead.ssh2.auth
-com.trilead.ssh2.log
-com.trilead.ssh2.util
+internal
diff --git a/debian/rules b/debian/rules
index 48b6786..a0bc1bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,4 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 
 override_dh_installchangelogs:
 	dh_installchangelogs HISTORY.txt
-override_dh_auto_install:
-	dh_javadoc --sourcedir=src 
 

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