Chromium Browser

Merge lp:~brandonsnider/chromium-browser/chromium-browser.head.daily into lp:chromium-browser

  1. chromium-browser.head.daily
  2. Merge into chromium-browser.head
Proposed by Brandon Snider
Status: Merged
Merged at revision: 861
Proposed branch: lp:~brandonsnider/chromium-browser/chromium-browser.head.daily
Merge into: lp:chromium-browser
Diff against target: 61 lines (+6/-17)
3 files modified
debian/changelog (+2/-2)
debian/chromium-browser.install (+0/-1)
debian/patches/disable_dlog_and_dcheck_in_release_builds.patch (+4/-14)
To merge this branch: bzr merge lp:~brandonsnider/chromium-browser/chromium-browser.head.daily
Reviewer Review Type Date Requested Status
Chromium team Pending
Review via email: mp+85565@code.launchpad.net

Description of the change

refreshed disable_dlog_and_dcheck_in_release_builds.patch and fixed chromium-browser.install

To post a comment you must log in.

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-10-20 22:51:47 +0000
3+++ debian/changelog 2011-12-13 22:20:31 +0000
4@@ -1,4 +1,4 @@
5-chromium-browser (15.0.870.0~svn20110903r99510-0ubuntu1) UNRELEASED; urgency=low
6+chromium-browser (18.0.970.0~svn20111213r114183-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Fabien Tassin <fta@ubuntu.com> ]
9 * Disable NaCl until we figure out what to do with the private toolchain
10@@ -33,7 +33,7 @@
11 - update debian/rules
12 - update debian/cdbs/tarball.mk
13
14- -- Chris Coulson <chris.coulson@canonical.com> Thu, 20 Oct 2011 23:51:34 +0100
15+ -- Chris Coulson <chrisccoulson@chinstrap.canonical.com> Tue, 13 Dec 2011 06:00:07 +0000
16
17 chromium-browser (13.0.782.215~r97094-0ubuntu1) oneiric; urgency=high
18
19
20=== modified file 'debian/chromium-browser.install'
21--- debian/chromium-browser.install 2011-08-02 20:26:20 +0000
22+++ debian/chromium-browser.install 2011-12-13 22:20:31 +0000
23@@ -4,7 +4,6 @@
24 debian/tmp/usr/lib/chromium-browser/chrome.pak
25 debian/tmp/usr/lib/chromium-browser/xdg-settings
26 debian/tmp/usr/lib/chromium-browser/xdg-mime
27-debian/tmp/usr/lib/chromium-browser/resources.pak
28 debian/tmp/usr/lib/chromium-browser/locales/*
29 debian/chromium-browser.desktop usr/share/applications
30 debian/chromium-browser.xml usr/share/gnome-control-center/default-apps
31
32=== modified file 'debian/patches/disable_dlog_and_dcheck_in_release_builds.patch'
33--- debian/patches/disable_dlog_and_dcheck_in_release_builds.patch 2010-10-02 16:21:17 +0000
34+++ debian/patches/disable_dlog_and_dcheck_in_release_builds.patch 2011-12-13 22:20:31 +0000
35@@ -6,22 +6,12 @@
36 ===================================================================
37 --- src.orig/base/logging.h
38 +++ src/base/logging.h
39-@@ -495,17 +495,17 @@
40- #define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
41- #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
42- #define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
43-
44- // http://crbug.com/16512 is open for a real fix for this. For now, Windows
45+@@ -451,7 +451,7 @@ const LogSeverity LOG_0 = LOG_ERROR;
46 // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
47 // defined.
48 #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
49 - (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
50 + (!defined(OS_WIN) && defined(NDEBUG))
51- // Used by unit tests.
52- #define LOGGING_IS_OFFICIAL_BUILD
53-
54- // In order to have optimized code for official builds, remove DLOGs and
55- // DCHECKs.
56- #define ENABLE_DLOG 0
57- #define ENABLE_DCHECK 0
58-
59+ #define LOGGING_IS_OFFICIAL_BUILD 1
60+ #else
61+ #define LOGGING_IS_OFFICIAL_BUILD 0

Subscribers

People subscribed via source and target branches

to status/vote changes: