diff -Nru intel-media-driver-non-free-18.4.1+ds1/debian/changelog intel-media-driver-non-free-18.4.1+ds1/debian/changelog
--- intel-media-driver-non-free-18.4.1+ds1/debian/changelog	2019-04-07 12:13:11.000000000 +0000
+++ intel-media-driver-non-free-18.4.1+ds1/debian/changelog	2019-04-09 14:47:23.000000000 +0000
@@ -1,3 +1,10 @@
+intel-media-driver-non-free (18.4.1+ds1-1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Disable tests, they just timeout on buildd's.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 09 Apr 2019 16:47:23 +0200
+
 intel-media-driver-non-free (18.4.1+ds1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -5,6 +12,13 @@
 
  -- Sebastian Ramacher <sramacher@debian.org>  Sun, 07 Apr 2019 14:13:11 +0200
 
+intel-media-driver-non-free (18.4.0+ds1-1ubuntu1) disco; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Disable tests, they just timeout on buildd's.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 05 Feb 2019 19:11:31 +0100
+
 intel-media-driver-non-free (18.4.0+ds1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -18,6 +32,12 @@
 
  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 02 Feb 2019 19:43:01 +0100
 
+intel-media-driver-non-free (18.3.0+ds1-2ubuntu1) disco; urgency=medium
+
+  * Disable tests, they just timeout on buildd's.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 23 Jan 2019 13:54:50 +0200
+
 intel-media-driver-non-free (18.3.0+ds1-2) unstable; urgency=medium
 
   * debian/: Fix build on i386. (Closes: #915572)
diff -Nru intel-media-driver-non-free-18.4.1+ds1/debian/rules intel-media-driver-non-free-18.4.1+ds1/debian/rules
--- intel-media-driver-non-free-18.4.1+ds1/debian/rules	2019-02-02 18:27:38.000000000 +0000
+++ intel-media-driver-non-free-18.4.1+ds1/debian/rules	2019-04-07 16:22:09.000000000 +0000
@@ -16,7 +16,7 @@
 	dh_missing --fail-missing
 
 override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	# Requires Broadwell or newer, so check for SSE 4.2 support at least.
-	if grep -q sse4_2 /proc/cpuinfo; then dh_auto_test; fi
-endif
+#ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+#	# Requires Broadwell or newer, so check for SSE 4.2 support at least.
+#	if grep -q sse4_2 /proc/cpuinfo; then dh_auto_test; fi
+#endif