Merge lp:~timo-jyrinki/oxide/arch_specific_replaces_lp1400275 into lp:~oxide-developers/oxide/packaging.vivid

[Timo Jyrinki]

Change back the dependency order, add arch specific replaces
as a suggested fix to prevent the apt package installation problems
(LP: #1400275)

[Timo Jyrinki (timo-jyrinki)]

This was an idea by RAOF which makes sense since the conflicts were also changed, but it has not been proven whether this solves the autopkgtests problem. Landing this would fix the dependencies back to the way they were intended, but if the autopkgtests start failing again it means no unity8/scopes/UITK/etc can land into vivid anymore.

It should be possible somehow to validate the fix by running autopkgtests for qtcreator-plugin-ubuntu locally (tips/testing welcome).

[Chris Coulson (chrisccoulson)]

review: Approve

[Timo Jyrinki (timo-jyrinki)]

This has landed now to archives, but sadly it reopens bug #1399597

Unmerged revisions

58. By Timo Jyrinki on 2014-12-10

Change back the dependency order, add arch specific replaces
as a suggested fix to prevent the apt package installation problems
(LP: #1400275)

57. By Timo Jyrinki on 2014-12-08

* 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)

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-03 10:47:36 +0000
+++ debian/changelog	2014-12-10 15:43:09 +0000
@@ -1,10 +1,32 @@
-oxide-qt (1.3.5-0ubuntu2) vivid; urgency=medium
-
-  [ Zoltan Balogh <[e-mail]> ]
-  * Fix the Click chroot by limiting the codecs vs. codecs-extra conlict
-    for the same arch only
-
- -- Chris Coulson <[e-mail]>  Wed, 03 Dec 2014 10:42:54 +0000
+oxide-qt (1.3.5-0ubuntu7) vivid; urgency=medium
+
+  * Change back the dependency order, add arch specific replaces 
+    as a suggested fix to prevent the apt package installation problems 
+    (LP: #1400275)
+
+ -- Timo Jyrinki <[e-mail]>  Wed, 10 Dec 2014 15:25:29 +0000
+
+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 <[e-mail]>  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 <[e-mail]>  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
+
+ -- Zoltán Balogh <[e-mail]>  Wed, 03 Dec 2014 11:36:04 +0000
 
 oxide-qt (1.3.5-0ubuntu1) vivid; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2014-12-03 10:38:29 +0000
+++ debian/control	2014-12-10 15:43:09 +0000
@@ -115,7 +115,10 @@
            oxideqt-codecs-extra:i386 [i386],
            oxideqt-codecs-extra:amd64 [amd64]
 Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)
-Replaces: oxideqt-codecs-extra, liboxideqtcore0 (<< 1.0.0~bzr488)
+Replaces: oxideqt-codecs-extra:armhf [armhf],
+          oxideqt-codecs-extra:i386 [i386],
+          oxideqt-codecs-extra:amd64 [amd64],
+          liboxideqtcore0 (<< 1.0.0~bzr488)
 Description: Web browser engine library for Qt (codecs)
  Oxide is a web browser engine library based on Google Chromium, that makes
  it easy to embed web content in your Qt application
@@ -146,7 +149,10 @@
            oxideqt-codecs:i386 [i386],
            oxideqt-codecs:amd64 [amd64]
 Breaks: liboxideqtcore0 (<< 1.0.0~bzr488)
-Replaces: oxideqt-codecs, liboxideqtcore0 (<< 1.0.0~bzr488)
+Replaces: oxideqt-codecs:armhf [armhf],
+          oxideqt-codecs:i386 [i386],
+          oxideqt-codecs:amd64 [amd64],
+          liboxideqtcore0 (<< 1.0.0~bzr488)
 Description: Web browser engine library for Qt (codecs)
  Oxide is a web browser engine library based on Google Chromium, that makes
  it easy to embed web content in your Qt application