Merge lp:~jbicha/ubuntu/oneiric/yelp/3.1.3 into lp:~ubuntu-desktop/yelp/ubuntu

Proposed by Jeremy Bicha on 2011-09-05
Status: Merged
Merged at revision: 78
Proposed branch: lp:~jbicha/ubuntu/oneiric/yelp/3.1.3
Merge into: lp:~ubuntu-desktop/yelp/ubuntu
Diff against target: 27 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
debian/patches/06_make_ubuntu_docs_default.patch (+1/-1)
To merge this branch: bzr merge lp:~jbicha/ubuntu/oneiric/yelp/3.1.3
Reviewer Review Type Date Requested Status
Martin Pitt 2011-09-05 Approve on 2011-09-06
Review via email: mp+74147@code.launchpad.net
To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thank you!

review: Approve

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-08-16 07:49:16 +0000
3+++ debian/changelog 2011-09-05 23:58:17 +0000
4@@ -1,3 +1,11 @@
5+yelp (3.1.3-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ * debian/patches/06_make_ubuntu_docs_default.patch:
9+ Updated for new default help location (LP: #841307)
10+
11+ -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 05 Sep 2011 19:43:22 -0400
12+
13 yelp (3.1.2-0ubuntu1) oneiric; urgency=low
14
15 * New upstream release
16
17=== modified file 'debian/patches/06_make_ubuntu_docs_default.patch'
18--- debian/patches/06_make_ubuntu_docs_default.patch 2011-08-16 03:44:02 +0000
19+++ debian/patches/06_make_ubuntu_docs_default.patch 2011-09-05 23:58:17 +0000
20@@ -10,7 +10,7 @@
21 #include "yelp-window.h"
22
23 -#define DEFAULT_URI "ghelp:gnome-help"
24-+#define DEFAULT_URI "ghelp:ubuntu-help"
25++#define DEFAULT_URI "help:ubuntu-help"
26
27 static gboolean editor_mode = FALSE;
28

Subscribers

People subscribed via source and target branches

to all changes: