[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 637 DEB_HOST_ARCH_CPU in armel is arm, updating debian/rules

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 637
Revision Id: iuculano at debian.org-20100630102004-uogkxjxfp039v92i
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : DEB_HOST_ARCH_CPU in armel is arm, updating debian/rules


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/rules

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-06-28 13:10:43 +0000
+++ b/debian/changelog	2010-06-30 10:20:04 +0000
@@ -1,3 +1,9 @@
+chromium-browser (5.0.375.86~r49890-5) UNRELEASED; urgency=low
+
+  * DEB_HOST_ARCH_CPU in armel is arm, updating debian/rules
+
+ -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 30 Jun 2010 12:19:16 +0200
+
 chromium-browser (5.0.375.86~r49890-4) unstable; urgency=low
 
   * Use the full path in chromium-browser.desktop Exec field (Closes: #580582)

=== modified file 'debian/rules'
--- a/debian/rules	2010-06-26 15:40:30 +0000
+++ b/debian/rules	2010-06-30 10:20:04 +0000
@@ -55,22 +55,17 @@
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-ifeq (armel,$(DEB_HOST_ARCH_CPU))
+ifeq (arm,$(DEB_HOST_ARCH_CPU))
 AVOID_GCC_44 := 0
 GYP_DEFINES += \
 	arm_thumb=1 \
 	target_arch=arm \
 	disable_nacl=1 \
 	linux_use_tcmalloc=0 \
+	armv7=0 \
 	$(NULL)
 WANT_LZMA_DEBS := 0
 WANT_TESTS     := 0
-ifneq (,$(filter unstable development,$(DEBIAN_DIST)))
-# depending on cpu and distribution, enforce an armv7 with thumb build (or not)
-GYP_DEFINES += \
-	armv7=0 \
-	$(NULL)
-endif
 else
 ifeq (amd64,$(DEB_HOST_ARCH_CPU))
 GYP_DEFINES += target_arch=x64