Update debian package

- html docs are no longer part of the HylaFAX package
- We now have RELEASENOTES, not just a CHANGES

diff --git a/debian/control b/debian/control
index 2b3b912428492b7da518d055099a659fb03ae489..2ba7e9c3b3bd84e15d36a7aa2844afb6e259f5d1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Architecture: any
 Section: comm
 Depends: ${shlibs:Depends}, ${misc:Depends}, libtiff-tools (>= 3.6.1-3), hylafax-client (= ${Source-Version}), mailx, psmisc, sed (>= 4.1.2), gs, sharutils, adduser, lsb-base (>= 3.0-6), metamail
 Recommends: metamail
-Suggests: hylafax-doc, mgetty
+Suggests: mgetty
 Conflicts: mgetty-fax, capi4hylafax (<< 1:01.02.03-4)
 Tag: works-with::fax, hardware::modem, interface::daemon, works-with::mail, network::server, implemented-in::c++, interface::commandline, use::transmission, role::program
 Description: Flexible client/server fax software - server daemons
@@ -36,14 +36,3 @@ Description: Flexible client/server fax software - client utilities
  .
  HylaFAX support the sending and receiving of facsimiles, the polled
  retrieval of facsimiles and the send of alphanumeric pages.
-
-Package: hylafax-doc
-Architecture: all
-Section: doc
-Suggests: www-browser, man2html, httpd-cgi
-Tag: hardware::modem, interface::commandline, made-of::data:html, role::documentation, use::transmission, works-with::fax
-Description: Flexible client/server fax software - HTML Documentation
- HTML version of HylaFAX documentation and manpages.
- .
- HylaFAX support the sending and receiving of facsimiles, the polled
- retrieval of facsimiles and the send of alphanumeric pages.

diff --git a/debian/html-patch b/debian/html-patch
deleted file mode 100644 (file)
index 85a1dc4..0000000
--- a/debian/html-patch
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-ROOT=${1-/usr/share/doc/hylafax}
-CGI=${2-/cgi-bin/man}
-PATTERN="@[a-zA-Z][a-zA-Z]*@"
-
-patch()
-{
-chmod a+w $1
-ed - $1<<EOF
-g;@CGIPATH@/manpage;s;;$CGI/man2html;g
-g;@CGIPATH@;s;;$CGI;g
-g;@HTMLPATH@;s;;$ROOT;g
-w
-q
-EOF
-chmod a-w $1
-}
-
-FILES=`grep -l "$PATTERN" *.html */*.html`
-test "$FILES" && {
-for i in $FILES
-   do
-       echo $i; patch $i;
-   done
-}

diff --git a/debian/hylafax-doc.doc-base b/debian/hylafax-doc.doc-base
deleted file mode 100644 (file)
index aa29819..0000000
--- a/debian/hylafax-doc.doc-base
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: hylafax
-Title: HylaFAX Documentation
-Author: HylaFAX
-Abstract:  HTML version of HylaFAX documentation and manpages.
- HylaFAX supports the sending and receiving of facsimiles, the polled
- retrieval of facsimiles and the send of alphanumeric pages.
-Section: Comm
-
-Format: HTML
-Index: /usr/share/doc/hylafax-doc/html/index.html
-Files: /usr/share/doc/hylafax-doc/html/*.html

diff --git a/debian/rules b/debian/rules
index e481d9bceb062c7318dae1326c368bc2fd99b59a..c7c2647f9fddbf634ddd7feb9e6160dde12b133b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ configure: configure-stamp
 configure-stamp: patch-stamp
        cp -p /usr/share/misc/config.* .
        yes | /bin/bash ./configure \
-               --with-HTML=yes \
                --with-UTMP=auto \
                --with-DIR_BIN="/usr/bin" \
                --with-DIR_LIBDATA="/etc/hylafax" \
@@ -33,9 +32,6 @@ configure-stamp: patch-stamp
                --with-DIR_LOCKS="/var/lock" \
                --with-PATH_AFM="/usr/share/fonts/type1/gsfonts" \
                --with-FONTMAP="/usr/share/gs-esp/8.15/lib:/usr/share/gs-esp/7.07/lib:/usr/share/gs/6.53" \
-               --with-DIR_HTML="/usr/share/doc/hylafax" \
-               --with-DIR_CGI="/usr/lib/cgi-bin" \
-               --with-HTMLPATH="/doc/hylafax" \
                --with-SYSGID="root" \
                --with-SYSUID="root" \
                --with-PATH_GETTY="/etc/hylafax/getty-link" \
@@ -108,11 +104,6 @@ install-doc:
        dh_clean -k -p$(p_doc)
        dh_installdirs -p$(p_doc) \
                usr/share/doc/$(p_doc)
-       cp -a html $(d_doc)/usr/share/doc/$(p_doc)/.
-       rm -rf $(d_doc)/usr/share/doc/$(p_doc)/html/{.cvs*,Makefile*,tools}
-       : # fixes some relative paths
-       cd $(d_doc)/usr/share/doc/$(p_doc)/html && \
-         sh $(PWD)/debian/html-patch /usr/share/doc/hylafax-doc /cgi-bin/man
 
 install-server:
        dh_testdir
@@ -257,7 +248,7 @@ binary-indep: build-indep install-doc
        dh_installdocs -i -A \
                debian/README.mgetty debian/README.Debian \
                TODO CONTRIBUTORS
-       dh_installchangelogs -i CHANGES
+       dh_installchangelogs -i doc/RELEASENOTES-4.4.txt
        dh_installexamples -i
        dh_compress -i
        dh_fixperms -i
@@ -270,7 +261,7 @@ binary-indep: build-indep install-doc
 binary-arch: build-arch install-server install-client
        dh_testdir
        dh_testroot
-       dh_installchangelogs -a CHANGES
+       dh_installchangelogs -a doc/RELEASENOTES-4.4.txt
        dh_installdocs -a -A \
                debian/README.mgetty debian/README.Debian \
                TODO CONTRIBUTORS