[Pkg-mozext-commits] [SCM] dom-inspector Debian extension branch, master, updated. upstream/2.0.11-14-g9f870d2

[Fabrizio Regalli]

The following commit has been merged in the master branch:
commit 9f870d2435dee63236773bcdc5118e05d752c151
Author: Fabrizio Regalli <fabreg at fabreg.it>
Date:   Thu Apr 12 21:37:39 2012 +0200

    Used Breaks instead of Conflicts in d/control

diff --git a/debian/changelog b/debian/changelog
index 32dcf13..f4bac3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,11 +7,12 @@ mozilla-dom-inspector (1:2.0.11-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.3
   * Added Homepage: field in d/control
   * Added Vcs-* fields in d/control
-  * Removed no more needed xul-ext-dom-inspector.dirs  xul-ext-dom-inspector.links
-    files
+  * Removed no more needed xul-ext-dom-inspector.dirs
+    xul-ext-dom-inspector.links files
   * Switch to dpkg-source 3.0 (quilt) format
   * Moved to standard d/rules using mozilla-devscripts
   * Added ${xpi:Depends,Provides,Replaces} to d/control
+  * Used Breaks instead of Conflicts in d/control
 
  -- Fabrizio Regalli <fabreg at fabreg.it>  Thu, 12 Apr 2012 21:02:38 +0200
 
diff --git a/debian/control b/debian/control
index 2d11c9e..b5cae0e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 Depends: iceweasel (>= 3.0) | iceape-browser (>= 2.0), ${misc:Depends}, ${xpi:Depends}
 Provides: iceweasel-dom-inspector, iceape-dom-inspector, ${xpi:Provides}
 Replaces: iceweasel-dom-inspector, iceape-dom-inspector, ${xpi:Replaces}
-Conflicts: iceweasel-dom-inspector (<< 1:2.0.4), iceape-dom-inspector (<< 1:2.0.4)
+Breaks: iceweasel-dom-inspector (<< 1:2.0.4), iceape-dom-inspector (<< 1:2.0.4)
 Description: tool for inspecting the DOM of pages in Iceweasel and Iceape
  This is a tool that allows you to inspect the DOM for web pages in
  Iceweasel and Iceape.  This is of great use to people who are doing Mozilla

-- 
dom-inspector Debian extension