Bump debhelper and Debian Policy versions

 * Abandon deprecated d/menu file in favor d/dhelp.desktop
 * Sort and wrap dependencies list
 * Move list of files for installation into d/install file
 * Make www-browser dependency recommended
 * Replace perl dependency with ${perl:Depends} substitution
 * Add VCS-* fields to d/control file

7 files changed, 38 insertions, 26 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 8e444e4..9537dfe 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -47,9 +47,9 @@ cases.
 
 -- A web server that supports CGI is installed, but man2html/info2www aren't
 
-   Offline and online modes work, as well as the the online mode's links to
-   the documentation and the search web form. The links to man/info pages
-   are inactive.
+   Offline and online modes work, as well as the online mode's links to the
+   documentation and the search web form. The links to man/info pages are
+   inactive.
 
 -- A web server that supports CGI as well as man2html/info2www are installed
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+10
diff --git a/debian/control b/debian/control
index cb7b820..04fa45e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,30 @@ Source: dhelp
 Section: doc
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.23-1.1),
- ruby-gettext
+Standards-Version: 3.9.8
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 10), ruby-gettext
+VCS-Git: https://anonscm.debian.org/cgit/collab-maint/dhelp.git
+VCS-Browser: https://anonscm.debian.org/cgit/collab-maint/dhelp.git
 
 Package: dhelp
-Depends: perl, libtemplate-perl, libhtml-parser-perl,
- liburi-perl, liblocale-gettext-perl, libdata-page-perl,
- ruby | ruby-interpreter, ruby-debian, ruby-gettext,
- doc-base, swish++, pstotext, poppler-utils, ucf (>= 0.8),
- ${misc:Depends}
-Recommends: www-browser | html2text
-Suggests: httpd-cgi, info2www, man2html, catdvi
+Depends:
+ doc-base,
+ libcgi-pm-perl,
+ libdata-page-perl,
+ libhtml-parser-perl,
+ liblocale-gettext-perl,
+ libtemplate-perl,
+ liburi-perl,
+ poppler-utils,
+ pstotext,
+ ruby | ruby-interpreter,
+ ruby-debian,
+ ruby-gettext,
+ swish++,
+ ucf (>= 0.8),
+ ${misc:Depends},
+ ${perl:Depends},
+Suggests: catdvi, httpd-cgi, info2www, man2html, www-browser | html2text
 Architecture: all
 Description: online help system
  Read all documentation with a WWW browser. dhelp builds an index of
diff --git a/debian/dhelp.desktop b/debian/dhelp.desktop
new file mode 100644
index 0000000..9351513
--- /dev/null
+++ b/debian/dhelp.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.1
+Type=Application
+Name=Debian Online Help
+Exec=dhelp
+Icon=help
+Keywords=documentation;help;information;manual;
+Categories=Core;Documentation;Utility;
+StartupNotify=false
+Terminal=false
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..936f2cb
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+debian/scripts/*.sh     usr/share/dhelp/maint-scripts
+debian/dhelp.desktop    usr/share/applications
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index e8987f7..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(dhelp):needs="X11" section="Help" \
-title="Debian Online Help" command="/usr/bin/dhelp"
-
-?package(dhelp):needs="text" section="Help" \
-title="Debian Online Help" command="/usr/bin/dhelp"
-
diff --git a/debian/rules b/debian/rules
index 2be9471..af11d99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,3 @@ DEB_INSTALL_EXAMPLES_dhelp = examples/*
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
-
-# Custom install of the maintainer scripts library.
-install/dhelp::
-	install --directory $(DEB_DESTDIR)/usr/share/dhelp/maint-scripts
-	install --mode=644  debian/scripts/*.sh $(DEB_DESTDIR)/usr/share/dhelp/maint-scripts
-