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

Subscribers

People subscribed via source and target branches

to status/vote changes: