[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/13.0.782.215_r97094-1-2-gb1d2f08

[Jonathan Nieder]

The following commit has been merged in the master branch:
commit b1d2f080d63783cb4ef6e3c793af2273d688f11b
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Wed Aug 24 13:37:48 2011 -0500

    Avoid file conflicts due to move of compatibility symlinks
    
    After debian/13.0.782.215_r97094-1~4, unpacking chromium-browser
    without upgrading chromium first fails with
    
     Unpacking replacement chromium-browser ...
     dpkg: error processing /var/cache/apt/archives/chromium-browser_13.0.782.215~r97094-1_all.deb (--install):
      trying to overwrite '/usr/bin/chromium-browser', which is also in package chromium 13.0.782.107~r94237-1
    
    Declare a breaks+replaces to avoid that, as described in policy
    §7.6.1 ("Overwriting files in other packages").

diff --git a/debian/changelog b/debian/changelog
index 30156da..f1c0181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 chromium-browser (13.0.782.215~r97094-2) UNRELEASED; urgency=low
 
+  [ Giuseppe Iuculano ]
   * Fixed the dummy chromium-browser-l10n dependency (Closes: 639126)
 
+  [ Jonathan Nieder ]
+  * Add a replace and breaks entry to reflect the compatibility symlinks
+    having moved to the chromium-browser package.
+
  -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 24 Aug 2011 14:23:49 +0200
 
 chromium-browser (13.0.782.215~r97094-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 86c5d32..737c3d5 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,8 @@ Standards-Version: 3.9.2
 Package: chromium-browser
 Architecture: all
 Depends: chromium (>= 10), ${misc:Depends}
+Breaks: chromium (<< 13.0.782.215~r97094-1)
+Replaces: chromium (<< 13.0.782.215~r97094-1)
 Section: oldlibs
 Description: Chromium browser - transitional dummy package
  Chromium is an open-source browser project that aims to build a safer, faster,

-- 
Git repository for pkg-chromium