packages: chromium-browser/chromium-browser.spec, chromium-browser/system-l...

[glen]

Author: glen                         Date: Thu Jul 22 14:15:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 6.0.474.0, r53294

---- Files affected:
packages/chromium-browser:
   chromium-browser.spec (1.68 -> 1.69) , system-libs.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/chromium-browser/chromium-browser.spec
diff -u packages/chromium-browser/chromium-browser.spec:1.68 packages/chromium-browser/chromium-browser.spec:1.69
--- packages/chromium-browser/chromium-browser.spec:1.68	Tue Jul 13 13:36:19 2010
+++ packages/chromium-browser/chromium-browser.spec	Thu Jul 22 16:15:29 2010
@@ -22,18 +22,18 @@
 # - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
 # - to look for new tarball, use update-source.sh script
 
-%define		svndate 20100713
-%define		svnver  52155
+%define		svndate 20100722
+%define		svnver  53294
 %define		rel		1
 
 Summary:	A WebKit powered web browser
 Name:		chromium-browser
-Version:	6.0.464.0
+Version:	6.0.474.0
 Release:	%{svnver}.%{rel}
 License:	BSD, LGPL v2+ (ffmpeg)
 Group:		X11/Applications/Networking
 Source0:	http://ppa.launchpad.net/chromium-daily/ppa/ubuntu/pool/main/c/chromium-browser/%{name}_%{version}~svn%{svndate}r%{svnver}.orig.tar.gz
-# Source0-md5:	3611abf4e0a29e2fbc2c7a0510056b29
+# Source0-md5:	6d32faaa7c46f95aac0935cdacb576bb
 Source2:	%{name}.sh
 Source3:	%{name}.desktop
 Source4:	find-lang.sh
@@ -315,6 +315,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2010/07/22 14:15:29  glen
+- up to 6.0.474.0, r53294
+
 Revision 1.68  2010/07/13 11:36:19  glen
 - up to 6.0.464.0 r52155
 

================================================================
Index: packages/chromium-browser/system-libs.patch
diff -u packages/chromium-browser/system-libs.patch:1.6 packages/chromium-browser/system-libs.patch:1.7
--- packages/chromium-browser/system-libs.patch:1.6	Sun Apr 25 15:38:33 2010
+++ packages/chromium-browser/system-libs.patch	Thu Jul 22 16:15:29 2010
@@ -44,14 +44,14 @@
  
  namespace {
  
---- chromium-browser-5.0.378.0~svn20100415r44604/src/chrome/browser/metrics/metrics_log.cc~	2010-04-14 18:30:23.000000000 +0300
-+++ chromium-browser-5.0.378.0~svn20100415r44604/src/chrome/browser/metrics/metrics_log.cc	2010-04-15 11:40:36.482149714 +0300
-@@ -14,7 +14,7 @@
+--- chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc~	2010-07-21 05:01:25.000000000 +0300
++++ chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc	2010-07-22 13:58:51.340525649 +0300
+@@ -16,7 +16,7 @@
+ #include "base/scoped_ptr.h"
  #include "base/string_util.h"
  #include "base/sys_info.h"
- #include "base/utf_string_conversions.h"
 -#include "base/third_party/nspr/prtime.h"
 +#include <nspr/prtime.h>
- #include "chrome/app/chrome_version_info.h"
+ #include "base/time.h"
+ #include "base/utf_string_conversions.h"
  #include "chrome/browser/autocomplete/autocomplete.h"
- #include "chrome/browser/browser_process.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.68&r2=1.69&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/system-libs.patch?r1=1.6&r2=1.7&f=u