[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 622 Add a replace and conflict entry for chromium-codecs-ffmpeg and

[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: 622
Revision Id: iuculano at debian.org-20100626071223-zc0x611mtg3y5kcx
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Add a replace and conflict entry for chromium-codecs-ffmpeg and
chromium-codecs-ffmpeg-extra. This is necessary for people who used or
are using the unofficial PPA build.


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

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-06-26 07:08:07 +0000
+++ b/debian/changelog	2010-06-26 07:12:23 +0000
@@ -5,8 +5,11 @@
   * Build and use the custom ffmpeg copy, when ffmpeg 0.6 will be uploaded in
     unstable chromium will use the system copy of ffmpeg. (Closes: #581507) 
   * Install libffmpegsumo
+  * Add a replace and conflict entry for chromium-codecs-ffmpeg and
+    chromium-codecs-ffmpeg-extra. This is necessary for people who used or
+    are using the unofficial PPA build.
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 26 Jun 2010 09:07:54 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 26 Jun 2010 09:10:29 +0200
 
 chromium-browser (5.0.375.86~r49890-1) unstable; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2010-06-25 19:40:28 +0000
+++ b/debian/control	2010-06-26 07:12:23 +0000
@@ -64,8 +64,8 @@
 	chromium-browser-inspector
 Suggests: chromium-browser-l10n
 Provides: www-browser, chromium-testsuite
-Replaces: chromium-testsuite
-Conflicts: chromium-testsuite
+Replaces: chromium-testsuite, chromium-codecs-ffmpeg, chromium-codecs-ffmpeg-extra
+Conflicts: chromium-testsuite, chromium-codecs-ffmpeg, chromium-codecs-ffmpeg-extra
 Description: Chromium 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.