Merge lp:~chrisccoulson/chromium-browser/chromium-browser.head.search into lp:chromium-browser

[Chris Coulson]

[Fabien Tassin (fta)]

Merged, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-14 20:08:23 +0000
+++ debian/changelog	2010-04-14 21:21:24 +0000
@@ -1,5 +1,6 @@
 chromium-browser (5.0.370.0~svn20100405r43596-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Fabien Tassin <[e-mail]> ]
   * Build with build_ffmpegsumo=0 instead of use_system_ffmpeg=1 (which
     now means something else)
     - update debian/rules
@@ -9,6 +10,10 @@
     the channels updates often failing with a "Can't switch the checkout" error
     - update debian/rules
 
+  [ Chris Coulson <[e-mail]> ]
+  * Update the default search URL
+    - update debian/rules
+
  -- Fabien Tassin <[e-mail]>  Mon, 05 Apr 2010 04:00:02 +0200
 
 chromium-browser (5.0.342.9~r43360-0ubuntu1) lucid; urgency=low

=== modified file 'debian/rules'
--- debian/rules	2010-04-14 20:08:23 +0000
+++ debian/rules	2010-04-14 21:21:24 +0000
@@ -291,6 +291,12 @@
 ######
 DO = (touch r1; echo '$(1)'; $(1); touch r2 ; T1=`date -r r1 +%s` ; T2=`date -r r2 +%s`; echo "PERF: '$(2)' built in "`expr $$T2 - $$T1`" sec"; rm -f r1 r2;)
 
+pre-build::
+ifneq (,$(findstring Ubuntu,$(DEBIAN_DIST)))
+	sed -ri '/const PrepopulatedEngine google = \{/,/\}\;/ { s/sourceid=chrome\&/&client=ubuntu\&channel=cs\&/g; }' \
+		build-tree/src/chrome/browser/search_engines/template_url_prepopulate_data.cc
+endif
+
 DEB_MAKE_BUILD_TARGET := $(BUILD_ARGS) $(BUILD_TARGETS)
 
 configure/$(DEBIAN_NAME):: debian/configure-stamp