budgie file conflict with caffeine

[Jeremy Bícha]

Originally reported at
https://lists.ubuntu.com/archives/ubuntu-desktop/2018-August/005408.html

which has more details.

I suggest splitting caffeine into separate packages and budgie-desktop can just depend on the new package that has the icons it needs.

[Adam Conrad (adconrad)]

budgie-desktop appears to embed a full copy of caffeine. Is that necessary? Why can't it just depend on the archive version? If not, why not? And why isn't it renamed to a private namespace to avoid clashing, if it's necessary to have a private copy?

All of the above aside, you can't just randomly declare a versioned Breaks/Replaces on another package with random bogus made-up versions. A versioned Breaks/Replaces means "This other package is fixed to be able to coexist with mine as of version X", which is clearly BS here.

[Adam Conrad (adconrad)]

I've rejected the binaries in the queue to avoid this weird and bogus package relationship entering the archive, but please come up with a saner fix.

[fossfreedom (fossfreedom)]

After further discussion on #ubuntu-release today, Adam has come up with a patch that installs the conflicting icon files with "budgie" prefixes. The budgie caffeine code looks to see if it has loaded the standard "caffeine" icon name - if it cannot find the icon, it instead loads the "budgie" equivalents.

Will separately submit the patch to upstream Solus so maybe we can drop this patch later if it is accepted.

There is no longer a need to add a Conflicts for caffeine to debian/control

Marking the caffeine "affects" as invalid.

[fossfreedom (fossfreedom)]

ah - I read the patch wrong - it forces an "always use" the budgie fallback icons.

For the moment will push this patch. Will need to be later reworked to look for standard caffeine icons and only then fallback if not found as described above.

[Launchpad Janitor (janitor)]

This bug was fixed in the package budgie-desktop - 10.4+git20180806.02.933f78fc03d-0ubuntu1

---------------
budgie-desktop (10.4+git20180806.02.933f78fc03d-0ubuntu1) cosmic; urgency=medium

  [Adam Conrad]
  * caffeine-cup-conflicts.patch: Avoid caffeine icon conflicts (LP: #1786107)

  [David Mohammed]
  * Upstream Git release
  * Add patch to support GNOME 3.29.4 mutter
  * Packaging Changes:
    - Drop existing patches except
      0001-Obtain-gsettings-transparency-key-value-before-showi.patch,
    - refresh patch 0001*.patch
    - debian/control - Bump Standards-Version (4.1.4): no changes required
    - Add new patch 0003-Port-to-mutter-3-from-GNOME-3.30.patch
    - Create unsigned tarball (dh_make) from upstream Git tree
    - debian/control - build-depends on libmutter-3 and libglib2.0 2.57
    - debian/control - add new libbudgie-private0 private ABI package
    - debian/control - add replaces/breaks for caffeine
      Ensure caffeine package which installs the same icons
      does not break the installation of budgie desktop
    - create lintian-overrides for budgie-core-dev
    - update lintian-overrides for budgie-core

 -- David Mohammed <email address hidden> Wed, 08 Aug 2018 23:33:56 +0100