From: Stephen Early <steve@greenend.org.uk>
Date: Tue, 18 Mar 2008 18:21:25 +0000 (+0000)
Subject: Import release 0.1.18
X-Git-Tag: v0.1.18
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=ca58ee4883fc5eb309f950787d35af5deca05321

Import release 0.1.18
---

diff --git a/Makefile.in b/Makefile.in
index 43df9eb..0158a7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:	all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.17
+VERSION:=0.1.18
 
 @SET_MAKE@
 
@@ -74,8 +74,8 @@ DISTFILES:=BUGS COPYING CREDITS INSTALL LICENSE.txt Makefile.in \
 	sha1.c site.c slip.c stamp-h.in transform.c tun.c udp.c \
 	unaligned.h util.c util.h \
 	hackypar.c hackypar.h
-DISTSUBDIRS:=debian/conffiles debian/copyright debian/changelog \
-	debian/control debian/init debian/rules
+DISTSUBDIRS:=debian/copyright debian/changelog debian/control \
+	debian/init debian/rules debian/compat debian/default
 
 %.c:	%.y
 
diff --git a/NEWS b/NEWS
index 9f40004..8094c3e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,11 @@ upgrade to version 0.2.0 should just involve installing the package;
 an appropriate 0.2-style configuration file will be generated
 automatically.
 
+* New in version 0.1.18
+
+ipaddr.py now declares its character encoding; required by recent
+versions of Python
+
 * New in version 0.1.17
 
 autoconf updates for cross-compilation / more modern autoconf from
diff --git a/debian/changelog b/debian/changelog
index 975d829..d57ca03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-secnet (0.1.17-1) unstable; urgency=low
+secnet (0.1.18-1) unstable; urgency=low
 
   * New upstream version.
 
- -- Stephen Early <steve@greenend.org.uk>  Sun,  13 Jul 2005 01:00:00 +0100
+ -- Stephen Early <steve@greenend.org.uk>  Tue,  18 Mar 2008 17:45:00 +0000
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index 941529d..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/init.d/secnet
diff --git a/debian/control b/debian/control
index 3d88ed1..8893cdc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.0.1
 
 Package: secnet
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends} ${misc:Depends}
 Recommends: python
 Description: VPN software for distributed networks
  secnet allows multiple private networks, each 'hidden' behind a single
diff --git a/debian/default b/debian/default
new file mode 100644
index 0000000..63f2c5b
--- /dev/null
+++ b/debian/default
@@ -0,0 +1 @@
+RUN_SECNET=no
diff --git a/debian/init b/debian/init
index 75c21af..18c273a 100644
--- a/debian/init
+++ b/debian/init
@@ -20,8 +20,9 @@ DESC="VPN server"
 
 test -f $DAEMON || exit 0
 test -f /etc/secnet/secnet.conf || exit 0
+test -f /etc/default/secnet && . /etc/default/secnet
 
-set -e
+[ "X$RUN_SECNET" = "Xyes" ] || exit 0
 
 case "$1" in
   start)
diff --git a/debian/rules b/debian/rules
index 75606ee..3bf636b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=2
-
 build: build-stamp
 build-stamp:
 	dh_testdir