[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/18.0.1025.168_r134367-1-13-g6144fa3

[Giuseppe Iuculano]

The following commit has been merged in the experimental branch:
commit 7ee73b5a03bdb465dfc35b9d9086fa3ccb43692f
Merge: 625083eadeed86fec274e02a3274a03c57d9b44d 8cb8e89b178dc4d46e0955220aecd67e7bff550f
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat May 19 19:08:59 2012 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/patches/cups1.5.patch
    	debian/patches/expat.patch
    	debian/patches/ffmpeg_arm.patch
    	debian/patches/fix-manpage.patch
    	debian/patches/nspr.patch
    	debian/patches/nss.patch
    	debian/patches/system-speech.patch
    	debian/patches/webkit-version.patch

diff --combined debian/patches/nss.patch
index e0775bf,72285d3..bea7334
--- a/debian/patches/nss.patch
+++ b/debian/patches/nss.patch
@@@ -1,17 -1,11 +1,26 @@@
++<<<<<<< HEAD
 +From: Giuseppe Iuculano <iuculano at debian.org>
 +Date: Sat, 8 May 2010 12:05:46 +0200
 +Subject: Pull in nspr headers
 +---
 + src/chrome/chrome_common.gypi |    5 +++++
 + 1 files changed, 5 insertions(+), 0 deletions(-)
 +
 +diff --git a/src/chrome/chrome_common.gypi b/src/chrome/chrome_common.gypi
 +index 1e0a23e5..062713b6 100644
 +--- a/src/chrome/chrome_common.gypi
 ++++ b/src/chrome/chrome_common.gypi
 +@@ -237,6 +237,11 @@
++=======
+ webkit needs to call nss to pull in nspr headers
+ Index: sid/src/chrome/chrome_common.gypi
+ ===================================================================
+ --- sid.orig/src/chrome/chrome_common.gypi	2012-05-16 11:33:16.000000000 +0200
+ +++ sid/src/chrome/chrome_common.gypi	2012-05-16 15:51:06.398128415 +0200
+ @@ -272,6 +272,11 @@
++>>>>>>> master
               '<(DEPTH)/third_party/wtl/include',
-            ],
+            ]
           }],
  +        ['OS=="linux"', {
  +          'include_dirs': [

-- 
Git repository for pkg-chromium