Merge lp:~ubuntu-mate-dev/yelp/mate-compatibility into lp:~ubuntu-desktop/yelp/ubuntu

[Martin Wimpress]

mate-user-guide requires Yelp. Yelp recommends gnome-user-guide, so Ubuntu MATE ends up with gnome-user-guide being pointlessly installed.

Xubuntu seed Yelp and don't require gnome-user-guide nor mate-user-guide. This merge proposal make gnome-user-guide or mate-user-guide Suggests to prevent unnecessary installs of either user-guide.

[Jeremy Bicha (jbicha)]

I just want to mention that the Help button in gnome-disk-utility points to the gnome-user-guide. If MATE provided documentation for that, then maybe it should conditionally point to MATE's documentation when run in MATE. Alternatively, you could ask gnome-disk-utility to ship its own documentation, at least for the benefit of other desktop environments.

The same problem happens if a MATE user installs Nautilus (although MATE uses caja by default as file browser).

$ apt show gnome-user-guide
Version: 3.20.2-1
Installed-Size: 47.3 MB
Download-Size: 2,361 kB

$ apt show ubuntu-docs
Version: 16.04.3
Installed-Size: 67.4 MB
Download-Size: 1,152 kB

Anyway, I'm not blocking this but just wanted you to be aware of this.

[lp:~ubuntu-mate-dev/yelp/mate-compatibility]

139. By Martin Wimpress on 2016-06-23

Update debian/control.in accordingly.

[Martin Pitt (pitti)]

Martin, please include debian/changelog records in your merges. It's very inconvenient to have to add them, even more so as you don't have a published email address so it's not trivial to make up a real changelog record.

=== modified file 'debian/control'
--- debian/control	2016-05-17 01:50:47 +0000
+++ debian/control	2016-06-23 08:24:00 +0000
@@ -42,7 +42,7 @@
          libyelp0 (= ${binary:Version}),
          yelp-xsl (>= 3.12.0),
          man-db (>= 2.5.1-1)
-Recommends: gnome-user-guide
+Suggests: gnome-user-guide | mate-user-guide
 Description: Help browser for GNOME
  Yelp is the help browser for the GNOME desktop.  Yelp provides a simple
  graphical interface for viewing DocBook, Mallard, HTML, man, and info

=== modified file 'debian/control.in'
--- debian/control.in	2016-05-17 01:50:47 +0000
+++ debian/control.in	2016-06-23 08:24:00 +0000
@@ -40,7 +40,7 @@
          libyelp0 (= ${binary:Version}),
          yelp-xsl (>= 3.12.0),
          man-db (>= 2.5.1-1)
-Recommends: gnome-user-guide
+Suggests: gnome-user-guide | mate-user-guide
 Description: Help browser for GNOME
  Yelp is the help browser for the GNOME desktop.  Yelp provides a simple
  graphical interface for viewing DocBook, Mallard, HTML, man, and info