Get the head revision up to date with cabal

diff --git a/THANKS b/THANKS
index 9f8f47f..6116810 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -13,6 +13,7 @@ I would like to thank
  * Robert van der Meulen (early configuration code)
  * Cris van Pelt (small fixes)
  * Enrique Zanardi (for the Spanish translation)
  * Robert van der Meulen (early configuration code)
  * Cris van Pelt (small fixes)
  * Enrique Zanardi (for the Spanish translation)

+ * Matias Carrasco (for the Spanish translation of the manual)

 
 for their help, support and ideas.  Thank you guys!
 
 
 for their help, support and ideas.  Thank you guys!
 

diff --git a/configure.in b/configure.in
index 93a6f74..4adbb62 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Process this file with autoconf to produce a configure script.
 

-dnl $Id: configure.in,v 1.13.2.10 2000/10/16 11:35:10 zarq Exp $
+dnl $Id: configure.in,v 1.13.2.11 2000/10/18 19:44:11 zarq Exp $

 
 AC_INIT(src/tincd.c)
 
 AC_INIT(src/tincd.c)

-AM_INIT_AUTOMAKE(tinc, 1.0pre3)
+AM_INIT_AUTOMAKE(tinc, echelon)

 AM_CONFIG_HEADER(config.h)
 
 dnl Include the macros from the m4/ directory
 AM_CONFIG_HEADER(config.h)
 
 dnl Include the macros from the m4/ directory

diff --git a/debian/changelog b/debian/changelog
index f89acae..6c570df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-tinc (1.0pre3-1) unstable; urgency=low
+tinc (1.0pre3-0.1) unstable; urgency=low

 
 

-  * 
+  * upgraded to upstream version 1.0pre3

 
  -- Ivo Timmermans <itimmermans@bigfoot.com>  Sun, 25 Jun 2000 00:00:00 +0200
 
 
  -- Ivo Timmermans <itimmermans@bigfoot.com>  Sun, 25 Jun 2000 00:00:00 +0200
 

diff --git a/debian/control b/debian/control
index c08c622..ea9c9ca 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,5 +14,6 @@ Description: Virtual Private Network daemon
  create an entire (moderately sized) VPN with only one daemon per
  participating computer.
  .
  create an entire (moderately sized) VPN with only one daemon per
  participating computer.
  .

- You need to have two kernel modules installed, the manual will
+ You need to have two kernel modules installed, on a Debian system
+ they should already be there; if they are not, the manual will

  explain you how to do that.
  explain you how to do that.