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

[Timo Jyrinki]

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

This is what's waiting in the PPA. The changelog inflation is because of various archive + PPA uploads and the 5h build times. The current version in the archives is already ubuntu4.

[Timo Jyrinki (timo-jyrinki)]

< oSoMoN> Mirv, if swapping the order fixes the issue, then go for it, but it would be good to get to the bottom of things, we shouldn’t have to do this kind of things in the first place

[Timo Jyrinki (timo-jyrinki)]

One interesting comment worth considering if the normal preferring of non-extra package would be wanted to be kept in Oxide itself while others depend on the -extra package:

< RAOF> Hm, odd. I suppose that also arch-specifying the Replaces: was tried?

[Chris Coulson (chrisccoulson)]

This change isn't really acceptable - it will result in -extras being pulled in to the desktop seed. Avoiding this is the reason that there are 2 codecs packages

review: Disapprove

[Timo Jyrinki (timo-jyrinki)]

(this got approved by raof on IRC earlier)

[Chris Coulson (chrisccoulson)]

And it's rejected by me (the Oxide maintainer). This results in proprietary codecs being pulled in to the desktop image

Unmerged revisions

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-08 06:26:05 +0000
@@ -1,10 +1,24 @@
-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-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-08 06:26:05 +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