diff -Nru mockito-1.9.5+ds/debian/changelog mockito-1.9.5+ds/debian/changelog
--- mockito-1.9.5+ds/debian/changelog	2013-06-18 19:35:15.000000000 +0000
+++ mockito-1.9.5+ds/debian/changelog	2014-09-29 11:17:49.000000000 +0000
@@ -1,3 +1,11 @@
+mockito (1.9.5+ds-2) unstable; urgency=medium
+
+  * Team upload.
+  * Build depend on libcglib3-java and libasm4-java
+  * Standards-Version updated to 3.9.6 (no changes)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 29 Sep 2014 13:17:47 +0200
+
 mockito (1.9.5+ds-1) unstable; urgency=low
 
   * New maintainer. (Closes: #711832)
diff -Nru mockito-1.9.5+ds/debian/compat mockito-1.9.5+ds/debian/compat
--- mockito-1.9.5+ds/debian/compat	2013-06-18 19:35:15.000000000 +0000
+++ mockito-1.9.5+ds/debian/compat	2014-09-29 11:13:19.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru mockito-1.9.5+ds/debian/control mockito-1.9.5+ds/debian/control
--- mockito-1.9.5+ds/debian/control	2013-06-18 19:35:15.000000000 +0000
+++ mockito-1.9.5+ds/debian/control	2014-09-29 11:16:49.000000000 +0000
@@ -5,20 +5,20 @@
 Uploaders:
  Markus Koschany <apo@gambaru.de>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9),
  javahelper,
  maven-repo-helper (>= 1.7.1)
 Build-Depends-Indep:
  default-jdk,
  junit4,
- libasm3-java,
- libcglib-java,
+ libasm4-java,
+ libcglib3-java,
  libhamcrest-java,
  libobjenesis-java
-Standards-Version: 3.9.4
-Homepage: http://code.google.com/p/mockito/
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/mockito.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/mockito.git
+Homepage: http://code.google.com/p/mockito/
 
 Package: libmockito-java
 Architecture: all
diff -Nru mockito-1.9.5+ds/debian/patches/00-use_system_libraries.patch mockito-1.9.5+ds/debian/patches/00-use_system_libraries.patch
--- mockito-1.9.5+ds/debian/patches/00-use_system_libraries.patch	2013-06-18 19:35:15.000000000 +0000
+++ mockito-1.9.5+ds/debian/patches/00-use_system_libraries.patch	2014-09-29 11:13:19.000000000 +0000
@@ -2,6 +2,10 @@
 Date: Sat, 15 Jun 2013 12:24:11 +0200
 Subject: 00 use_system_libraries
 
+Use Debian's libraries instead of the embedded libraries that are shipped with
+mockito.
+
+Forwarded: not-needed
 ---
  org/mockito/internal/creation/CglibMockMaker.java              |  4 ++--
  .../internal/creation/DelegatingMockitoMethodProxy.java        |  4 ++--
diff -Nru mockito-1.9.5+ds/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch mockito-1.9.5+ds/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch
--- mockito-1.9.5+ds/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch	2013-06-18 19:35:15.000000000 +0000
+++ mockito-1.9.5+ds/debian/patches/01-fix_FTBFS_with_hamcrest_interfaces.patch	2014-09-29 11:13:19.000000000 +0000
@@ -2,6 +2,11 @@
 Date: Sat, 15 Jun 2013 12:12:42 +0200
 Subject: 01 fix_FTBFS_with_hamcrest_interfaces
 
+Mockito fails to build from source with Debian's version of libhamcrest. This
+patch implements the missing interface.
+
+Bug: http://bugs.debian.org/661877
+Forwarded: not-needed
 ---
  org/mockito/internal/matchers/LocalizedMatcher.java | 4 ++++
  1 file changed, 4 insertions(+)
diff -Nru mockito-1.9.5+ds/debian/rules mockito-1.9.5+ds/debian/rules
--- mockito-1.9.5+ds/debian/rules	2013-06-18 19:35:15.000000000 +0000
+++ mockito-1.9.5+ds/debian/rules	2014-09-29 11:14:39.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib.jar:/usr/share/java/hamcrest-core.jar:/usr/share/java/asm3.jar:/usr/share/java/junit4.jar
+export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib3.jar:/usr/share/java/hamcrest-core.jar:/usr/share/java/asm4.jar:/usr/share/java/junit4.jar
 
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
@@ -18,7 +18,7 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -f $(CURDIR)/mockito-core.jar
+	$(RM) $(CURDIR)/mockito-core.jar
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
diff -Nru mockito-1.9.5+ds/debian/source/options mockito-1.9.5+ds/debian/source/options
--- mockito-1.9.5+ds/debian/source/options	1970-01-01 00:00:00.000000000 +0000
+++ mockito-1.9.5+ds/debian/source/options	2014-09-29 11:13:19.000000000 +0000
@@ -0,0 +1 @@
+compression="xz"