Just uploaded an NMU to implement the TC requirements. Here's the debdiff
--
Steve McIntyre, Cambridge, UK. st...@einval.com
Can't keep my eyes from the circling sky,
Tongue-tied & twisted, Just an earth-bound misfit, I...
diff -u node-0.3.2/Makefile node-0.3.2/Makefile
--- node-0.3.2/Makefile
+++ node-0.3.2/Makefile
@@ -28,7 +28,7 @@
installbin: all
install -m 755 -o root -g root -d $(prefix)$(SBIN_DIR)
- install -m 4755 -s -o root -g root node $(prefix)$(SBIN_DIR)
+ install -m 4755 -s -o root -g root node
$(prefix)$(SBIN_DIR)/ax25-node
install -m 755 -s -o root -g root nodeusers $(prefix)$(SBIN_DIR)
installhelp:
@@ -48,7 +48,7 @@
install -m 644 -o bin -g bin man/node.conf.5
$(prefix)$(MAN_DIR)/man5
install -m 644 -o bin -g bin man/node.perms.5
$(prefix)$(MAN_DIR)/man5
install -m 755 -o root -g root -d
$(prefix)$(MAN_DIR)/man8
- install -m 644 -o bin -g bin man/node.8
$(prefix)$(MAN_DIR)/man8
+ install -m 644 -o bin -g bin man/node.8
$(prefix)$(MAN_DIR)/man8/ax25-node.8
clean:
rm -f *.o *~ *.bak *.orig
diff -u node-0.3.2/debian/rules node-0.3.2/debian/rules
--- node-0.3.2/debian/rules
+++ node-0.3.2/debian/rules
@@ -42,8 +42,13 @@
dh_installdirs
# Add here commands to install the package into debian/node.
- $(MAKE) install prefix=$(CURDIR)/debian/node/
+ $(MAKE) install prefix=$(CURDIR)/debian/ax25-node/
+ # Set up symlinks in the transitional package
+ mkdir -p debian/node/usr/sbin
+ ln -s ax25-node debian/node/usr/sbin/node
+ mkdir -p debian/node/usr/share/man/man8
+ ln -s ax25-node.8 debian/node/usr/share/man/man8/node.8
# Build architecture-independent files here.
binary-indep: build install
@@ -61,7 +66,7 @@
# dh_installpam
# dh_installinit
# dh_installcron
- dh_installmanpages
+ dh_installmanpages -p ax25-node
# dh_installinfo
# dh_undocumented
dh_installchangelogs
diff -u node-0.3.2/debian/control node-0.3.2/debian/control
--- node-0.3.2/debian/control
+++ node-0.3.2/debian/control
@@ -9,8 +9,17 @@
-Package: node
+Package: ax25-node
Architecture: any
Depends: ${shlibs:Depends}, update-inetd, openbsd-inetd|inet-superserver
Description: Amateur Packet Radio Node program
- The node program accepts TCP/IP and packet radio network connections and
+ The ax25-node program accepts TCP/IP and packet radio network connections and
presents users with an interface that allows them to make gateway connections
to remote hosts using a variety of amateur radio protocols.
+Package: node
+Priority: extra
+Architecture: all
+Depends: ax25-node
+Conflicts: nodejs-legacy
+Section: oldlibs
+Description: Amateur Packet Radio Node program (transitional package)
+ The existing node package has been renamed to ax25-node. This transitional
+ package exists to ease the upgrade path for existing users.
diff -u node-0.3.2/debian/changelog node-0.3.2/debian/changelog
--- node-0.3.2/debian/changelog
+++ node-0.3.2/debian/changelog
@@ -1,3 +1,16 @@
+node (0.3.2-7.2) unstable; urgency=low
+
+ * NMU
+ * Implement the tech committee decision to fix the node/nodejs name
+ clash (Closes: #681361):
+ + Rename the existing "node" binary package to "ax25-node"
+ + Rename the /usr/sbin/node binary in that package to
+ /usr/sbin/ax25-node
+ + Add a new "node" transitional package which depends on "ax25-node"
+ and conflicts with "nodejs-legacy".
+
+ -- Steve McIntyre <93...@debian.org> Sun, 14 Oct 2012 00:37:37 +0100
+
node (0.3.2-7.1) unstable; urgency=low
* Retiring - remove myself from the uploaders list.
reverted:
--- node-0.3.2/debian/postinst
+++ node-0.3.2.orig/debian/postinst
@@ -1,48 +0,0 @@
-#! /bin/sh
-# postinst script for node
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
- install|upgrade|configure)
- update-inetd --add \
- "bbs\tstream\ttcp\twait\troot\t/usr/sbin/node\tnode"
- update-inetd --disable bbs
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
only in patch2:
unchanged:
--- node-0.3.2.orig/INSTALL
+++ node-0.3.2/INSTALL
@@ -37,23 +37,23 @@
Node is intended to be called from ax25d or inetd. It doesn't need
any command line arguments but there is one to support incoming
-compressed connects. See the node(8) manual page.
+compressed connects. See the ax25-node(8) manual page.
To run LinuxNode from ax25d, /etc/ax25/ax25d.conf should have something
like this in it:
# AX.25
[OH2BNS VIA 144]
- default * * * * * * - root /usr/bin/node node
+ default * * * * * * - root /usr/sbin/ax25-node ax25-node
# NETROM
<netrom>
- default * * * * * * - root /usr/bin/node node
+ default * * * * * * - root /usr/sbin/ax25-node ax25-node
/etc/inetd.conf could have something like this in it:
# Set up LinuxNode to listen at telnet port
- telnet stream tcp nowait root /usr/bin/node node
+ telnet stream tcp nowait root /usr/sbin/ax25-node ax25-node
Note that LinuxNode should always be run as root. Otherwise outgoing
connects won't work. Also ping needs a raw socket which requires root
only in patch2:
unchanged:
--- node-0.3.2.orig/debian/ax25-node.postinst
+++ node-0.3.2/debian/ax25-node.postinst
@@ -0,0 +1,48 @@
+#! /bin/sh
+# postinst script for ax25-node
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see /usr/share/doc/packaging-manual/
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ install|upgrade|configure)
+ update-inetd --add \
+ "bbs\tstream\ttcp\twait\troot\t/usr/sbin/ax25-node\tax25-node"
+ update-inetd --disable bbs
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
only in patch2:
unchanged:
--- node-0.3.2.orig/man/node.conf.5
+++ node-0.3.2/man/node.conf.5
@@ -66,7 +66,7 @@
and you should either disable it or set the no-escape flag in node.perms
for the forwarding stations if (compressed) forward is run trough
LinuxNode. Also the Escape user command can be used in a forward script
-to disable the escape (see node(8)).
+to disable the escape (see ax25-node(8)).
.TP 14
.B ExtCmd <NAme> <flags> <uid> <exec> <args...>
Sets up an external command.
@@ -87,10 +87,10 @@
.RS
.TP 5
.B 1
-Run command through pipe. Without this flag node just fork()s and exec()s
+Run command through pipe. Without this flag ax25-node just fork()s and exec()s
the specified command and then waits for it to terminate. The command must
it self be aware about the underlying protocol. It must handle packetising
-and any end of line conversions. With this flag however node sets up a pipe
+and any end of line conversions. With this flag however ax25-node sets up a
pipe
between it self and the command and handles packetising and end of line
conversions for it.
.TP 5
@@ -138,7 +138,7 @@
that 127.0.0.0/8 (loopback net) is also considered "local" by default.
.TP 14
.B LogLevel <loglevel>
-Specifies what node should log. The available levels are:
+Specifies what ax25-node should log. The available levels are:
.RS
.TP 5
.B 0
@@ -157,7 +157,7 @@
.RE
.TP 14
.B NodeId <id>
-This is the id that is shown in every message from node. Default
+This is the id that is shown in every message from ax25-node. Default
is "LinuxNode}".
.TP 14
.B NodePrompt <prompt>
@@ -318,7 +318,7 @@
.LP
/etc/ax25/node.conf
.SH "SEE ALSO"
-.BR node (8),
+.BR ax25-node (8),
.BR node.perms (5),
.BR axports (5),
.BR ax25 (4).
only in patch2:
unchanged:
--- node-0.3.2.orig/man/node.8
+++ node-0.3.2/man/node.8
@@ -1,11 +1,11 @@
-.TH NODE 8 "16 June 1999" Linux "Linux System Managers Manual"
+.TH AX25-NODE 8 "16 June 1999" Linux "Linux System Managers Manual"
.SH NAME
-node \- Node front end for AX.25, NET/ROM, Rose and TCP
+ax25-node \- Node front end for AX.25, NET/ROM, Rose and TCP
.SH SYNOPSIS
-.B node [-c]
+.B ax25-node [-c]
.SH DESCRIPTION
.LP
-.B Node
+.B ax25-node
is a simple node front end, modelled after the node shells of TheNet
and G8BPQ nodes.
.SH OPTIONS
@@ -22,7 +22,7 @@
compression method, namely LinuxNode and Clussed.
.SH NODE COMMANDS
The following commands are supported for users of
-.B node:
+.B ax25-node:
.TP 14
.BI ?
Give short list of available commands.
