From 0dd8a426079dbc17b22e55132d57d06f0380a932 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 4 Feb 2010 00:56:45 +0100 Subject: [PATCH] Import Debian changes 1.0.12-1 tinc (1.0.12-1) unstable; urgency=low * New upstream release. * Bump Standards-Version. * Migrate from CDBS to debhelper. * Convert source package to 3.0 (quilt) format. * Remove useless tinc.modules. * Use init.d script from Michael Tokarev, allowing per-network arguments to tincd. * Remove update-rc.d calls from postinst and postrm. * Let the init.d script depend on $remote_fs. --- debian/changelog | 16 +++++++--------- debian/control | 4 ++-- debian/postinst | 10 ---------- debian/postrm | 1 - debian/rules | 39 ++++++++++++++++++++++++--------------- debian/source/format | 1 + debian/tinc.modules | 12 ------------ 7 files changed, 34 insertions(+), 49 deletions(-) create mode 100644 debian/source/format delete mode 100644 debian/tinc.modules diff --git a/debian/changelog b/debian/changelog index b46ee18..7213ede 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,16 @@ -tinc (1.0.12-1~bpo50) lenny-backports; urgency=low +tinc (1.0.12-1) unstable; urgency=low * New upstream release. - * Keep debian/ from 1.0.11-1~bpo50. + * Bump Standards-Version. + * Migrate from CDBS to debhelper. + * Convert source package to 3.0 (quilt) format. + * Remove useless tinc.modules. * Use init.d script from Michael Tokarev, allowing per-network arguments to tincd. + * Remove update-rc.d calls from postinst and postrm. * Let the init.d script depend on $remote_fs. - -- Guus Sliepen Wed, 17 Feb 2010 22:00:31 +0000 - -tinc (1.0.11-1~bpo50+1) lenny-backports; urgency=low - - * Rebuild for lenny-backports. - - -- Guus Sliepen Thu, 04 Feb 2010 19:03:00 +0000 + -- Guus Sliepen Thu, 04 Feb 2010 00:56:45 +0100 tinc (1.0.11-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 73c20bc..9516383 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: tinc Section: net Priority: optional Maintainer: Guus Sliepen -Standards-Version: 3.8.3 -Build-Depends: libssl-dev, debhelper (>= 7), gettext, texi2html, texinfo, zlib1g-dev, cdbs, liblzo2-dev +Standards-Version: 3.8.4 +Build-Depends: libssl-dev, debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev Homepage: http://www.tinc-vpn.org/ Package: tinc diff --git a/debian/postinst b/debian/postinst index 5233dae..f17dc57 100644 --- a/debian/postinst +++ b/debian/postinst @@ -28,10 +28,7 @@ set -e # installation fails and the `postinst' is called with `abort-upgrade', # `abort-remove' or `abort-deconfigure'. -# Automatically added by dh_installinit, edited for use with debconf if [ -x "/etc/init.d/tinc" ]; then - update-rc.d tinc defaults >/dev/null - if [ "$1" = "configure" ] ; then if dpkg --compare-versions "$2" lt "1.0pre5-4" ; then RET="true" @@ -46,8 +43,6 @@ if [ -x "/etc/init.d/tinc" ]; then fi fi fi -# End automatically added section - case "$1" in configure) @@ -80,11 +75,6 @@ case "$1" in ;; esac -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# exit 0 - - diff --git a/debian/postrm b/debian/postrm index e4fbf15..43644af 100644 --- a/debian/postrm +++ b/debian/postrm @@ -3,7 +3,6 @@ set -e # Automatically added by package maintainer if [ "$1" = purge ]; then rm -f /etc/tinc/nets.boot - update-rc.d tinc remove >/dev/null 2>/dev/null fi # End automatically added section diff --git a/debian/rules b/debian/rules index 7272f93..a27b6cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,21 +1,30 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/autotools.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 -# A bit of a kludge, we have our own init.d handling in postinst, but -# cdbs calls dh_installinit anyway. -DEB_DH_INSTALLINIT_ARGS = -n +%: + dh $@ -clean:: - rm -rf src/device.c doc/tinc -build/tinc:: - cd doc && $(MAKE) texi2html -binary-post-install/tinc:: +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 -v doc/tinc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ \ - || mv -v doc/*.html debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ - rm -f debian/$(cdbs_curpkg)/usr/share/info/dir* - cd debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/ && tar xzf ../../../../../../doc/sample-config.tar.gz && mv sample-config examples && rm -rf examples/CVS examples/hosts/CVS + && mv doc/tinc/*.html debian/tinc/usr/share/doc/tinc/ \ + || mv doc/*.html debian/tinc/usr/share/doc/tinc/ + # Remove info dir file + rm -f debian/tinc/usr/share/info/dir + +override_dh_clean: + dh_clean + rm -f src/device.c diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tinc.modules b/debian/tinc.modules deleted file mode 100644 index edd98bb..0000000 --- a/debian/tinc.modules +++ /dev/null @@ -1,12 +0,0 @@ -alias char-major-36 netlink_dev -alias char-major-10-200 tun - -alias tap0 ethertap -alias tap1 ethertap -alias tap2 ethertap -alias tap3 ethertap - -options tap0 -o tap0 -x unit=0 -options tap1 -o tap1 -x unit=1 -options tap2 -o tap2 -x unit=2 -options tap3 -o tap3 -x unit=3