The following diff does not include: - Removal of CVS directories (please use dpkg-buildpackage -I -i in future) - A backup file removed - Changes to debian/*.debhelper.log (oops... debian/rules clean should *not* use the -k option to dh_clean)
Ben.
diff -Nru dnprogs-2.56.1/debian/changelog dnprogs-2.56.1+nmu1/debian/changelog
--- dnprogs-2.56.1/debian/changelog 2011-08-09 11:03:17.000000000 +0100
+++ dnprogs-2.56.1+nmu1/debian/changelog 2011-08-25 14:31:24.000000000
+0100
@@ -1,3 +1,15 @@
+dnprogs (2.56.1+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * libdnet: Only suggest dnet-common package (Closes: #608807)
+ * dnet-common: Do not change MAC addresses unless user chooses to
+ configure DECnet (Closes: #637179)
+ * dnet-common: Restore ability to configure DECnet name and address
+ through debconf
+ * dnet-common: Remove obsolete modutils configuration file
+
+ -- Ben Hutchings <b...@decadent.org.uk> Thu, 25 Aug 2011 14:26:12 +0100
+
dnprogs (2.56.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru dnprogs-2.56.1/debian/control dnprogs-2.56.1+nmu1/debian/control
--- dnprogs-2.56.1/debian/control 2011-02-18 14:22:29.000000000 +0000
+++ dnprogs-2.56.1+nmu1/debian/control 2011-08-25 06:22:52.000000000 +0100
@@ -36,7 +36,7 @@
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: dnet-common(>=${binary:Version})
+Suggests: dnet-common (>=${binary:Version})
Section: libs
Description: DECnet Libraries
This package contains the libraries necessary for a functioning DECnet
diff -Nru dnprogs-2.56.1/debian/dnet-common.config
dnprogs-2.56.1+nmu1/debian/dnet-common.config
--- dnprogs-2.56.1/debian/dnet-common.config 2011-02-18 14:22:29.000000000
+0000
+++ dnprogs-2.56.1+nmu1/debian/dnet-common.config 2011-08-25
14:17:49.000000000 +0100
@@ -9,24 +9,26 @@
db_title DECnet node configuration
-db_get dnet-common/nodename
-if [ "$RET" = '' ]
-then
- db_fset dnet-dnet-common/configure-action seen false
+# On fresh installation, default is 'configure later' so we don't
+# have users accidentally changing all their MAC addresses.
+# XXX It would be better to ask which interfaces should be used,
+# with the default being empty.
+if [ -z "$2" ]; then
+ db_fset dnet-common/configure-action seen false
+ db_set dnet-common/configure-action 'configure later'
+
+ # '|| true' so skiped messages do not be a problem
+ db_input high dnet-common/configure-action || true
+ db_go
+ db_get dnet-common/configure-action
+ if [ "$RET" != 'configure now' ]
+ then
+ echo "dnet-common: Skipping configure of DECnet"
+ db_stop
+ exit 0
+ fi
fi
-# '|| true' so skiped messages do not be a problem
-db_input high dnet-common/configure-action || true
-db_go
-
-if [ "$RES" != 'configure now' ]
-then
- echo "dnet-common: Skipping configure of DECnet"
- db_stop
- exit 0
-fi
-
-
NAMEOK="false"
while [ -n "$NAMEOK" ]
do
diff -Nru dnprogs-2.56.1/debian/dnet-common.files
dnprogs-2.56.1+nmu1/debian/dnet-common.files
--- dnprogs-2.56.1/debian/dnet-common.files 2003-09-26 09:01:43.000000000
+0100
+++ dnprogs-2.56.1+nmu1/debian/dnet-common.files 2011-08-25
13:51:04.000000000 +0100
@@ -1,5 +1,4 @@
./etc/default/decnet
-./etc/modutils/decnet
./etc/dnetd.conf
./etc/decnet.proxy
./sbin/setether
diff -Nru dnprogs-2.56.1/debian/dnet-common.init.d
dnprogs-2.56.1+nmu1/debian/dnet-common.init.d
--- dnprogs-2.56.1/debian/dnet-common.init.d 2010-04-29 09:05:18.000000000
+0100
+++ dnprogs-2.56.1+nmu1/debian/dnet-common.init.d 2011-08-25
13:59:14.000000000 +0100
@@ -72,7 +72,7 @@
case $1 in
start)
- if [ ! \( -f /etc/decnet.conf -a -n "$ADDR" \) ]
+ if [ ! \( -f /etc/decnet.conf -a -n "$ADDR" -a -n "$interfaces" \) ]
then
echo "DECnet not started as it is not configured."
exit 0
diff -Nru dnprogs-2.56.1/debian/dnet-common.postinst
dnprogs-2.56.1+nmu1/debian/dnet-common.postinst
--- dnprogs-2.56.1/debian/dnet-common.postinst 2008-03-25 14:08:33.000000000
+0000
+++ dnprogs-2.56.1+nmu1/debian/dnet-common.postinst 2011-08-25
13:47:25.000000000 +0100
@@ -10,6 +10,13 @@
. /usr/share/debconf/confmodule
+# On installation, if told to configure later then do not change MAC
+# addresses
+db_get dnet-common/configure-action
+if [ "$RET" = 'configure later' ] && [ -z "$2" ]; then
+ sed -i 's/^DNET_INTERFACES="all"/DNET_INTERFACES=""/' /etc/default/decnet
+fi
+
# Get the node name and address
db_get dnet-common/nodename
name=$RET
diff -Nru dnprogs-2.56.1/debian/rules dnprogs-2.56.1+nmu1/debian/rules
--- dnprogs-2.56.1/debian/rules 2011-02-18 14:22:29.000000000 +0000
+++ dnprogs-2.56.1+nmu1/debian/rules 2011-08-25 06:12:03.000000000 +0100
@@ -21,7 +21,6 @@
mkdir -p debian/tmp/etc/default
mkdir -p debian/tmp/usr/share/doc/dnet-common
mkdir -p debian/tmp/sbin
- echo "alias net-pf-12 decnet" > debian/tmp/etc/modutils/decnet
echo '# DNET_INTERFACES specifies the names of ethernet interfaces
whose' >> debian/tmp/etc/default/decnet
echo '# MAC address is to be set to the DECnet node address' >>
debian/tmp/etc/default/decnet
echo "DNET_INTERFACES=\"all\"" >> debian/tmp/etc/default/decnet
@@ -60,7 +59,6 @@
$(checkdir)
-rm -rf debian/tmp `find debian/* -type d ! -name CVS ! -name po`
install -d debian/tmp
- mkdir -p debian/tmp/etc/modutils
mkdir -p debian/tmp/etc/default
mkdir -p debian/tmp/usr/share/doc/libdnet
mkdir -p debian/tmp/usr/share/doc/libdnet-dev
--- END ---
signature.asc
Description: This is a digitally signed message part
