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

[Brandon Snider]

fixed chromium-browser.install

Unmerged revisions

581. By Brandon Snider on 2011-12-14

fixed chromium-browser.install

580. By Brandon Snider on 2011-12-14

fixed disable_dlog_and_dcheck_in_release_builds.patch

=== modified file 'debian/chromium-browser.install'
--- debian/chromium-browser.install	2011-08-12 10:31:52 +0000
+++ debian/chromium-browser.install	2011-12-15 00:42:24 +0000
@@ -2,9 +2,10 @@
 debian/tmp/usr/bin
 debian/tmp/usr/lib/chromium-browser/chromium*
 debian/tmp/usr/lib/chromium-browser/chrome.pak
+debian/tmp/usr/lib/chromium-browser/content_resources.pak
+debian/tmp/usr/lib/chromium-browser/resources.pak
 debian/tmp/usr/lib/chromium-browser/xdg-settings
 debian/tmp/usr/lib/chromium-browser/xdg-mime
-debian/tmp/usr/lib/chromium-browser/resources.pak
 debian/tmp/usr/lib/chromium-browser/locales/*
 debian/chromium-browser.desktop usr/share/applications
 debian/chromium-browser.xml usr/share/gnome-control-center/default-apps

=== 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-15 00:42:24 +0000
@@ -6,22 +6,12 @@
 ===================================================================
 --- src.orig/base/logging.h
 +++ src/base/logging.h
-@@ -495,17 +495,17 @@
- #define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
- #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
- #define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
- 
- // http://crbug.com/16512 is open for a real fix for this.  For now, Windows
+@@ -451,7 +451,7 @@ const LogSeverity LOG_0 = LOG_ERROR;
  // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
  // defined.
  #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
 -    (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
 +    (!defined(OS_WIN) && defined(NDEBUG))
- // Used by unit tests.
- #define LOGGING_IS_OFFICIAL_BUILD
- 
- // In order to have optimized code for official builds, remove DLOGs and
- // DCHECKs.
- #define ENABLE_DLOG 0
- #define ENABLE_DCHECK 0
- 
+ #define LOGGING_IS_OFFICIAL_BUILD 1
+ #else
+ #define LOGGING_IS_OFFICIAL_BUILD 0