Retire varnish-doc packages.

Simplify to get fewer packages to lug around.

RPM side is untested.

debian/control

@@ -25,8 +25,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  gcc,
  libc6-dev | libc6.1-dev | libc-dev,
  libvarnishapi1 (= ${binary:Version})
-Suggests: varnish-doc
-Provides: varnish, ${Varnish:ABI}, ${Varnish:strictABI}
+Provides: varnish, varnish-doc, ${Varnish:ABI}, ${Varnish:strictABI}
 Description: state of the art, high-performance web accelerator
  Varnish Cache is a state of the art web accelerator written with
  performance and flexibility in mind.
@@ -44,13 +43,6 @@ Description: state of the art, high-performance web accelerator
   * URL rewriting
   * Graceful handling of "dead" backends
 
-Package: varnish-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, libjs-jquery, libjs-underscore
-Description: documentation for Varnish Cache
- This package contains HTML documentation for Varnish Cache.
-
 Package: libvarnishapi1
 Section: libs
 Architecture: any

debian/varnish-doc.doc-base

-Document: varnish-doc
-Title: Varnish Cache documentation
-Author: Anders Berg, Bjørn Ruberg, Kristian Lyngstøl, Martin Blix
- Grydeland, Per Andreas Buer, Poul-Henning Kamp, Tollef Fog Heen
-Abstract: The Varnish Cache documentation contains extensive
- information about the Varnish Cache software and project. It
- contains, among other things, a tutorial, information about
- installation, usage and troubleshooting, a section on the Varnish
- Command Language, and a large section of rants from the lead
- programmer and architect.
-Section: Web Development
-
-Format: HTML
-Index: /usr/share/doc/varnish-doc/html/index.html
-Files: /usr/share/doc/varnish-doc/html/*.html
-       /usr/share/doc/varnish-doc/html/*/*.html

debian/varnish-doc.doc-base.changes

-Document: varnish-changes
-Title: Varnish Cache changes
-Author: Tollef Fog Heen
-Abstract: This document lists significant changes in the Varnish
- Cache.
-Section: Web Development
-
-Format: HTML
-Index: /usr/share/doc/varnish-doc/changes.html
-Files: /usr/share/doc/varnish-doc/changes.css

debian/varnish-doc.docs

-doc/html
-doc/*.html

debian/varnish.docs

 doc/changes.rst
+# previously in varnish-doc
+doc/html
+doc/*.html

redhat/varnish.spec

@@ -90,13 +90,6 @@ Requires: python
 Development files for %{name}-libs
 Varnish Cache is a high-performance HTTP accelerator
 
-%package docs
-Summary: Documentation files for %name
-Group: System Environment/Libraries
-
-%description docs
-Documentation files for %name
-
 
 %prep
 %setup -n varnish-%{version}%{?vd_rc}
@@ -213,6 +206,8 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3*
 %{_mandir}/man7/*.7*
 %{_docdir}/varnish/
+%doc doc/html
+%doc doc/changes*.html
 %dir %{_sysconfdir}/varnish/
 %config(noreplace) %{_sysconfdir}/varnish/default.vcl
 %config(noreplace) %{_sysconfdir}/logrotate.d/varnish
@@ -247,15 +242,8 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/varnishapi.pc
 /usr/share/varnish
 /usr/share/aclocal
-
 %doc LICENSE
 
-%files docs
-%defattr(-,root,root,-)
-%doc LICENSE
-%doc doc/html
-%doc doc/changes*.html
-
 %pre
 getent group varnish    >/dev/null || groupadd -r varnish
 getent passwd varnishlog >/dev/null || \