Sync Debian packaging with official packaging.

The sync is not complete (we want to stay compatible with older
releases of Debian).

diff --git a/debian/control b/debian/control
index 681d3b73793cc1848b67bbbb6175b2c62c0ff197..7a67bc28faebdaaf480192405d1acb8830b0ae0a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,23 @@ 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
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
+Homepage: https://trac.luffy.cx/lldpd/
 
 Package: lldpd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Suggests: snmpd
 Description: implementation of IEEE 802.1ab (LLDP)
- This implementation provides LLDP sending and reception, supports
- VLAN and includes an SNMP subagent that can interface to an SNMP
- agent through AgentX protocol.
- .
  LLDP is an industry standard protocol designed to supplant
  proprietary Link-Layer protocols such as Extreme's EDP (Extreme
  Discovery Protocol) and CDP (Cisco Discovery Protocol). The goal of
  LLDP is to provide an inter-vendor compatible mechanism to deliver
  Link-Layer notifications to adjacent network devices.
  .
- This daemon is also able to deal with CDP, FDP, SONMP and EDP
+ This implementation provides LLDP sending and reception, supports
+ VLAN and includes an SNMP subagent that can interface to an SNMP
+ agent through AgentX protocol.
+ .
+ This daemon is also able to deal with CDP, SONMP, FDP and EDP
  protocol. It also handles LLDP-MED extension.

diff --git a/debian/copyright b/debian/copyright
index ae18ad4e015a62b696ac7cef10bd01a744a98fcc..c76687e4fcdaba7fe38a9d46930be08d7b0453ed 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,8 @@ Files: *
 Copyright: © 2008 Vincent Bernat <bernat@luffy.cx>
            © 2003, 2004 Henning Brauer <henning@openbsd.org>
            © 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
+           © 2003 Can Erkin Acar
+           © 2003 Anil Madhavapeddy <anil@recoil.org>
 License: MIT
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
@@ -15,5 +17,21 @@ License: MIT
  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-On Debian systems, the complete text of the MIT can be found in
-`/usr/share/common-licenses/MIT`.
+Files: src/privsep_fdpass.c
+Copyright: © 2001 Niels Provos <provos@citi.umich.edu>
+           © 2002 Matthieu Herrb
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+    - Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    - Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+Files: debian/*
+Copyright: © 2008 Vincent Bernat <bernat@debian.org>
+License: MIT

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

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

diff --git a/debian/postinst b/debian/postinst
index e8a714d0feb8c80e6dbb27b1f9a640ce1c3ffb82..a6130748fbb6925c8b1d1a7c16cf087bb3087fbd 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,11 +6,10 @@ fi
 
 adduser --system --disabled-password --disabled-login --home /var/run/lldpd \
                --no-create-home --quiet --force-badname --group _lldpd
-[ -d /var/run/lldpd ] || mkdir -p /var/run/lldpd
 
 for i in /usr/sbin/lldpctl; do
   if ! dpkg-statoverride --list $i > /dev/null 2>&1; then
-    dpkg-statoverride --update --add _lldpd _lldpd 4750 $i
+    dpkg-statoverride --update --add _lldpd adm 4750 $i
   fi
 done
 

diff --git a/debian/rules b/debian/rules
index 276cec31d51622dbacc288e2b634f65619187bc6..5ad3ecf76e3467e78105da3082c595b1cdc8318c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,4 @@ 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 = CHANGELOG