Ubuntu
update-manager package

Merge lp:~jtaylor/ubuntu/natty/update-manager/update-manager-fix-695186 into lp:ubuntu/natty/update-manager

  1. Natty (11.04)
  2. update-manager-fix-695186
  3. Merge into natty
Proposed by Julian Taylor
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~jtaylor/ubuntu/natty/update-manager/update-manager-fix-695186
Merge into: lp:ubuntu/natty/update-manager
Diff against target: 38 lines (+9/-1)
4 files modified
debian/changelog (+7/-0)
debian/update-manager-core.manpages (+1/-0)
debian/update-manager.install (+0/-1)
debian/update-manager.manpages (+1/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/natty/update-manager/update-manager-fix-695186
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+51643@code.launchpad.net

Description of the change

use dh_installman instead of dh_install to install the manpages.
moves manpage of do-release-upgrade from update-manager to update-manager-core where also the script is located (LP: #695186)

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks for this!

Unfortunately you used the wrong branch (the real one is in the Vcs-Bzr: field, which "debcheckout update-manager" uses. So I can't directly merge this, but I'll take the diff and apply it to the real branch.

This also needs an extra Replaces: in debian/control to avoid breaking upgrades. I'll deal with this.

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

Committed to http://bazaar.launchpad.net/~ubuntu-core-dev/update-manager/main/revision/2045, and fixed along the way.

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 2011-02-16 21:19:12 +0000
3+++ debian/changelog 2011-02-28 22:40:04 +0000
4@@ -1,3 +1,10 @@
5+update-manager (1:0.146.1) natty; urgency=low
6+
7+ * use dh_installman to install manpages
8+ * move do-release-upgrade manpage to update-manager-core (LP: #695186)
9+
10+ -- Julian Taylor <jtaylor.debian@googlemail.com> Mon, 28 Feb 2011 22:32:59 +0100
11+
12 update-manager (1:0.146) natty; urgency=low
13
14 * DistUpgrade/DistUpgradeView*.py:
15
16=== added file 'debian/update-manager-core.manpages'
17--- debian/update-manager-core.manpages 1970-01-01 00:00:00 +0000
18+++ debian/update-manager-core.manpages 2011-02-28 22:40:04 +0000
19@@ -0,0 +1,1 @@
20+debian/tmp/usr/share/man/man8/do-release-upgrade.8
21
22=== modified file 'debian/update-manager.install'
23--- debian/update-manager.install 2010-03-08 20:58:44 +0000
24+++ debian/update-manager.install 2011-02-28 22:40:04 +0000
25@@ -6,7 +6,6 @@
26 debian/tmp/usr/share/icons
27 debian/tmp/usr/share/gconf
28 debian/tmp/usr/share/applications/update-manager.desktop
29-debian/tmp/usr/share/man/
30 debian/tmp/usr/lib/python*/dist-packages/UpdateManager/backend
31 debian/tmp/usr/lib/python*/dist-packages/UpdateManager/ChangelogViewer.py
32 debian/tmp/usr/lib/python*/dist-packages/UpdateManager/DistUpgradeFetcher.py
33
34=== added file 'debian/update-manager.manpages'
35--- debian/update-manager.manpages 1970-01-01 00:00:00 +0000
36+++ debian/update-manager.manpages 2011-02-28 22:40:04 +0000
37@@ -0,0 +1,1 @@
38+debian/tmp/usr/share/man/man8/update-manager.8

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: