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

[Jeremy Bícha]

[Martin Pitt (pitti)]

Thank you!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-16 07:49:16 +0000
+++ debian/changelog	2011-09-05 23:58:17 +0000
@@ -1,3 +1,11 @@
+yelp (3.1.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/06_make_ubuntu_docs_default.patch:
+    Updated for new default help location (LP: #841307)
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 05 Sep 2011 19:43:22 -0400
+
 yelp (3.1.2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release
 
=== modified file 'debian/patches/06_make_ubuntu_docs_default.patch'
--- debian/patches/06_make_ubuntu_docs_default.patch	2011-08-16 03:44:02 +0000
+++ debian/patches/06_make_ubuntu_docs_default.patch	2011-09-05 23:58:17 +0000
@@ -10,7 +10,7 @@
  #include "yelp-window.h"
  
 -#define DEFAULT_URI "ghelp:gnome-help"
-+#define DEFAULT_URI "ghelp:ubuntu-help"
++#define DEFAULT_URI "help:ubuntu-help"
  
  static gboolean editor_mode = FALSE;