diff -Nru android-platform-dalvik-6.0.1+r16/debian/changelog android-platform-dalvik-6.0.1+r16/debian/changelog
--- android-platform-dalvik-6.0.1+r16/debian/changelog	2016-02-18 08:33:31.000000000 +0000
+++ android-platform-dalvik-6.0.1+r16/debian/changelog	2016-02-23 19:04:46.000000000 +0000
@@ -1,3 +1,17 @@
+android-platform-dalvik (6.0.1+r16-4) unstable; urgency=medium
+
+  * remove Conflicts: dx (Closes: #814149, #815105)
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Tue, 23 Feb 2016 20:04:20 +0100
+
+android-platform-dalvik (6.0.1+r16-3) unstable; urgency=medium
+
+  * remove /usr/bin/dx symlink (Closes: #814149, #815105)
+  * use only Build-Depends, not Build-Depends-Indep (Closes: #814202)
+  * add myself to Uploaders
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Fri, 19 Feb 2016 22:33:55 +0100
+
 android-platform-dalvik (6.0.1+r16-2) unstable; urgency=medium
 
   * Compatible with arch and indep builds (Closes: #814202):
diff -Nru android-platform-dalvik-6.0.1+r16/debian/control android-platform-dalvik-6.0.1+r16/debian/control
--- android-platform-dalvik-6.0.1+r16/debian/control	2016-02-18 09:32:16.000000000 +0000
+++ android-platform-dalvik-6.0.1+r16/debian/control	2016-02-22 07:34:47.000000000 +0000
@@ -2,7 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Android tools Maintainer <android-tools-devel@lists.alioth.debian.org>
-Uploaders: Kai-Chung Yan <seamlikok@gmail.com>
+Uploaders: Kai-Chung Yan <seamlikok@gmail.com>,
+           Hans-Christoph Steiner <hans@eds.org>
 Build-Depends: android-libcutils-dev (>= 1:6.0.1+r16~),
                android-liblog-dev (>= 1:6.0.1+r16~),
                android-libnativehelper-dev (>= 6.0.1+r16~),
@@ -10,16 +11,16 @@
                android-libziparchive-dev (>= 1:6.0.1+r16~),
                android-platform-build-headers (>= 1:6.0.1+r16~),
                debhelper (>= 9),
+               default-jdk,
+               default-jdk-doc,
                dh-exec,
+               gradle-debian-helper,
+               javahelper,
+               libdex-java (>= 6.0.1+r10~),
                libsafe-iop-dev,
+               maven-repo-helper,
                pandoc,
                zlib1g-dev
-Build-Depends-Indep: default-jdk,
-                     default-jdk-doc,
-                     gradle-debian-helper,
-                     javahelper,
-                     libdex-java (>= 6.0.1+r10~),
-                     maven-repo-helper
 Standards-Version: 3.9.7
 Homepage: https://android.googlesource.com/platform/dalvik
 Vcs-Git: https://anonscm.debian.org/git/android-tools/android-platform-dalvik.git
@@ -76,7 +77,6 @@
 Depends: default-jre-headless (>= 1:1.6) | java6-runtime-headless,
          ${java:Depends},
          ${misc:Depends}
-Conflicts: dx
 Description: Dalvik eXchange compiler
  Dalvik is a process virtual machine in Google's Android operating system that
  executes applications written for Android.
diff -Nru android-platform-dalvik-6.0.1+r16/debian/dalvik-exchange.links android-platform-dalvik-6.0.1+r16/debian/dalvik-exchange.links
--- android-platform-dalvik-6.0.1+r16/debian/dalvik-exchange.links	2016-02-18 08:25:44.000000000 +0000
+++ android-platform-dalvik-6.0.1+r16/debian/dalvik-exchange.links	2016-02-19 21:21:10.000000000 +0000
@@ -2,5 +2,4 @@
 
 usr/share/java/dx.jar                                                 usr/lib/android-sdk/build-tools/${BUILD_TOOLS_VERSION}/lib/dx.jar
 usr/lib/android-sdk/build-tools/${BUILD_TOOLS_VERSION}/dx             usr/bin/dalvik-exchange
-usr/lib/android-sdk/build-tools/${BUILD_TOOLS_VERSION}/dx             usr/bin/dx
 usr/lib/android-sdk/build-tools/${BUILD_TOOLS_VERSION}/mainDexClasses usr/bin/mainDexClasses