[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. eb57f1ea91dd1c8a18a0e6ce9cd4f0a2a252ef31

[Giuseppe Iuculano]

The following commit has been merged in the experimental branch:
commit 38fcfbe6f42325c8445263e67e686caa3efdfac3
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Jul 23 20:48:01 2011 +0200

    * Run the gclient hooks when creating the source tarball, as we need files from the Native Client's integrated runtime (IRT) library (Thanks to Fabien Tassin)

diff --git a/debian/changelog b/debian/changelog
index cb1f79a..6373ec2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ chromium-browser (13.0.782.99~r93151-1) UNRELEASED; urgency=low
   * Switch to git
   * Use system icu, vpx, flac, webp, speex libs
   * Build-depens on gyp >= 0.1~svn971
+  * Run the gclient hooks when creating the source tarball, as we need files
+    from the Native Client's integrated runtime (IRT) library
+    (Thanks to Fabien Tassin)
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 23 Jul 2011 19:55:04 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 23 Jul 2011 20:46:56 +0200
 
 chromium-browser (12.0.742.112~r90304-1) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index ef962f0..a482456 100755
--- a/debian/rules
+++ b/debian/rules
@@ -738,6 +738,12 @@ endif
 	# Checkout (drop the previous content and retry if gclient failed, see http://crbug.com/39954)
 	cd $(TMP_DIR) && ./tools/depot_tools/gclient update --nohooks $(REVISION) || \
 	  ( rm -rf $(foreach dir,src [0-9]*,$(wildcard $(TMP_DIR)/$(dir))) ; ./tools/depot_tools/gclient update --nohooks $(REVISION) )
+	# For NaCL, run the hooks, but not the gyp ones
+	( cd $(TMP_DIR) ; \
+		SDIR=`grep '"name"' .gclient | cut -d\" -f4` ; \
+		perl -i~ -pe 's%(.python., .src/build/gyp_chromium.)%"echo", "#disabled#", $$1%' $$SDIR/DEPS; \
+		./tools/depot_tools/gclient runhooks ; \
+		mv $$SDIR/DEPS~ $$SDIR/DEPS ; )
 
 ifneq (,$(LOCAL_BRANCH))
 	rm -rf $(TMP_DDIR)

-- 
Git repository for pkg-chromium