- Synchronized changelog with the package's changelog.

- Changed maintainer email address.
- New file doc-base.tinc.
- Better Build-Depends and Depends lines.

diff --git a/debian/changelog b/debian/changelog
index 629e552..6db75e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
 tinc (1.0pre3-0.1) unstable; urgency=low
 
-  * New upstream version (1.0pre3)
-  * Better Depends and Build-Depends lines, including all available
-    versions of GMP.
+  * New upstream version (1.0pre3) (Closes: #71274).
+  * Better Depends and Build-Depends lines.
+  * Dropped dependencies on libgmp, added libssl.
+  * doc-base.tinc: New file.
+  * Deleted the file shlibs, as there on longer is a libblowfish.
 
- -- Ivo Timmermans <itimmermans@bigfoot.com>  Wed, 20 Sep 2000 20:26:35 +0200
+ -- Ivo Timmermans <ivo@debian.org>  Thu,  2 Nov 2000 16:53:52 +0100
+
+tinc (1.0pre2-1.1) unstable; urgency=low
+
+  * NMU at Ivo's request as his application is being processed, and his
+    sponsor is based in the US.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Wed, 28 Jun 2000 21:52:30 +0200
 
 tinc (1.0pre2-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index ea9c9ca..21b624c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: tinc
 Section: non-US/main
 Priority: optional
-Maintainer: Ivo Timmermans <itimmermans@bigfoot.com>
+Maintainer: Ivo Timmermans <ivo@debian.org>
 Standards-Version: 3.0.1
-Build-Depends: libc6-dev, libssl095a-dev, autoconf (>= 2.12), automake,
+Build-Depends: libc6-dev, libssl095a-dev, autoconf (>= 2.12),
+ automake, debhelper
 
 Package: tinc
 Architecture: i386
-Depends: ${shlibs:Depends}, (libssl095a|libssl09), perl5
+Depends: ${shlibs:Depends}, (libssl095a|libssl095|libssl09), perl5
 Description: Virtual Private Network daemon
  tinc is a daemon with which you can create a virtual private network
  (VPN).  One daemon can handle multiple connections, so you can

diff --git a/debian/doc-base.tinc b/debian/doc-base.tinc
new file mode 100644 (file)
index 0000000..6f28d1f
--- /dev/null
+++ b/debian/doc-base.tinc
@@ -0,0 +1,10 @@
+Document: tinc
+Title: tinc Manual
+Author: Ivo Timmermans, Guus Sliepen
+Abstract: This manual describes how to set up a Virtual Private
+ Network with tinc.
+Section: net
+
+Format: HTML
+Files: /usr/share/doc/tinc/tinc*.html
+Index: /usr/share/doc/tinc/tinc_toc.html