Import Debian changes 1.1~pre8-1

tinc (1.1~pre8-1) experimental; urgency=low

  * New upstream release.
    - Handles whitespace between command line flags and optional arguments.
      Closes: #710267
  * Bump Standards-Version.
  * Source /lib/lsb/init-functions in the init.d script.
  * Don't use texi2html anymore, use automake's install-html target which uses
    makeinfo.

debian/changelog

@@ -1,3 +1,15 @@
+tinc (1.1~pre8-1) experimental; urgency=low
+
+  * New upstream release.
+    - Handles whitespace between command line flags and optional arguments.
+      Closes: #710267
+  * Bump Standards-Version.
+  * Source /lib/lsb/init-functions in the init.d script.
+  * Don't use texi2html anymore, use automake's install-html target which uses
+    makeinfo.
+
+ -- Guus Sliepen <guus@debian.org>  Wed, 14 Aug 2013 15:34:41 +0200
+
 tinc (1.1~pre7-2) experimental; urgency=low
 
   [ Gian Piero Carrubba ]

debian/control

@@ -2,8 +2,8 @@ Source: tinc
 Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
-Standards-Version: 3.9.3
-Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 9), texi2html, texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev
+Standards-Version: 3.9.4
+Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 9), texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev
 Homepage: http://www.tinc-vpn.org/
 
 Package: tinc

debian/doc-base.tinc

@@ -6,5 +6,5 @@ Abstract: This manual describes how to set up a Virtual Private
 Section: System/Security
 
 Format: HTML
-Files: /usr/share/doc/tinc/tinc*.html
-Index: /usr/share/doc/tinc/tinc_toc.html
+Files: /usr/share/doc/tinc/tinc.html/*
+Index: /usr/share/doc/tinc/tinc.html/index.html

debian/rules

@@ -17,23 +17,10 @@
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-uml --enable-vde
 
-override_dh_auto_build:
-	dh_auto_build
-	cd doc && $(MAKE) texi2html 
-
 override_dh_auto_install:
-	dh_auto_install
-	# Guess where texi2html installed its output today...
-	[ -f doc/tinc/tinc.html ] \
-		&& mv doc/tinc/*.html debian/tinc/usr/share/doc/tinc/ \
-		|| mv doc/*.html debian/tinc/usr/share/doc/tinc/
+	dh_auto_install -- install-html
 	# Remove info dir file
 	rm -f debian/tinc/usr/share/info/dir
 
 override_dh_installinit:
 	dh_installinit -R
-
-override_dh_clean:
-	dh_clean
-	rm -f src/device.c
-	rm -f src/rsa.[ch] src/rsagen.[ch] src/prf.[ch] src/ecdh.[ch] src/ecdsa.[ch] src/ecdsagen.[ch] src/digest.[ch] src/crypto.[ch] src/cipher.[ch]

debian/tinc.init

@@ -18,6 +18,8 @@
 #
 # Based on Lubomir Bulej's Redhat init script.
 
+. /lib/lsb/init-functions
+
 DAEMON="/usr/sbin/tincd"
 CONTROL="/usr/sbin/tinc"
 NAME="tinc"

debian/tinc.install

@@ -1,5 +1,6 @@
 usr/sbin/tincd
 usr/sbin/tinc
+usr/share/doc/tinc/tinc.html
 usr/share/man/man5
 usr/share/man/man8/tincd.*
 usr/share/man/man8/tinc.*