[SCM] libjtds-java: jTDS JDBC Driver for SQL Server and Sybase branch, master, updated. debian/1.2.5+dfsg-2-12-gcc71a54

[Martín Ferrari]

The following commit has been merged in the master branch:
commit 6914810b43285eb676c7bf71b0b8dcb1729e0eac
Author: Martín Ferrari <tincho at debian.org>
Date:   Wed Jul 31 15:37:24 2013 +0000

    Migrate from CDBS to DH.

diff --git a/debian/build.xml b/debian/build.xml
index 085ba4e..e3bd23b 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -3,9 +3,7 @@
 <project basedir="." default="compile" name="jtds">
 
   <path id="libs">
-     <pathelement location="/usr/share/java/crimson.jar"/>
      <pathelement location="/usr/share/java/jcifs.jar"/>
-     <pathelement location="/usr/share/java/libgcj8.jar"/>
      <!--
      <pathelement location="/usr/share/java/ant-optional.jar"/>
      <pathelement location="/usr/share/java/junit.jar"/>
diff --git a/debian/control b/debian/control
index 4e26778..610e636 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libjtds-java
 Section: java
 Priority: optional
 Maintainer: Martín Ferrari <tincho at debian.org>
-Build-Depends: debhelper (>= 9), cdbs
+Build-Depends: debhelper (>= 9), javahelper
 Build-Depends-Indep: libjcifs-java, default-jdk, ant
 Standards-Version: 3.9.2
 Homepage: http://jtds.sourceforge.net/
@@ -10,7 +10,7 @@ Vcs-Browser: http://www.tincho.org/wsvn/debian/browse/trunk/libjtds-java
 
 Package: libjtds-java
 Architecture: all
-Depends: ${misc:Depends} ${java:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
 Description: JDBC 3.0 driver for Microsoft SQL Server(tm) and Sybase(tm)
  jTDS is an open source JDBC 3.0 Type 4 driver for Microsoft SQL Server (6.5,
  7.0, 2000 and 2005) and Sybase (10, 11, 12, 15). jTDS is the fastest JDBC
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/doc-base.libjtds-java-javadoc b/debian/doc-base.libjtds-java-javadoc
deleted file mode 100644
index e5123d9..0000000
--- a/debian/doc-base.libjtds-java-javadoc
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libjtds-java-javadoc
-Title: API JavaDoc for libjtds-java
-Author: The jTDS Project
-Abstract: API documentation in JavaDoc format
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjtds-java/javadoc/index.html
-Files: /usr/share/doc/libjtds-java/javadoc/*
diff --git a/debian/doc-base.libjtds-java-doc b/debian/libjtds-java.doc-base.docs
similarity index 100%
rename from debian/doc-base.libjtds-java-doc
rename to debian/libjtds-java.doc-base.docs
diff --git a/debian/libjtds-java.docs b/debian/libjtds-java.docs
index cb7b8ad..d1f2e52 100644
--- a/debian/libjtds-java.docs
+++ b/debian/libjtds-java.docs
@@ -1,3 +1,2 @@
 README.SSL
 html
-dist/javadoc
diff --git a/debian/libjtds-java.javadoc b/debian/libjtds-java.javadoc
new file mode 100644
index 0000000..6744a8c
--- /dev/null
+++ b/debian/libjtds-java.javadoc
@@ -0,0 +1 @@
+dist/javadoc
diff --git a/debian/libjtds-java.jlibs b/debian/libjtds-java.jlibs
new file mode 100644
index 0000000..0ef7c6d
--- /dev/null
+++ b/debian/libjtds-java.jlibs
@@ -0,0 +1 @@
+dist/*.jar
diff --git a/debian/rules b/debian/rules
index 9fe1c80..6fdcd7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,13 @@
 #!/usr/bin/make -f
-# debian/rules file for libjtds-java (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/ant.mk
+JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/jcifs.jar
 
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: \(.*\)+dfsg.*/\1/p')
+%:
+	dh $@ --with javahelper
 
-install/libjtds-java::
-	dh_install dist/jtds-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/jtds-$(DEB_UPSTREAM_VERSION).jar \
-		usr/share/java/jtds.jar
-
-JAVA_HOME		:= /usr/lib/jvm/default-java
-BUILD_FILE		:= debian/build.xml
-DEB_ANT_INVOKE		:= ant -f $(BUILD_FILE) -Dcurdir=$(CURDIR)
-DEB_ANT_BUILD_TARGET	:= dist
-DEB_INSTALL_CHANGELOGS_ALL	:= CHANGELOG
+# Ignore upstream's build.xml.
+override_dh_auto_clean:
+	dh_auto_clean -- -f debian/build.xml -Dcurdir=$(CURDIR)
+override_dh_auto_build:
+	dh_auto_build -- -f debian/build.xml -Dcurdir=$(CURDIR) dist

-- 
libjtds-java: jTDS JDBC Driver for SQL Server and Sybase