Make lintian happier

  * rules, control: Switch to makeinfo.
  * Refresh lintian overrides.

6 files changed, 8 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 4ab94c31..457ea916 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,9 @@ hurd (20130916-1) unstable; urgency=low
     sutils-multiple-none.patch, umount.patch}: Remove, merged upstream.
     - patches/{exec_filename_exec.patch, exec_filename_fs.patch,
     mount-test-opts.patch, proxy-defpager.diff}: Refresh.
-  * debian/rc.patch: point /run/mtab to /proc/mounts.
+  * patches/rc.patch: point /run/mtab to /proc/mounts.
+  * rules, control: Switch to makeinfo.
+  * Refresh lintian overrides.
 
   [ Justus Winter ]
   * hurd.hurd-console.init: Add an initscript for hurd-console.
diff --git a/debian/control b/debian/control
index 4ddb702e..7beea8f9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: required
 Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
 Standards-Version: 3.9.4
 Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526),
- libc0.3-dev (>= 2.13-38~), texinfo, texi2html, libncursesw5-dev,
+ libc0.3-dev (>= 2.13-38~), texinfo, texinfo, libncursesw5-dev,
  debhelper (>= 7.0.50~), gcc-4.7, dpkg (>= 1.15.4) | install-info, autoconf, dh-autoreconf,
  libparted-dev, libpciaccess-dev, libx11-dev, x11proto-core-dev, pkg-config,
  xkb-data, gawk, flex, bison, autotools-dev, libdaemon-dev
diff --git a/debian/hurd-dev.lintian-overrides b/debian/hurd-dev.lintian-overrides
index cde03032..1d40f324 100644
--- a/debian/hurd-dev.lintian-overrides
+++ b/debian/hurd-dev.lintian-overrides
@@ -13,3 +13,4 @@ unstripped-binary-or-object lib/*/libstore_part.a
 unstripped-binary-or-object lib/*/libstore_remap.a
 unstripped-binary-or-object lib/*/libstore_task.a
 unstripped-binary-or-object lib/*/libstore_zero.a
+unstripped-binary-or-object usr/lib/*/libdde_linux26.o.a
diff --git a/debian/hurd-doc.docs b/debian/hurd-doc.docs
index 5d7f66d2..beba2b2e 100644
--- a/debian/hurd-doc.docs
+++ b/debian/hurd-doc.docs
@@ -1,2 +1,2 @@
-build/doc/hurd*html
+build/doc/hurd
 doc/navigating
diff --git a/debian/hurd.lintian-overrides b/debian/hurd.lintian-overrides
index 9b19749e..d30a2226 100644
--- a/debian/hurd.lintian-overrides
+++ b/debian/hurd.lintian-overrides
@@ -3,5 +3,5 @@ setuid-binary bin/ids 4755 root/root
 setuid-binary bin/login 4755 root/root
 setuid-binary bin/ps-hurd 4755 root/root
 setuid-binary usr/bin/w-hurd 4755 root/root
-possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:75
+possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:81
 package-contains-empty-directory servers/socket/
diff --git a/debian/rules b/debian/rules
index 273e139b..a1aa0674 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build -Bbuild
-	cd build/doc && texi2html -split chapter ../../doc/hurd.texi
+	cd build/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi
 	$(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build
 
 override_dh_auto_clean: