Merge lp:~dsas/yelp/ubuntu.388750 into lp:~ubuntu-desktop/yelp/ubuntu

[Dean Sas]

[Dean Sas (dsas)]

Fixes LP: #388750 ("repeat this search online doesn't work")

There's not an immediate need to merge this as there is a server side redirect so the search will now work.

Unmerged revisions

27. By Dean Sas on 2009-10-13

* debian/patches/06_ubuntu_online_url.patch (LP: #388750)
  - Use new ubuntu website search URL

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-22 08:28:46 +0000
+++ debian/changelog	2009-10-13 01:00:26 +0000
@@ -1,3 +1,10 @@
+yelp (2.28.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/06_ubuntu_online_url.patch (LP: #388750)
+    - Use new ubuntu website search URL
+
+ -- Dean Sas <[e-mail]>  Tue, 13 Oct 2009 00:23:49 +0100
+
 yelp (2.28.0-0ubuntu1) karmic; urgency=low
 
   * New upstream release (LP: #434334)

=== modified file 'debian/patches/06_ubuntu_online_url.patch'
--- debian/patches/06_ubuntu_online_url.patch	2009-03-02 17:43:59 +0000
+++ debian/patches/06_ubuntu_online_url.patch	2009-10-13 01:00:26 +0000
@@ -9,7 +9,7 @@
  typedef struct _SearchContainer SearchContainer;
  
 -#define ONLINE_URL "http://api.gnome.org/yelp/forums?query=%s"
-+#define ONLINE_URL "http://search.ubuntu.com/help?os=ubuntu&ver=8.04&q=%s"
++#define ONLINE_URL "http://search.ubuntu.com/results2.html?cx=009650792990864903260%%3A-lsdjshi1tu&cof=FORID%%3A11&ie=UTF-8&q=%s"
  
 -#define ONLINE_NAME N_("the GNOME Support Forums")
 +#define ONLINE_NAME N_("the Ubuntu Help Pages")