[Surfraw-commits] [SCM] surfraw - a fast unix command line interface to WWW branch, master, updated. surfraw_2-2-5_1-156-gdf84247

[Ian Beckwith]

The following commit has been merged in the master branch:
commit cdc0304d00d431f11f88145eda006e20307537d2
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Thu Jan 13 18:38:12 2011 +0000

    debian/control: surfraw-extra: convert Conflicts: to Breaks:

diff --git a/debian/changelog b/debian/changelog
index 111e0ee..d928053 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ surfraw (2.2.8-1) unstable; urgency=low
   * debian/control:
     + Build-Depends: bump debhelper dependency to (>= 7).
     + Standards-Version: 3.9.1.
+    + surfraw-extra: convert Conflicts: to Breaks:.
 
- -- Ian Beckwith <ianb at debian.org>  Thu, 13 Jan 2011 18:30:09 +0000
+ -- Ian Beckwith <ianb at debian.org>  Thu, 13 Jan 2011 18:37:51 +0000
 
 surfraw (2.2.7-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e5bd979..da5d5a6 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Architecture: all
 Depends: surfraw, ${misc:Depends}, lynx | www-browser, libwww-opensearch-perl, libwww-perl, libhtml-parser-perl
 Recommends: links | elinks | elinks-lite | w3m | w3m-ssl | lynx-cur
 Suggests: screen
-Conflicts: surfraw (<< 2.1.7)
+Breaks: surfraw (<< 2.1.7)
 Description: extra surfraw search tools with heavy dependencies
  surfraw-extra contains extra website search tools for surfraw that
  have large dependency trees. Currently surfraw-extra only contains:

-- 
surfraw -  a fast unix command line interface to WWW