From a320e3007ae90a67742bcb4eafda9ef8e539f04b Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 29 Jun 2013 15:00:04 +0100 Subject: [PATCH] debian: Abandon ancient `fw' package; replace CDBS with Debhelper. --- Makefile.am | 5 +---- debian/compat | 1 + debian/control | 19 +------------------ debian/fw.README.Debian | 17 ----------------- debian/fw.sh | 8 -------- debian/rules | 30 +----------------------------- 6 files changed, 4 insertions(+), 76 deletions(-) create mode 100644 debian/compat delete mode 100644 debian/fw.README.Debian delete mode 100644 debian/fw.sh diff --git a/Makefile.am b/Makefile.am index dfc03ad..055a217 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,6 +119,7 @@ dist-hook: ## Main Debian files. EXTRA_DIST += debian/rules EXTRA_DIST += debian/changelog +EXTRA_DIST += debian/compat EXTRA_DIST += debian/control EXTRA_DIST += debian/copyright @@ -126,8 +127,4 @@ EXTRA_DIST += debian/copyright EXTRA_DIST += debian/fwd.init EXTRA_DIST += debian/fwd.postinst -## Compatbility cruft. -EXTRA_DIST += debian/fw.sh -EXTRA_DIST += debian/fw.README.Debian - ###----- That's all, folks -------------------------------------------------- diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index d53fdce..4fa27b3 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: fwd Section: net Priority: extra -Build-Depends: mlib-dev (>= 2.2.1), debhelper (>= 8) +Build-Depends: mlib-dev (>= 2.2.1), debhelper (>= 9) Maintainer: Mark Wooding Standards-Version: 3.1.1 @@ -15,20 +15,3 @@ Description: Excessive port forwarder 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. diff --git a/debian/fw.README.Debian b/debian/fw.README.Debian deleted file mode 100644 index 5710699..0000000 --- a/debian/fw.README.Debian +++ /dev/null @@ -1,17 +0,0 @@ -fw renamed to fwd - -The port forwarder `fw' has been renamed, since funnelweb already uses -that name. It's now called `fwd', which seems clear, and suggests that -it might run as a daemon (which is true). - -This package provides a compatibility script with the old name. It nags -you each time it runs, unless you set FW_RENAME_NAG=muffle in your -environment. I recommend that you fix whatever it is that's calling fwd -instead of setting this variable. - - Mark Wooding, - 2008-04-02 - -Local variables: -mode: text -End: diff --git a/debian/fw.sh b/debian/fw.sh deleted file mode 100644 index 6bc3554..0000000 --- a/debian/fw.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -set -e -case "$FW_RENAME_NAG" in - muffle) ;; - "") echo >&2 "$0: the \`fw' program been renamed to /usr/bin/fwd" ;; -esac -exec /usr/bin/fwd "$@" diff --git a/debian/rules b/debian/rules index 1996d95..f4a2b35 100755 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,2 @@ #! /usr/bin/make -f - -CDBS = /usr/share/cdbs/1 - -include $(CDBS)/class/autotools.mk -include $(CDBS)/rules/debhelper.mk - -###-------------------------------------------------------------------------- -### General definitions. - -DEB_BUILDDIR = $(CURDIR)/build -DEB_DESTDIR = $(CURDIR)/debian/fwd - -###-------------------------------------------------------------------------- -### Documentation. - -DEB_INSTALL_DOCS_fwd = GRAMMAR - -###-------------------------------------------------------------------------- -### Compatibility package. - -DEB_INSTALL_DIRS_fw = \ - usr/bin \ - usr/share/man/man1 - -install/fw:: - install -m755 debian/fw.sh debian/fw/usr/bin/fw - ln -s fwd.1.gz debian/fw/usr/share/man/man1/fw.1.gz - -###----- That's all, folks -------------------------------------------------- +%:; dh "$*" -Bdebian/build -- 2.11.0