[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 6144fa33070888ec6f00b1c1152cbaee5d2d2204
Merge: 7e7de0c12975f278a09c7dceae203ff7c8de9d59 c9e2e810b6a7adf0c6be716a311a603f1280b290
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Tue May 29 09:32:48 2012 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/patches/nss-workaround.patch
    	debian/patches/series

diff --combined debian/control
index ae1dfa1,93e529e..3ca4956
--- a/debian/control
+++ b/debian/control
@@@ -10,6 -10,7 +10,7 @@@ Vcs-Browser: http://anonscm.debian.org/
  Homepage: http://code.google.com/chromium/
  Build-Depends: cdbs,
  	debhelper (>= 7),
+ 	g++-4.6,
  	pkg-config,
  	lsb-release,
  	lzma,
@@@ -38,7 -39,7 +39,7 @@@
  	libsqlite3-dev,
  	libasound2-dev,
  	libnss3-dev (>= 3.12.3),
- 	libnspr4-dev,
+ 	libnspr4-dev (>= 2:4.9-2~),
  	libgl1-mesa-dri,
  	mesa-common-dev,
  	libgl1-mesa-dev,
@@@ -79,7 -80,6 +80,7 @@@
  	libgles2-mesa-dev,
  	subversion,
  	libudev-dev,
 +	libssl-dev
  Standards-Version: 3.9.2
  
  Package: chromium-browser
@@@ -136,7 -136,7 +137,7 @@@ Description: page inspector for the chr
  Package: chromium
  Architecture: i386 amd64 armel armhf
  Depends: ${shlibs:Depends}, ${misc:Depends},
- 	libnss3-1d (>= 3.12.3),
+ 	libnspr4 (>= 2:4.9-2~),
  	xdg-utils,
  	chromium-inspector
  Suggests: chromium-l10n
diff --combined debian/patches/series
index 4d8383b,29e30dc..794cf54
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -16,10 -16,8 +16,9 @@@ webkit-version.patc
  #javascript-i18n.patch
  #icu.patch
  cups1.5.patch
 -system_v8.patch
 -#protobuf.patch
 +#system_v8.patch
 +protobuf.patch
  arm-no-float-abi.patch
  vpx.patch
  pulseaudio.patch
 +#gcc4.7.patch

-- 
Git repository for pkg-chromium