Import release 0.1.17

diff --git a/Makefile.in b/Makefile.in
index 0461854486e7ce617f38ad96210e5a698e885226..43df9ebe433c2fdfc07fde0ef7cfaf474bbca697 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 .PHONY:        all clean realclean distclean dist install
 
 PACKAGE:=secnet
-VERSION:=0.1.16
+VERSION:=0.1.17
 
 @SET_MAKE@
 

diff --git a/NEWS b/NEWS
index 4b50c596b86b413d0eef30bf6f561323f7043e78..9f400049ec0562556798eecd905e3c439d12cb6e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,14 +3,27 @@
 Please note that the 0.1 series of secnet releases is now 'maintenance
 only'; further development continues in secnet-0.2.
 
-* Planned for version 0.1.17
-
 Debconf support - if you are using the Debian packaged version and
 your secnet configuration is autogenerated using debconf then the
 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.17
+
+autoconf updates for cross-compilation / more modern autoconf from
+Ross Younger <ross@crazyscot.com>
+
+MacOS X support from Richard Kettlewell <richard@sfere.greenend.org.uk>
+
+Makefile fix: Update bison pattern rule to indicate that both the
+.tab.c and .tab.h files are generated by the same command.
+
+i386 ip_csum implementation updated to work with modern gcc
+
+Rename global 'log' to 'slilog' to avoid conflict with gcc built-in
+log() function.
+
 * New in version 0.1.16
 
 XXX XXX PROTOCOL COMPATIBILITY IS BROKEN BETWEEN VERSION 0.1.16 AND

diff --git a/debian/changelog b/debian/changelog
index 39e6dcd131c7662cc3a4822dd237319cee2fddeb..975d829b812a91922f620758b983d2d89879322d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-secnet (0.1.16-1) unstable; urgency=high
+secnet (0.1.17-1) unstable; urgency=low
 
   * New upstream version.
 
- -- Stephen Early <steve@greenend.org.uk>  Sat,  19 Jul 2003 17:00:00 +0100
+ -- Stephen Early <steve@greenend.org.uk>  Sun,  13 Jul 2005 01:00:00 +0100

diff --git a/debian/control b/debian/control
index dc1cf408fdaaf2ca1b252522ec4d14341ec6d68b..3d88ed14841950ef2de74414f8bb7fe1d3b515ea 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Standards-Version: 3.0.1
 
 Package: secnet
 Architecture: any
-Depends: ${shlibs:Depends}, python
+Depends: ${shlibs:Depends}
+Recommends: python
 Description: VPN software for distributed networks
  secnet allows multiple private networks, each 'hidden' behind a single
  globally-routable IP address, to be bridged together.

diff --git a/debian/rules b/debian/rules
index d9d1dd51650c37f32a3d7106d562a6afce9ab017..75606ee4d1d4993da1fae47a3c41bbeb354036f5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,6 @@ binary-arch: build install
 #      dh_installcron
 #      dh_installman
 #      dh_installinfo
-       dh_undocumented
        dh_installchangelogs
        dh_link
        dh_strip