Ubuntu Documentation

Merge lp:~jbicha/ubuntu-docs/misc-control-changes into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. misc-control-changes
  2. Merge into trunk2017-07-10
Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 642
Proposed branch: lp:~jbicha/ubuntu-docs/misc-control-changes
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 32 lines (+12/-1)
2 files modified
debian/changelog (+9/-0)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~jbicha/ubuntu-docs/misc-control-changes
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+323567@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Sure. I was planning to add the dependency on gnome-user-guide anyway, but waited to be able to upload before the gnome-user-docs change. As regards breaks/replaces I defer to you. Thanks!

Btw, does it mean that the plan is that ubuntu-desktop and g-c-c keep recommending ubuntu-docs? In other words, should I make another upload instantly?

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

I'm told that Breaks is usually better than Conflicts.

I'm also told that "circular dependencies" are bad, at least in Debian. If foo depends on bar, then bar should not depend on foo but it can recommend it. So we just need to decide which one is going to depend on the other one.

It was fine that you uploaded 17.10.2 since this upload will briefly be stuck in -proposed anyway while we get the other 2 docs packages promoted to main. (I don't think that will take long.)

I do plan to have GNOME packages go back to depend/recommend/whatever gnome-user-guide so that we don't have unnecessary diff with Debian.

I might have ubuntu-desktop depend on gnome-user-guide just to better match with upstream GNOME modulesets but either way there doesn't really matter.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-05-03 12:57:31 +0000
3+++ debian/changelog 2017-05-03 15:32:49 +0000
4@@ -1,3 +1,12 @@
5+ubuntu-docs (17.10.3) UNRELEASED; urgency=medium
6+
7+ * debian/control:
8+ - Depend on gnome-user-guide
9+ - Recommend gnome-getting-started-docs
10+ - Use Breaks/Replaces instead of Conflicts/Replaces
11+
12+ -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 03 May 2017 11:27:44 -0400
13+
14 ubuntu-docs (17.10.2) artful; urgency=medium
15
16 * Convert ubuntu-docs to serve as a supplement to gnome-user-guide
17
18=== modified file 'debian/control'
19--- debian/control 2017-05-03 12:32:35 +0000
20+++ debian/control 2017-05-03 15:32:49 +0000
21@@ -13,8 +13,10 @@
22 Package: ubuntu-docs
23 Architecture: all
24 Depends: ${misc:Depends},
25+ gnome-user-guide,
26 yelp
27-Conflicts: gnome-user-guide (<= 3.24.0-0ubuntu1)
28+Recommends: gnome-getting-started-docs
29+Breaks: gnome-user-guide (<= 3.24.0-0ubuntu1)
30 Replaces: gnome-user-guide (<= 3.24.0-0ubuntu1)
31 Description: Ubuntu Desktop Guide
32 This package holds the official Ubuntu-specific documentation, maintained

Subscribers

People subscribed via source and target branches