[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 744 Revert ffmpeg

[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: 744
Revision Id: iuculano at debian.org-20110309193903-wy57agd4ffj5cdsq
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Revert ffmpeg


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

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2011-03-09 13:17:20 +0000
+++ b/debian/changelog	2011-03-09 19:39:03 +0000
@@ -2,10 +2,8 @@
 
   * New stable version
   * Refreshed patches 
-  * Use system ffmpeg
-  * Add libavcodec-dev libavformat-dev libavutil-dev in Build-depends
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 09 Mar 2011 14:16:10 +0100
+ -- Giuseppe Iuculano <iuculano at debian.org>  Tue, 08 Mar 2011 20:37:47 +0100
 
 chromium-browser (10.0.648.114~r75702-1) experimental; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2011-03-09 13:33:26 +0000
+++ b/debian/control	2011-03-09 19:39:03 +0000
@@ -62,10 +62,7 @@
 	hardening-wrapper,
 	libxt-dev,
 	libxtst-dev,
-	binutils-gold,
-	libavcodec-dev (>= 4:0.6),
-	libavformat-dev (>= 4:0.6),
-	libavutil-dev (>= 4:0.6)
+	binutils-gold
 Standards-Version: 3.9.0
 
 Package: chromium-browser

=== modified file 'debian/rules'
--- a/debian/rules	2011-03-08 19:40:01 +0000
+++ b/debian/rules	2011-03-09 19:39:03 +0000
@@ -7,7 +7,7 @@
 DEBIAN_DIST		:= $(shell lsb_release -ds | tr -d '()')
 DEBIAN_DIST_NAME	:= $(shell lsb_release -si)
 DEBIAN_DIST_VERSION	:= $(shell lsb_release -sr)
-USE_SYSTEM_FFMPEG	:= 1
+USE_SYSTEM_FFMPEG	:= 0
 ifeq (1,$(USE_SYSTEM_FFMPEG))
 LIBAVCODEC_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavcodec.so.* | cut -d ' ' -f 1))
 LIBAVFORMAT_BASENAME	:= $(shell basename $$(ls -x /usr/lib/libavformat.so.* | cut -d ' ' -f 1))