Ubuntu
ubuntu-docs package

Combine gnome-user-guide and ubuntu-docs

Bug #1687928 reported by Gunnar Hjalmarsson
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
gnome-user-docs (Ubuntu)
Fix Released
High
Gunnar Hjalmarsson
ubuntu-docs (Ubuntu)
Fix Released
High
Gunnar Hjalmarsson

Bug Description

I have taken a few steps to accomplish the changes as described here:

https://lists.ubuntu.com/archives/ubuntu-doc/2017-April/020404.html

I will upload a mutilated and work in progress version of ubuntu-docs (see the changelog for a summary) and attach a gnome-user-docs patch here which will let gnome-user-guide and ubuntu-docs co-exist again.

There are a few pending things which would probably be suitable to discuss on an IRC meeting.

Tags: patch
Gunnar Hjalmarsson (gunnarhj)
Changed in gnome-user-docs (Ubuntu):
assignee: nobody → Gunnar Hjalmarsson (gunnarhj)
importance: Undecided → High
status: New → In Progress
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Patch attached; ubuntu-docs uploaded.

Changed in ubuntu-docs (Ubuntu):
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package ubuntu-docs - 17.10.2

---------------
ubuntu-docs (17.10.2) artful; urgency=medium

  * Convert ubuntu-docs to serve as a supplement to gnome-user-guide
    (LP: #1687928):
    - Most .page files and images removed; a few pages without
      equivalents in gnome-user-guide kept.
    - A few pages forked from gnome-user-docs (where they will not be
      installed) and adapted to Ubuntu.
    - Various tweaking to remove broken internal links etc.
    - Build localized pages only for the intersection of the languages
      in gnome-user-docs and ubuntu-docs.

 -- Gunnar Hjalmarsson <email address hidden> Wed, 03 May 2017 14:57:00 +0200

Changed in ubuntu-docs (Ubuntu):
status: Fix Committed → Fix Released
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Gunnar, what do you think of https://paste.debian.net/930606/ ?

Ubuntu Foundations Team Bug Bot (crichton)
tags: added: patch
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

On 2017-05-03 17:15, Jeremy Bicha wrote:
> Gunnar, what do you think of https://paste.debian.net/930606/ ?

Works too; no strong opinion.

One argument in favor of the code I proposed is that the style is similar to gnome-help/Makefile.am in ubuntu-docs:

http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/trunk/view/head:/gnome-help/Makefile.am

The docs team may occationally want to add/remove files from both lists.

If you choose 'your way', can you change it when uploading, or should I modify the patch?

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

A detail: If you choose override_dh_install instead of override_dh_auto_install, the trailing dh_install command is redundant (there are no debian/install files).

Revision history for this message
Jeremy Bícha (jbicha) wrote :

Thank you! I didn't use my pasted proposal, but I slightly tweaked before uploading.

https://launchpadlibrarian.net/318180037/gnome-user-docs_3.24.0-0ubuntu1_3.24.0-0ubuntu2.diff.gz

Changed in gnome-user-docs (Ubuntu):
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package gnome-user-docs - 3.24.0-0ubuntu2

---------------
gnome-user-docs (3.24.0-0ubuntu2) artful; urgency=medium

  * debian/rules:
    - Don't install certain files - modified versions of most of them
      are installed by ubuntu-docs instead (LP: #1687928).
  * debian/control.in:
    - Depend on ubuntu-docs.

 -- Gunnar Hjalmarsson <email address hidden> Wed, 03 May 2017 14:12:00 +0200

Changed in gnome-user-docs (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.