[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. 03289e2f4aa5d2647a53c4f7424e7e5653a5a01f

[Michael Gilbert]

The following commit has been merged in the master branch:
commit a383994198b8a7a6bee5f96a53cde8986abf1cee
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Thu Aug 18 17:46:59 2011 -0400

    use system config.guess/sub for embedded yasm

diff --git a/debian/changelog b/debian/changelog
index b0b4c7c..a872854 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ chromium-browser (13.0.782.107~r94237-2) UNRELEASED; urgency=low
   * Fix an obsolete character encoding in debian/copyright.
   * Fix build failure with cups >= 1.5.0.
   * Don't support lenny's cups anymore.
+  * Use system config.guess and config.sub for yasm's autotools files.
   * Clean up package short descriptions.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 07 Aug 2011 02:25:23 -0400
diff --git a/debian/control b/debian/control
index f694cc6..fedcaa0 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Standards-Version: 3.9.2
 
 Package: chromium-browser
 Architecture: all
-Depends: chromium (>= 10)
+Depends: chromium (>= 10), ${misc:Depends}
 Section: oldlibs
 Description: Chromium browser - transitional dummy package
  Chromium is an open-source browser project that aims to build a safer, faster,
@@ -84,7 +84,7 @@ Description: Chromium browser - transitional dummy package
 Package: chromium-browser-dbg
 Architecture: all
 Section: oldlibs
-Depends: chromium-dbg
+Depends: chromium-dbg, ${misc:Depends}
 Priority: extra
 Description: chromium-browser debug symbols transitional dummy package
  Debug symbols for the Chromium browser - transitional dummy package
@@ -95,7 +95,7 @@ Description: chromium-browser debug symbols transitional dummy package
 Package: chromium-browser-l10n
 Architecture: all
 Section: oldlibs
-Depends: chromium-l10n
+Depends: chromium-l10, ${misc:Depends}
 Description: chromium-browser language packages - transitional dummy package
  Chromium is an open-source browser project that aims to build a safer, faster,
  and more stable way for all Internet users to experience the web.
@@ -109,7 +109,7 @@ Description: chromium-browser language packages - transitional dummy package
 Package: chromium-browser-inspector
 Architecture: all
 Section: oldlibs
-Depends: chromium-inspector
+Depends: chromium-inspector, ${misc:Depends}
 Description: page inspector for the chromium-browser - transitional dummy package
  Chromium is an open-source browser project that aims to build a safer, faster,
  and more stable way for all Internet users to experience the web.
@@ -127,7 +127,7 @@ Suggests: chromium-l10n
 Provides: www-browser, chromium-testsuite, gnome-www-browser
 Replaces: chromium-testsuite, chromium-codecs-ffmpeg, chromium-codecs-ffmpeg-extra, chromium-browser (<< 10.0.648.82~r75062-1~)
 Conflicts: chromium-testsuite, chromium-codecs-ffmpeg, chromium-codecs-ffmpeg-extra, chromium-browser (<< 10.0.648.82~r75062-1~)
-Description: The Chromium open source web browser
+Description: The chromium open source web browser
  Chromium is an open-source browser project that aims to build a safer, faster,
  and more stable way for all Internet users to experience the web.
  .
@@ -145,7 +145,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, chromium (= ${binary:Version})
 Provides: chromium-testsuite-dbg
 Replaces: chromium-testsuite-dbg, chromium-browser-dbg (<< 10.0.648.82~r75062-1~)
 Conflicts: chromium-testsuite-dbg, chromium-browser-dbg (<< 10.0.648.82~r75062-1~)
-Description: Debugging symbols for the chomium web browser
+Description: Debugging symbols for the chromium web browser
  Debug symbols for the Chromium browser
  .
  Chromium is an open-source browser project that aims to build a safer, faster,
diff --git a/debian/rules b/debian/rules
index 3a116e0..e5f0aa8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -399,6 +399,8 @@ debian/configure-stamp:
 	# files at this point
 	echo "$(DEBIAN_REVISION)" > $(SRC_DIR)/build/LASTCHANGE.in
 	# BUILD_ARGS=$(BUILD_ARGS)
+	cp -p /usr/share/misc/config.guess src/third_party/yasm/source/patched-yasm/config
+	cp -p /usr/share/misc/config.sub src/third_party/yasm/source/patched-yasm/config
 
 common-build-arch common-build-indep:: debian/stamp-makefile-build-perf
 debian/stamp-makefile-build-perf: debian/stamp-makefile-build
@@ -425,6 +427,8 @@ clean::
 	rm -f src/build/LASTCHANGE.in
 	rm -f src/third_party/WebKit/Source/WebCore/WebCore.gyp/idls_list_temp_file.tmp
 	rm -f src/v8/tools/gyp/v8.log
+	rm -f src/third_party/yasm/source/patched-yasm/config/config.guess
+	rm -f src/third_party/yasm/source/patched-yasm/config/config.sub
 
 # Install: there's no install rules in scons yet, do it manually
 common-install-prehook-impl::

-- 
Git repository for pkg-chromium