[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/13.0.782.215_r97094-1-4-g6a5d082

[Jonathan Nieder]

The following commit has been merged in the experimental branch:
commit 6a5d0825043e0e1be9da7e1fbb40e563400d22ba
Merge: 5975ec0f547c1e61bee95da2988842eda4be174b b1d2f080d63783cb4ef6e3c793af2273d688f11b
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Wed Aug 24 13:43:58 2011 -0500

    Merge branch 'master' of git://git.debian.org/git/pkg-chromium/pkg-chromium into HEAD
    
    * 'master' of git://git.debian.org/git/pkg-chromium/pkg-chromium:
      Avoid file conflicts due to move of compatibility symlinks

diff --combined debian/changelog
index f222f18,f1c0181..ad2dcb4
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,12 +1,19 @@@
 +chromium-browser (14.0.835.109~r97804-1) UNRELEASED; urgency=low
 +
 +  * New beta release
 +  * Fix gbp.conf for experimental branch
 +
 + -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 24 Aug 2011 19:21:48 +0200
 +
  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

-- 
Git repository for pkg-chromium