diff -Nru oxide-qt-1.3.5/debian/changelog oxide-qt-1.3.5/debian/changelog
--- oxide-qt-1.3.5/debian/changelog	2014-12-03 11:36:57.000000000 +0000
+++ oxide-qt-1.3.5/debian/changelog	2014-12-05 13:43:57.000000000 +0000
@@ -1,3 +1,19 @@
+oxide-qt (1.3.5-0ubuntu6) vivid; urgency=medium
+
+  * Use the new conflict arrangement still, but change the dependency 
+    order of Oxide's own codecs packages to prefer the -extras. 
+    This should hopefully solve the problem when setting up the 
+    autopkgtest environment with packages that have a hard depedency 
+    on the -extras package. (LP: #1399597)
+
+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com>  Fri, 05 Dec 2014 13:39:34 +0000
+
+oxide-qt (1.3.5-0ubuntu5) vivid; urgency=medium
+
+  * Revert previous upload because of autopkgtest failures (LP: #1399597)
+
+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com>  Fri, 05 Dec 2014 10:09:07 +0000
+
 oxide-qt (1.3.5-0ubuntu4) vivid; urgency=medium
 
   * Add arch specific conflict to the oxideqt-codecs and oxideqt-codecs-extra
diff -Nru oxide-qt-1.3.5/debian/control oxide-qt-1.3.5/debian/control
--- oxide-qt-1.3.5/debian/control	2014-12-03 11:35:58.000000000 +0000
+++ oxide-qt-1.3.5/debian/control	2014-12-05 13:37:25.000000000 +0000
@@ -48,7 +48,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
-    oxideqt-codecs (= ${binary:Version}) | oxideqt-codecs-extra (= ${binary:Version})
+    oxideqt-codecs-extra (= ${binary:Version}) | oxideqt-codecs (= ${binary:Version}) 
 Description: Web browser engine library for Qt (core library and components)
  Oxide is a web browser engine library based on Google Chromium, that makes
  it easy to embed web content in your Qt application
@@ -61,7 +61,7 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
     liboxideqtcore0 (= ${binary:Version}),
-    oxideqt-codecs (= ${binary:Version}) | oxideqt-codecs-extra (= ${binary:Version})
+    oxideqt-codecs-extra (= ${binary:Version}) | oxideqt-codecs (= ${binary:Version}) 
 Description: Web browser engine library for Qt (QtQuick library)
  Oxide is a web browser engine library based on Google Chromium, that makes
  it easy to embed web content in your Qt application