debian: update Debian packaging.

The diff from the official package is now a lot smaller.

diff --git a/debian/README.Debian b/debian/README.Debian
index 042817bd73f02fd18f6bc7fee55a8486ac2cbbab..8d26720dfbfbd8aeebbad4146701e7ae1aa715e4 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-If you want to run lldpctl as normal user, just put yourself in _lldpd
+If you want to run lldpctl as normal user, just put yourself in adm
 group.
 
- -- Vincent Bernat <bernat@debian.org>, Sun, 16 Nov 2008 20:24:18 +0100
+ -- Vincent Bernat <bernat@debian.org>, Mon, 17 Nov 2008 20:24:05 +0100

diff --git a/debian/changelog b/debian/changelog
index e2a2dfa5211415a6fecfed1d0ef7d5c4ac9f27f2..9cbc0ac3c7bf971fd85c80cfefa8bc89a7ba4971 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-lldpd (0+20080718cvs) UNRELEASED; urgency=low
+lldpd (0.7.0-0) UNRELEASED; urgency=low
 
-  * Initial release
+  * Unofficial package.
 
- -- Vincent Bernat <bernat@debian.org>  Fri, 18 Jul 2008 11:20:34 +0200
+ -- Vincent Bernat <bernat@debian.org>  Sun, 06 Jan 2013 16:42:46 +0100

diff --git a/debian/control b/debian/control
index 6676c6dcc5c4f766b77abcff873858eef9146088..b54cda6a01cadeb4a4c5de104bfab4c4423498e7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: lldpd
 Section: net
 Priority: optional
 Maintainer: Vincent Bernat <bernat@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev,
-               libsnmp15-dev | libsnmp9-dev | libsnmp-dev,
-              libxml2-dev, libevent-dev, libreadline-dev, pkg-config
-Standards-Version: 3.8.4
-Homepage: https://github.com/vincentbernat/lldpd/wiki
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libsnmp-dev,
+               libperl-dev, libsensors-dev | libsensors4-dev,
+               libxml2-dev, libevent-dev, libreadline-dev,
+               pkg-config
+Standards-Version: 3.9.3
+Homepage: https://github.com/vincentbernat/lldpd
 
 Package: lldpd
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index bf3f7dc9a4efb5d50cdbc9993ec527618bc59ea9..33e63ea1c8d362d3ed81a721458ef4d6a09b395a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Copyright: © 2008 Vincent Bernat <bernat@luffy.cx>
            © 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
            © 2003 Can Erkin Acar
            © 2003 Anil Madhavapeddy <anil@recoil.org>
-License: MIT
+License: ISC
  Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
@@ -34,4 +34,4 @@ License: BSD
 
 Files: debian/*
 Copyright: © 2008 Vincent Bernat <bernat@debian.org>
-License: MIT
+License: ISC

diff --git a/debian/default b/debian/lldpd.default
similarity index 100%
rename from debian/default
rename to debian/lldpd.default

diff --git a/debian/init.d b/debian/lldpd.init.d
similarity index 90%
rename from debian/init.d
rename to debian/lldpd.init.d
index bee1b06846404c4ba15564622d329ee667632090..c2654ea6b4153a033c27f2058f2bb9924ac8b108 100644 (file)
--- a/debian/init.d
+++ b/debian/lldpd.init.d
@@ -6,6 +6,9 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: LLDP daemon
+# Description:       This script controls lldpd, a 802.1ab
+#                    implementation. lldpd also supports CDP,
+#                    EDP and various other protocols.
 ### END INIT INFO
 
 # Do NOT "set -e"
@@ -36,7 +39,6 @@ do_chroot()
        [ -d $CHROOT/etc ] || mkdir -p $CHROOT/etc
        [ -f $CHROOT/etc/localtime ] || [ ! -f /etc/localtime ] || \
                cp /etc/localtime $CHROOT/etc/localtime
-       export TZ=/etc/localtime
        umask $oldumask
 }
 
@@ -106,8 +108,11 @@ case "$1" in
                ;;
        esac
        ;;
+  status)
+       status_of_proc $DAEMON $NAME -p $PIDFILE && exit 0 || exit $?
+       ;;
   *)
-       echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+       echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
        exit 3
        ;;
 esac

diff --git a/debian/rules b/debian/rules
index 26f01d5b8eb4d5e23b908715d741c032d45251e5..e19ad60f30cb1b33d149e91f583a2f368a6eeea2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --with-snmp --with-xml
-DEB_INSTALL_CHANGELOGS_ALL = NEWS ChangeLog
+
+binary-install/lldpd::
+       -rm debian/lldpd/usr/share/doc/lldpd/CHANGELOG
+

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..b27f922
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://vincent.bernat.im/en/projects.html .*/lldpd-([\d.]+).tar.gz