diff -Nru libbtm-java-2.1.4/debian/changelog libbtm-java-2.1.4/debian/changelog
--- libbtm-java-2.1.4/debian/changelog	2014-04-30 01:01:32.000000000 +0000
+++ libbtm-java-2.1.4/debian/changelog	2016-08-25 23:34:47.000000000 +0000
@@ -1,3 +1,21 @@
+libbtm-java (2.1.4-3) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Markus Koschany ]
+  * Declare compliance with Debian Policy 3.9.8.
+  * wrap-and-sort -sa.
+  * Add disable-tests.patch and disable the tests because they cause random
+    build failures. (Closes: #829377)
+  * Update homepage URL because codehaus closed down and the project has moved
+    to Github.
+  * Update debian/watch for Github.
+
+  [ tony mancill ]
+  * Move the package to Git.
+
+ -- Markus Koschany <apo@debian.org>  Fri, 26 Aug 2016 01:34:47 +0200
+
 libbtm-java (2.1.4-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru libbtm-java-2.1.4/debian/control libbtm-java-2.1.4/debian/control
--- libbtm-java-2.1.4/debian/control	2014-04-30 01:01:31.000000000 +0000
+++ libbtm-java-2.1.4/debian/control	2016-08-25 23:34:47.000000000 +0000
@@ -2,19 +2,29 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner@debian.org>,
+Uploaders:
+ Torsten Werner <twerner@debian.org>,
  Brian Thomason <brian.thomason@eucalyptus.com>
-Build-Depends: debhelper (>= 9), maven-repo-helper, default-jdk, ant,
- libgeronimo-jta-1.1-spec-java, libgeronimo-jms-1.1-spec-java,
- libslf4j-java, libmockito-java, junit, ant-optional
-Standards-Version: 3.9.5
-Homepage: http://docs.codehaus.org/display/BTM/Home
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libbtm-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libbtm-java/
+Build-Depends:
+ ant,
+ ant-optional,
+ debhelper (>= 9),
+ default-jdk,
+ junit,
+ libgeronimo-jms-1.1-spec-java,
+ libgeronimo-jta-1.1-spec-java,
+ libmockito-java,
+ libslf4j-java,
+ maven-repo-helper
+Standards-Version: 3.9.8
+Homepage: https://github.com/bitronix/btm
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/libbtm-java.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libbtm-java.git
 
 Package: libbtm-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
 Description: Bitronix JTA Transaction Manager
  The Bitronix Transaction Manager (BTM) is a simple but complete implementation
  of the JTA 1.0.1B API. It is a fully working XA transaction manager that
@@ -23,3 +33,4 @@
  strongest point compared to its competitors: it is trivial to configure and
  when something goes wrong it is much easier to figure out what to do thanks to
  the great care placed in useful error reporting and logging.
+
diff -Nru libbtm-java-2.1.4/debian/copyright libbtm-java-2.1.4/debian/copyright
--- libbtm-java-2.1.4/debian/copyright	2014-04-30 01:01:31.000000000 +0000
+++ libbtm-java-2.1.4/debian/copyright	2016-08-25 23:34:47.000000000 +0000
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: http://docs.codehaus.org/display/BTM/Download
+Source: https://github.com/bitronix/btm
 Upstream-Name: Bitronix JTA Transaction Manager
 Upstream-Contact: Bitronix
 
diff -Nru libbtm-java-2.1.4/debian/patches/disable-tests.patch libbtm-java-2.1.4/debian/patches/disable-tests.patch
--- libbtm-java-2.1.4/debian/patches/disable-tests.patch	1970-01-01 00:00:00.000000000 +0000
+++ libbtm-java-2.1.4/debian/patches/disable-tests.patch	2016-08-25 23:34:47.000000000 +0000
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo@debian.org>
+Date: Fri, 26 Aug 2016 01:47:41 +0200
+Subject: disable tests
+
+Tests cause random build failures which makes them not useful for debugging.
+
+Debian-Bug: https://bugs.debian.org/829377
+Forwarded: not-needed
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index f7afdcd..2aed52e 100644
+--- a/build.xml
++++ b/build.xml
+@@ -27,7 +27,7 @@
+         <path refid="javac.classpath"/>
+     </path>
+ 
+-    <target name="all" depends="clean,build,test" description="Run clean,build,test"/>
++    <target name="all" depends="clean,build" description="Run clean,build"/>
+ 
+     <target name="build" description="Compile source files">
+         <mkdir dir="${dir.classes}"/>
diff -Nru libbtm-java-2.1.4/debian/patches/series libbtm-java-2.1.4/debian/patches/series
--- libbtm-java-2.1.4/debian/patches/series	2014-04-30 01:01:32.000000000 +0000
+++ libbtm-java-2.1.4/debian/patches/series	2016-08-25 23:34:47.000000000 +0000
@@ -1,3 +1,4 @@
 add-pom-file.patch
 transition-to-openjdk7.patch
 fix-jms-proper-usage-mock-test.patch
+disable-tests.patch
diff -Nru libbtm-java-2.1.4/debian/watch libbtm-java-2.1.4/debian/watch
--- libbtm-java-2.1.4/debian/watch	2014-04-30 01:01:32.000000000 +0000
+++ libbtm-java-2.1.4/debian/watch	2016-08-25 23:34:47.000000000 +0000
@@ -1,3 +1,4 @@
-version=3
-
-http://docs.codehaus.org/display/BTM/Download/ http://bitronix.be/downloads/btm-dist-(.+).zip debian debian/orig-tar.sh
+version=4
+opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
+https://github.com/bitronix/btm/tags \
+.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)btm-(\d\S*)\.tar\.gz