Clean up debian packaging

debian/control

@@ -1,16 +1,18 @@
 Source: ndppd
-Section: unknown
+Section: net
 Priority: extra
 Maintainer: Daniel Adolfsson <daniel.adolfsson@tuhox.com>
 Build-Depends: debhelper (>= 7.0.50~), libconfuse-dev (>= 2.7)
 Standards-Version: 3.8.4
 Homepage: http://www.tuhox.com/ndppd
 Vcs-Git: git://github.com/Tuhox/ndppd.git
-Vcs-Browser: https://github.com/Tuhox/ndppd
+Vcs-Browser: https://github.com/Tuhox/ndppd/tree/debian
 
 Package: ndppd
-Architecture: amd64 i386
+Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: NDP Proxy Daemon
+Description: daemon that proxies IPv6 NDP messages
- ndppd, or 'NDP Proxy Daemon', is a daemon that proxies NDP (Neighbor Discovery Protocol) 
+ ndppd is a daemon that proxies certain IPv6 NDP messages between two or 
- messages between interfaces.
+ more interfaces. It currently supports proxying Neighbor Solicitation
+ Messages and Neighbor Advertisement messages in order to allow IPv6
+ routing without relying on linux "proxy_ndp".

debian/copyright

@@ -1,39 +1,22 @@
-This work was packaged for Debian by:
+Format: http://dep.debian.net/deps/dep5/
-
+Upstream-Name: ndppd
-    Daniel Adolfsson <daniel.adolfsson@tuhox.com> on Sun, 18 Sep 2011 12:59:13 +0200
+Source: https://github.com/Tuhox/ndppd
-
-It was downloaded from:
-
-    http://www.tuhox.com/ndppd
-
-Upstream Author(s):
-
-    Daniel Adolfsson <daniel.adolfsson@tuhox.com>
-
-Copyright:
-
-    Copyright (C) 2011 Daniel Adolfsson
-
-License:
 
+Files: *
+Copyright: 2011, Daniel Adolfsson <daniel.adolfsson@tuhox.com>
+License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
-
+ .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
-
+ .
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
-
+ .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-The Debian packaging is:
-
-    Copyright (C) 2011 Daniel Adolfsson <daniel.adolfsson@tuhox.com>
-
-and is licensed under the GPL version 3, see above.

debian/docs

@@ -1,2 +1,3 @@
 README
-ndppd.conf.example
+ndppd.conf-dist
+

debian/init.d

@@ -6,19 +6,18 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: NDP Proxy Daemon
-# Description:       nppd, or 'NDP Proxy Daemon', is a daemon that proxies NDP
+# Description:       nppd, or NDP Proxy Daemon, is a daemon that proxies NDP
 #                    (Neighbor Discovery Protocol) messages between interfaces.
 ### END INIT INFO
 
 # Author: Daniel Adolfsson <daniel.adolfsson@tuhox.com>
 
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC=ndppd             # Introduce a short description here
+DESC=ndppd
-NAME=ndppd             # Introduce the short server's name here
+NAME=ndppd
-DAEMON=/usr/sbin/ndppd # Introduce the server's location here
+DAEMON=/usr/sbin/ndppd
 PIDFILE=/var/run/$NAME.pid
-DAEMON_ARGS="-d -p $PIDFILE"  # Arguments to run the daemon with
+DAEMON_ARGS="-d -p $PIDFILE"
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
@@ -30,8 +29,6 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 
 #
@@ -46,11 +43,7 @@ do_start()
    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
       || return 1
    start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
+      $DAEMON_ARGS || return 2
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
 }
 
 #
@@ -66,6 +59,7 @@ do_stop()
    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
    RETVAL="$?"
    [ "$RETVAL" = 2 ] && return 2
+
    # Wait for children to finish too if this is a daemon that forks
    # and if the daemon is only ever run from this initscript.
    # If the above conditions are not satisfied then add some other code
@@ -79,19 +73,6 @@ do_stop()
    return "$RETVAL"
 }
 
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
 case "$1" in
    start)
       [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
@@ -101,6 +82,7 @@ case "$1" in
    	   2)   [ "$VERBOSE" != no ] && log_end_msg 1 ;;
    	esac
       ;;
+
    stop)
       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
       do_stop
@@ -109,23 +91,12 @@ case "$1" in
          2)   [ "$VERBOSE" != no ] && log_end_msg 1 ;;
       esac
       ;;
+
    status)
       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
       ;;
-  #reload|force-reload)
+
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
    restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
       log_daemon_msg "Restarting $DESC" "$NAME"
       do_stop
       case "$?" in
@@ -144,10 +115,9 @@ case "$1" in
       esac
       ;;
    *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
       echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
       exit 3
       ;;
 esac
 
-:
+exit 0

debian/rules

@@ -1,16 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-#override_dh_auto_build:
-#	dh_auto_build -- PREFIX=$(DESTDIR)/build
 
 %:
 	dh $@