[SCM] svnclientadapter packaging branch, master, updated. debian/0.9.100-2-20-g1fe9041

[Jakub Adam]

The following commit has been merged in the master branch:
commit 6aebbea1b0659a7384c069908b63db07967ee7a8
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Jul 6 14:35:52 2012 +0200

    Don't depend on both JavaHL and SVNKit
    
    Require only one of them to be installed.

diff --git a/debian/changelog b/debian/changelog
index 37d7a2a..badf240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ svnclientadapter (1.8.13-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.3.
   * Remove dependency on libganymed-ssh2-java.
     - Was a dependency of old SVNKit version, not needed anymore.
+  * Don't depend on both JavaHL and SVNKit, require only one of them to
+    be installed.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 17 Jun 2012 23:00:09 +0200
 
diff --git a/debian/control b/debian/control
index 6057374..8bfcb05 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Vcs-Git: git://git.debian.org/git/pkg-java/svnclientadapter.git
 
 Package: libsvnclientadapter-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: libsvn-java (>= 1.7.5~) | libsvnkit-java (>= 1.7.5~),
+ ${java:Depends}, ${misc:Depends}
 Suggests: libsvnclientadapter-java-doc
 Provides: libnb-svnclientadapter-java
 Replaces: libnb-svnclientadapter-java
diff --git a/debian/rules b/debian/rules
index e8f4474..6e5a843 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,3 +15,6 @@ VERSION := $(shell dpkg-parsechangelog | grep Version: | sed 's/Version: \(.*\)-
 
 override_dh_auto_build:
 	ant -DsvnClientAdapter.version=$(VERSION)
+
+override_jh_depends:
+	jh_depends --exclude=libsvn-java --exclude=libsvnkit-java 

-- 
svnclientadapter packaging