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

[Ian Beckwith]

The following commit has been merged in the master branch:
commit 22e7041903a2e7646c80ddcdf4c1d0e90fa46519
Author: Ian Beckwith <ianb at erislabs.net>
Date:   Thu Mar 3 04:43:59 2011 +0000

    debian: move /usr/lib/surfraw/opensearch from surfraw-extra to surfraw, adjust deps/breaks

diff --git a/debian/changelog b/debian/changelog
index 3c08b02..e9a47b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 surfraw (2.2.8-1) unstable; urgency=low
 
   * New upstream version.
+  * Move opensearch elvi to main surfraw package.
+    It now has an optional mode that uses a redirector
+    if the dependencies are not installed.
   * debian/rules:
     + hardcode AWK as awk (Closes: #608967).
     + use dh_prep instead of dh_clean -k.
@@ -8,9 +11,13 @@ surfraw (2.2.8-1) unstable; urgency=low
     + Build-Depends: bump debhelper dependency to (>= 7).
     + Standards-Version: 3.9.1.
     + surfraw-extra: convert Conflicts: to Breaks:.
+    + surfraw:
+      * Breaks: surfraw-extra (<= 2.2.7-1)
+        as we have taken over /usr/lib/surfraw/opensearch.
+      * Recommends: surfraw-extra: add version of (>> 2.2.7-1).
   * debian/source/format: explicitly specify 1.0 source format.
 
- -- Ian Beckwith <ianb at debian.org>  Thu, 13 Jan 2011 18:39:23 +0000
+ -- Ian Beckwith <ianb at debian.org>  Thu, 03 Mar 2011 02:24:44 +0000
 
 surfraw (2.2.7-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index da5d5a6..6f8f889 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Homepage: http://surfraw.alioth.debian.org
 Package: surfraw
 Architecture: all
 Depends: ${misc:Depends}, lynx | www-browser
-Recommends: surfraw-extra, links | elinks | elinks-lite | w3m, curl | wget | libwww-perl
+Recommends: surfraw-extra (>> 2.2.7-1), links | elinks | elinks-lite | w3m, curl | wget | libwww-perl
+Breaks: surfraw-extra (<= 2.2.7-1)
 Suggests: screen
 Description: a fast unix command line interface to WWW
  Surfraw - Shell Users' Revolutionary Front Rage Against the World Wide Web
@@ -40,9 +41,11 @@ Suggests: screen
 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:
+ have large dependency trees. Currently surfraw-extra only contains
+ support tools for the opensearch elvi:
  .
- opensearch -- Search an OpenSearch-enabled website
+ opensearch-discover - find an opensearch link from a URL.
+ opensearch-genquery - construct a search URL from an opensearch description
  .
  Surfraw - Shell Users' Revolutionary Front Rage Against the World Wide Web
  .
diff --git a/debian/rules b/debian/rules
index a67d054..2ff6ee6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,17 +82,3 @@ binary-indep: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/debian/surfraw-extra.files b/debian/surfraw-extra.files
index 81089d8..2aa21e1 100644
--- a/debian/surfraw-extra.files
+++ b/debian/surfraw-extra.files
@@ -1,4 +1,3 @@
 /usr/bin/opensearch*
-/usr/lib/surfraw/opensearch
-/usr/share/man/man1/opensearch*
+/usr/share/man/man1/opensearch-*
 

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