Package: ifupdown
Version: 0.6.7-0.1
Here is the patch for the 0.6.7-0.2 NMU.
diff -ur ifupdown_0.6.7-0.1/debian/changelog ifupdown-0.6.7/debian/changelog
--- ifupdown_0.6.7-0.1/debian/changelog 2006-08-24 10:27:13.000000000 +0200
+++ ifupdown-0.6.7/debian/changelog 2006-09-12 17:32:46.000000000 +0200
@@ -1,3 +1,17 @@
+ifupdown (0.6.7-0.2) unstable; urgency=low
+
+ * Non-maintainer upload approved by maintainer.
+ * Add LSB-style dependency information to init.d scripts.
+ (Closes: #330230)
+ * Make sure the init.d scripts are added in dependency order.
+ (Closes: #386794)
+ * Updated standards-version from 3.6.1.0 to 3.7.2. No changes needed.
+ * Update the FSF address in the copyright file to keep lintian happy.
+ * Use log_* functions from lsb-base in init.d scripts. Add lsb-base
+ as dependency. Based on patch from Ubuntu. (Closes: #384866)
+
+ -- Petter Reinholdtsen <[EMAIL PROTECTED]> Tue, 12 Sep 2006 16:22:43 +0200
+
ifupdown (0.6.7-0.1) unstable; urgency=low
* Non-maintainer upload with authorization from maintainer.
diff -ur ifupdown_0.6.7-0.1/debian/control ifupdown-0.6.7/debian/control
--- ifupdown_0.6.7-0.1/debian/control 2005-04-04 17:39:17.000000000 +0200
+++ ifupdown-0.6.7/debian/control 2006-09-12 16:53:58.000000000 +0200
@@ -2,12 +2,12 @@
Section: base
Priority: important
Maintainer: Anthony Towns <[EMAIL PROTECTED]>
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4.1.68), nowebm
Package: ifupdown
Architecture: any
-Depends: net-tools, ${shlibs:Depends}, ${debconf-depends}
+Depends: net-tools, ${shlibs:Depends}, ${debconf-depends}, lsb-base
Suggests: iproute, dhcp3-client | dhcp-client, ppp
Replaces: netbase (<< 4.00)
Description: high level tools to configure network interfaces
diff -ur ifupdown_0.6.7-0.1/debian/copyright ifupdown-0.6.7/debian/copyright
--- ifupdown_0.6.7-0.1/debian/copyright 2005-04-04 15:33:54.000000000 +0200
+++ ifupdown-0.6.7/debian/copyright 2006-09-12 16:39:40.000000000 +0200
@@ -14,8 +14,8 @@
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in /usr/share/common-licenses/GPL .
diff -ur ifupdown_0.6.7-0.1/debian/ifupdown-clean.init ifupdown-0.6.7/debian/ifupdown-clean.init
--- ifupdown_0.6.7-0.1/debian/ifupdown-clean.init 2005-04-04 15:33:54.000000000 +0200
+++ ifupdown-0.6.7/debian/ifupdown-clean.init 2006-09-12 17:25:54.000000000 +0200
@@ -1,10 +1,17 @@
#!/bin/sh
-#
-# ifupdown-clean
-#
+### BEGIN INIT INFO
+# Provides: ifupdown-clean
+# Required-Start: checkroot
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Clean old iterface status info during boot.
+### END INIT INFO
set -e
+. /lib/lsb/init-functions
+
MYNAME="${0##*/}"
PATH=/sbin:/bin
[ -r /etc/default/ifupdown ] && . /etc/default/ifupdown
@@ -17,14 +24,14 @@
case "$1" in
start)
- echo -n "Cleaning up ifupdown..."
+ log_begin_msg "Cleaning up ifupdown..."
if [ -f $IFSTATE -a ! -L $IFSTATE ]; then
rm -f "$IFSTATE"
elif [ -f $IFSTATE ]; then
# This is kinda bad :(
>$IFSTATE
fi
- echo "done."
+ log_end_msg 0
exit 0
;;
diff -ur ifupdown_0.6.7-0.1/debian/ifupdown.init ifupdown-0.6.7/debian/ifupdown.init
--- ifupdown_0.6.7-0.1/debian/ifupdown.init 2005-05-02 15:57:05.000000000 +0200
+++ ifupdown-0.6.7/debian/ifupdown.init 2006-09-12 16:44:53.000000000 +0200
@@ -1,11 +1,21 @@
#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides: ifupdown
+# Required-Start: ifupdown-clean
+# Required-Stop: $local_fs
+# Default-Start: S
+# Default-Stop: 0 6
+# Short-Description: Prepare the system for taking up interfaces.
+### END INIT INFO
[ -x /sbin/ifup ] || exit 0
[ -x /sbin/ifdown ] || exit 0
+. /lib/lsb/init-functions
+
MYNAME="${0##*/}"
report() { echo "${MYNAME}: $*" ; }
-report_err() { report "Error: $*" >&2 ; }
+report_err() { log_failure_msg "$*" ; }
RUN_DIR=/etc/network/run
[ -r /etc/default/ifupdown ] && . /etc/default/ifupdown
@@ -50,7 +60,7 @@
report_err "Arguments to '$1' command not accepted"
exit 3
fi
- echo -n "Setting up networking..."
+ log_begin_msg "Setting up networking..."
# if /etc/network/run is a symlink to a directory that doesn't exist,
# create it.
@@ -58,13 +68,13 @@
if [ -L "$RUN_DIR" ] && [ ! -d "$RUN_DIR" ] ; then
runmkdir="$(myreadlink "$RUN_DIR")"
if [ ! "$runmkdir" ] ; then
- echo "failed."
report_err "Cannot create target of /etc/network/run"
+ log_end_msg 1
exit 1
fi
if ! mkdir -p "$runmkdir"; then
- echo "failed."
report_err "Failure creating directory $runmkdir"
+ log_end_msg 1
exit 1
fi
fi
@@ -73,13 +83,13 @@
# Doing this also signals that ifupdown is available for use
if [ ! -r "$IFSTATE" ]; then
if ! : > "$IFSTATE" ; then
- echo "failed."
report_err "Failure initializing $IFSTATE"
+ log_end_msg 1
exit 1
fi
fi
- echo "done."
+ log_end_msg 0
exit 0
;;
diff -ur ifupdown_0.6.7-0.1/debian/rules ifupdown-0.6.7/debian/rules
--- ifupdown_0.6.7-0.1/debian/rules 2005-04-04 15:33:54.000000000 +0200
+++ ifupdown-0.6.7/debian/rules 2006-09-12 16:29:35.000000000 +0200
@@ -142,8 +142,8 @@
dh_installmenu
# dh_installemacsen
# dh_installpam
- dh_installinit --name=ifupdown --no-start -- start 39 S . start 36 0 6 .
dh_installinit --name=ifupdown-clean --no-start -- start 18 S .
+ dh_installinit --name=ifupdown --no-start -- start 39 S . start 36 0 6 .
dh_installcron
# dh_installmanpages
# ^-- can't do our symlink trick
