From: Vincent Bernat Date: Sun, 6 Jan 2013 15:46:36 +0000 (+0100) Subject: debian: update Debian packaging. X-Git-Tag: 0.7.1~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b210a61700201899f0bc26998a01cb566e8413ab;p=thirdparty%2Flldpd.git 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 042817bd..8d26720d 100644 --- 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 , Sun, 16 Nov 2008 20:24:18 +0100 + -- Vincent Bernat , Mon, 17 Nov 2008 20:24:05 +0100 diff --git a/debian/changelog b/debian/changelog index e2a2dfa5..9cbc0ac3 100644 --- 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 Fri, 18 Jul 2008 11:20:34 +0200 + -- Vincent Bernat Sun, 06 Jan 2013 16:42:46 +0100 diff --git a/debian/control b/debian/control index 6676c6dc..b54cda6a 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,12 @@ Source: lldpd Section: net Priority: optional Maintainer: Vincent Bernat -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 bf3f7dc9..33e63ea1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Copyright: © 2008 Vincent Bernat © 2006 Pierre-Yves Ritschard © 2003 Can Erkin Acar © 2003 Anil Madhavapeddy -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 -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 bee1b068..c2654ea6 100644 --- 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 26f01d5b..e19ad60f 100755 --- 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 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..b27f9224 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://vincent.bernat.im/en/projects.html .*/lldpd-([\d.]+).tar.gz