[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/13.0.782.215_r97094-1-14-gcd75f10

[Giuseppe Iuculano]

The following commit has been merged in the experimental branch:
commit 0bb35fbf17d248a8af6ae2045df89ed4e98ef70b
Merge: 736bf8b277e4a322175b1160918b627fc2932b51 dc3966ba006f172c92fb553cd04a5205e70e512c
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Aug 27 13:49:14 2011 +0200

    Merge branch 'master' into experimental

diff --combined debian/changelog
index 7f4ce90,ab2ca74..0decd0e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,3 +1,12 @@@
 +chromium-browser (14.0.835.109~r97804-1) UNRELEASED; urgency=low
 +
 +  * New beta release
 +  * Fix gbp.conf for experimental branch
 +  * Refreshed patches
 +  * Use libv8 system copy
 +
 + -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 27 Aug 2011 13:48:51 +0200
 +
  chromium-browser (13.0.782.215~r97094-2) UNRELEASED; urgency=low
  
    [ Giuseppe Iuculano ]
@@@ -16,6 -7,12 +16,12 @@@
    * Add a replace and breaks entry to reflect the compatibility symlinks
      having moved to the chromium-browser package.
  
+   [ Michael Gilbert ]
+   * Fix lintian warning.
+   * Fix manpage comment characters.
+   * Strip the Native Client Integrated RunTime (NaCl IRT) libraries.
+   * Objectify an old changelog entry (closes: #606261).
+ 
   -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 24 Aug 2011 14:23:49 +0200
  
  chromium-browser (13.0.782.215~r97094-1) unstable; urgency=low
@@@ -562,8 -559,7 +568,7 @@@ chromium-browser (6.0.472.63~r59945-3) 
  chromium-browser (6.0.472.63~r59945-2) unstable; urgency=high
  
    * Added the missing changelog credit for the 5.0.375.29~r46008-1 revision.
-     Obviously this was not a "stealing" as foolishly written by Fabien Tassin
-     in a blog rant, but was a bad debian/changelog merge.
+     This corrects a bad debian/changelog merge.
    * Backported security patches from stable:
      - High Use-after-free in text editing. Credit to David Bloom of the Google
        Security Team, Google Chrome Security Team (Inferno) and Google Chrome
diff --combined debian/control
index e81d2fd,1992b7a..1a7cb16
--- a/debian/control
+++ b/debian/control
@@@ -65,8 -65,7 +65,8 @@@ Build-Depends: cdbs
  	binutils-gold,
  	libflac-dev,
  	libwebp-dev,
 -	autotools-dev
 +	autotools-dev,
 +	libv8-dev (>= 3.4.14.13)
  Standards-Version: 3.9.2
  
  Package: chromium-browser
@@@ -88,7 -87,7 +88,7 @@@ Description: Chromium browser - transit
  Package: chromium-browser-dbg
  Architecture: all
  Section: oldlibs
- Depends: chromium-dbg, ${misc:Depends}
+ Depends: chromium-dbg, chromium, ${misc:Depends}
  Priority: extra
  Description: chromium-browser debug symbols transitional dummy package
   Debug symbols for the Chromium browser - transitional dummy package
diff --combined debian/rules
index e5263fe,8714147..e4cabb1
--- a/debian/rules
+++ b/debian/rules
@@@ -32,7 -32,7 +32,7 @@@ WANT_SYSTEM_LIBS ?= 
  WANT_SHARED_LIBS ?= 0
  WANT_TESTS       ?= 0
  WANT_SANDBOXING  ?= 1
 -USE_SYSTEM_V8    ?= 0
 +USE_SYSTEM_V8    ?= 1
  VERBOSE          ?= 0
  
  export DEB_BUILD_HARDENING=1
@@@ -455,6 -455,8 +455,8 @@@ endi
  	mv debian/tmp/$(LIB_DIR)/chrome.1 debian/tmp/$(LIB_DIR)/chromium.1
  	dh_installman -pchromium debian/tmp/$(LIB_DIR)/chromium.1
  	rm -f debian/tmp/$(LIB_DIR)/chromium.1
+ 	strip debian/tmp/usr/lib/chromium/nacl_irt_x86_32.nexe || true
+ 	strip debian/tmp/usr/lib/chromium/nacl_irt_x86_64.nexe || true
  
  binary-install/$(DEBIAN_NAME)::
  	mkdir -p $(CURDIR)/debian/$(DEBIAN_NAME)/usr/share/pixmaps

-- 
Git repository for pkg-chromium