[Pkg-chromium-commit] [pkg-chromium] 01/02: Revert "arm"

[Michael Gilbert]

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

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

commit 1af32b62bbee7b98442c57d99b54db739ec1fee6
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 28 15:00:45 2013 -0400

    Revert "arm"
    
    This reverts commit 5be8bf2ab8b1c136028411f8a1b62b859ab42f2a.
    arm staging should happen in the experimental branch.
---
 debian/control                                 |    4 +--
 debian/patches/dont-assume-cross-compile.patch |   38 ------------------------
 debian/patches/series                          |    2 --
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/debian/control b/debian/control
index 982519b..d4b50af 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,7 @@ Build-Depends:
 Standards-Version: 3.9.4
 
 Package: chromium
-Architecture: i386 amd64 armhf
+Architecture: i386 amd64
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
@@ -112,7 +112,7 @@ Description: Google's open source chromium web browser
  This package contains the Chromium browser.
 
 Package: chromium-dbg
-Architecture: i386 amd64 armhf
+Architecture: i386 amd64
 Section: debug
 Priority: extra
 Depends:
diff --git a/debian/patches/dont-assume-cross-compile.patch b/debian/patches/dont-assume-cross-compile.patch
deleted file mode 100644
index 7ab3eeb..0000000
--- a/debian/patches/dont-assume-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 @@
-           'enable_settings_app%': 0,
-         }],
- 
--        ['OS=="linux" and target_arch=="arm" and chromeos==0', {
--          # Set some defaults for arm/linux chrome builds
--          'linux_breakpad%': 0,
--          'linux_use_tcmalloc%': 0,
--          # sysroot needs to be an absolute path otherwise it generates
--          # incorrect results when passed to pkg-config
--          'sysroot%': '<!(cd <(DEPTH) && pwd -P)/arm-sysroot',
--        }], # OS=="linux" and target_arch=="arm" and chromeos==0
--
--        ['linux_lsb_release=="12.04"', {
--          'conditions': [
--            ['target_arch=="x64"', {
--              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_amd64-sysroot'
--            }],
--            ['target_arch=="ia32"', {
--              'sysroot%': '<!(cd <(DEPTH) && pwd -P)/chrome/installer/linux/internal/debian_wheezy_i386-sysroot',
--            }],
--        ],
--        }], # linux_lsb_release=="12.04"
--
--        ['target_arch=="mipsel"', {
--          'sysroot%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/sysroot',
--          'CXX%': '<!(cd <(DEPTH) && pwd -P)/mipsel-sysroot/bin/mipsel-linux-gnu-gcc',
--        }],
--
-         # 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..47bcd3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,5 +18,3 @@ arm.patch
 icon.patch
 arm-neon.patch
 gold-linker.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