[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 673 chromium-browser-inspector: added a conflict with

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 673
Revision Id: iuculano at debian.org-20100901133833-q4c9s5bd1hermod6
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : chromium-browser-inspector: added a conflict with
chromium-browser (<< ${source:Version}) (Closes: #594909)


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

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-09-01 13:36:34 +0000
+++ b/debian/changelog	2010-09-01 13:38:33 +0000
@@ -3,8 +3,10 @@
   * New upstream release
   * Merge the unstable branch
   * Backport arm ffmpeg fix from unstable (v5)
+  * chromium-browser-inspector: added a conflict with
+    chromium-browser (<< ${source:Version}) (Closes: #594909)
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 01 Sep 2010 15:24:17 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 01 Sep 2010 15:37:02 +0200
 
 chromium-browser (6.0.472.36~r55963-1) experimental; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2010-09-01 09:06:26 +0000
+++ b/debian/control	2010-09-01 13:38:33 +0000
@@ -113,6 +113,7 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: chromium-browser
+Conflicts: chromium-browser (<< ${source:Version})
 Description: page inspector for the 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.