Import Debian changes 1.0.28-1~bpo8+1

tinc (1.0.28-1~bpo8+1) jessie-backports; urgency=medium

  * Rebuild for jessie-backports.

tinc (1.0.28-1) unstable; urgency=medium

  * New upstream release.
    - Fixes FTBFS on kfreebsd.
  * Systemd service files are now provided by upstream.

debian/changelog

@@ -1,3 +1,17 @@
+tinc (1.0.28-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Aron Xu <aron@debian.org>  Mon, 18 Jul 2016 20:55:54 +0800
+
+tinc (1.0.28-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Fixes FTBFS on kfreebsd.
+  * Systemd service files are now provided by upstream.
+
+ -- Guus Sliepen <guus@debian.org>  Sun, 10 Apr 2016 15:44:28 +0200
+
 tinc (1.0.27-2) unstable; urgency=medium
 
   * Fix tinc@.service.

debian/postinst

@@ -7,10 +7,10 @@ set -e
 case "$1" in
     configure)
 	if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then
-		if [ ! -e /dev/net/tun ] ; then if [ ! -e /dev/tun ] ; then
+		if [ ! -e /dev/net/tun ] ; then if [ ! -e /dev/tun ] ; then if [ -e /dev/MAKEDEV ]; then
 			echo "Creating tun device..."
 			cd /dev && ./MAKEDEV net/tun 2>/dev/null || ./MAKEDEV tun 2>/dev/null || echo "Failed to create tun device."
-		fi; fi
+		fi; fi; fi
 	fi; fi
 
 	if [ ! -e $NETSFILE ] ; then

debian/rules

@@ -4,7 +4,7 @@
 	dh $@ --parallel --with systemd
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-uml --enable-vde
+	dh_auto_configure -- --enable-uml --enable-vde --with-systemdsystemunitdir=/lib/systemd/system
 
 override_dh_auto_install:
 	dh_auto_install -- install-html
@@ -13,7 +13,6 @@ override_dh_auto_install:
 
 override_dh_installinit:
 	dh_installinit -R
-	dh_installinit --name=tinc@ --noscripts
 
 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade

debian/tinc.service

@@ -1,16 +0,0 @@
-# This is a mostly empty service, but allows commands like stop, start, reload
-# to propagate to all tinc@ service instances.
-
-[Unit]
-Description=Tinc VPN
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/true
-ExecReload=/bin/true
-WorkingDirectory=/etc/tinc
-
-[Install]
-WantedBy=multi-user.target

debian/tinc@.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Tinc net %i
-PartOf=tinc.service
-ReloadPropagatedFrom=tinc.service
- 
-[Service]
-Type=simple
-WorkingDirectory=/etc/tinc/%i
-ExecStart=/usr/sbin/tincd -n %i -D
-ExecReload=/usr/sbin/tincd -n %i -kHUP
-ExecStop=/usr/sbin/tincd -n %i -k
-TimeoutStopSec=5
-Restart=always
-RestartSec=60
-
-[Install]
-WantedBy=tinc.service