diff --git a/debian/changelog b/debian/changelog index 3e20884..a98443c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +tinc (1.0.35-2) unstable; urgency=medium + + * Bump Standards-Version and Build-Depend on debhelper-compat (= 12). + * Remove calls to dh_installinit and dh_systemd_start from debian/rules, + compat level 12 does the right thing by default. + * Ensure we clean up doc/tinc.info. + + -- Guus Sliepen Mon, 28 Jan 2019 21:54:45 +0100 + tinc (1.0.35-1) unstable; urgency=medium * New upstream release. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 839702d..3efe26a 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,14 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Standards-Version: 4.1.3 -Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev +Standards-Version: 4.3.0 +Build-Depends: libssl-dev, debhelper-compat (= 12), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev Homepage: http://www.tinc-vpn.org/ Rules-Requires-Root: no Package: tinc Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6) Description: Virtual Private Network daemon tinc is a daemon with which you can create a virtual private network diff --git a/debian/rules b/debian/rules index 814050a..43828fa 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,10 @@ %: dh $@ +override_dh_clean: + dh_clean + rm -f doc/tinc.info + override_dh_auto_configure: dh_auto_configure -- --enable-uml --enable-vde --with-systemd=/lib/systemd/system --runstatedir=/run @@ -10,9 +14,3 @@ override_dh_auto_install: 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_systemd_start: - dh_systemd_start --restart-after-upgrade