[Pkg-chromium-commit] [pkg-chromium] 01/01: release 29.0.1547.57-3+exp1

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch experimental
in repository pkg-chromium.

commit 5d33aa47dc01bd61883535db32b8d5ee12ec2044
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Sep 22 11:31:45 2013 -0400

    release 29.0.1547.57-3+exp1
---
 debian/changelog                               |    7 +++++++
 debian/patches/dont-assume-cross-compile.patch |   16 +++++++---------
 debian/patches/series                          |    2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5002bc..6c77db1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chromium-browser (29.0.1547.57-3+exp1) experimental; urgency=low
+
+  [ Shawn Landden ]
+  * Enable arm support.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 22 Sep 2013 00:34:12 +0000
+
 chromium-browser (29.0.1547.57-3) unstable; urgency=medium
 
   * Drop transitional packages (closes: #684369).
diff --git a/debian/patches/dont-assume-cross-compile.patch b/debian/patches/dont-assume-cross-compile.patch
index 7ab3eeb..93f42e9 100644
--- a/debian/patches/dont-assume-cross-compile.patch
+++ b/debian/patches/dont-assume-cross-compile.patch
@@ -1,8 +1,8 @@
-diff --git a/src/build/common.gypi b/src/build/common.gypi
-index 5312173..134f880 100644
---- a/src/build/common.gypi
-+++ b/src/build/common.gypi
-@@ -635,31 +635,6 @@
+Index: chromium/src/build/common.gypi
+===================================================================
+--- chromium.orig/src/build/common.gypi	2013-09-22 00:59:08.577305642 +0000
++++ chromium/src/build/common.gypi	2013-09-22 01:00:10.917303364 +0000
+@@ -634,31 +634,6 @@
            'enable_settings_app%': 0,
          }],
  
@@ -18,10 +18,10 @@ index 5312173..134f880 100644
 -        ['linux_lsb_release=="12.04"', {
 -          'conditions': [
 -            ['target_arch=="x64"', {
--              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_amd64-sysroot'
+-              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_amd64-sysroot',
 -            }],
 -            ['target_arch=="ia32"', {
--              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_i386-sysroot',
+-              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/debian_wheezy_i386-sysroot',
 -            }],
 -        ],
 -        }], # linux_lsb_release=="12.04"
@@ -34,5 +34,3 @@ index 5312173..134f880 100644
          # Whether tests targets should be run, archived or just have the
          # dependencies verified. All the tests targets have the '_run' suffix,
          # e.g. base_unittests_run runs the target base_unittests. The test
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 694933d..5ff0142 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,5 +18,5 @@ arm.patch
 icon.patch
 arm-neon.patch
 gold-linker.patch
-dont-assume-cross-compile.patch
 
+dont-assume-cross-compile.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git