X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/a542396b43f4217f5b76bf884ca1b9080dbd5cfa..9155ea97b695b6eb5fca1ee79f57b334f6c4ef53:/debian/control?ds=sidebyside

diff --git a/debian/control b/debian/control
index 5300dfd..8263a66 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,34 @@
-Source: fw
+Source: fwd
 Section: net
 Priority: extra
 Build-Depends: mlib-dev (>= 2.0.3), debhelper (>= 4.0.2)
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
 Standards-Version: 3.1.1
 
-Package: fw
+Package: fwd
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Excessive port forwarder
- fw can forward connections to and from: TCP sockets, Unix-domain sockets,
+ fwd can forward connections to and from: TCP sockets, Unix-domain sockets,
  locally-executed programs, and file descriptors.  It can do host-based
  access control.  It will log incoming TCP connections by hostname and
  username (as reported by identd on the connecting host).  It subsumes the
  basic functionality of inetd, cat, netcat and others.  It runs as a
  single nonblocking process.
+
+Package: fw
+Architecture: all
+Depends: fwd
+Conflicts: funnelweb
+Description: Excessive port forwarder
+ fwd can forward connections to and from: TCP sockets, Unix-domain sockets,
+ locally-executed programs, and file descriptors.  It can do host-based
+ access control.  It will log incoming TCP connections by hostname and
+ username (as reported by identd on the connecting host).  It subsumes the
+ basic functionality of inetd, cat, netcat and others.  It runs as a single
+ nonblocking process.
+ .
+ Once upon a time, fwd was called fw; but this conflicts with funnelweb's use
+ of the same name.  This package depends on the new, renamed real package and
+ provides compatibility scripts and symlinks.  Once you've fixed references
+ to the old name, you can delete this package.