[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. debian/4.1.1-P1-16.1-74-gd516495

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 7be5eaa8b6c06a7268edbc24855c0aca2cc53146
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Apr 28 14:21:42 2012 -0400

    Make dependencies diff-able

diff --git a/debian/control b/debian/control
index 96f5222..b1a620b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,28 @@ Uploaders:
  Michael Gilbert <mgilbert at debian.org>,
 Vcs-Git: git://git.debian.org/pkg-dhcp/isc-dhcp.git
 Vcs-Browser: http://git.debian.org/?p=pkg-dhcp/isc-dhcp.git;a=summary
-Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, po-debconf, libldap2-dev, libssl-dev, autoconf, automake, pkg-config, hardening-wrapper
+Build-Depends:
+ debhelper (>> 7),
+ dpkg-dev (>= 1.13.2),
+ groff,
+ autoconf,
+ automake,
+ pkg-config,
+ po-debconf,
+ libssl-dev,
+ libldap2-dev,
+ hardening-wrapper,
 Standards-Version: 3.9.3
 
 Package: isc-dhcp-server
 Priority: optional
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), lsb-base, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
+ isc-dhcp-common (= ${binary:Version}),
+ lsb-base,
 Provides: dhcp3-server
 Conflicts: dhcp
 Replaces: dhcp3-server
@@ -33,7 +48,12 @@ Package: isc-dhcp-server-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), lsb-base, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
+ isc-dhcp-common (= ${binary:Version}),
+ lsb-base,
 Conflicts: dhcp
 Suggests: isc-dhcp-server-ldap
 Description: ISC DHCP server for automatic IP address assignment (debug)
@@ -52,7 +72,12 @@ Description: ISC DHCP server for automatic IP address assignment (debug)
 Package: isc-dhcp-server-ldap
 Priority: optional
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), isc-dhcp-server (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
+ isc-dhcp-common (= ${binary:Version}),
+ isc-dhcp-server (= ${binary:Version}),
 Provides: dhcp3-server-ldap
 Conflicts: dhcp
 Replaces: dhcp3-server-ldap
@@ -73,7 +98,10 @@ Architecture: any
 Section: net
 Provides: dhcp3-common
 Replaces: dhcp3-common
-Depends: debianutils (>= 2.8.2), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
 Description: common files used by all the isc-dhcp* packages
  This package contains the files used by all the packages from ISC
  DHCP.
@@ -84,17 +112,33 @@ Architecture: any
 Section: devel
 Provides: dhcp3-dev
 Replaces: dhcp3-dev
-Depends: libc6-dev, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ libc6-dev,
 Description: API for accessing and modifying the DHCP server and client state
  OMAPI is an API for accessing and modifying the DHCP server and
  client state.
 
 Package: isc-dhcp-client
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), iproute [linux-any], inetutils-ping [!linux-any], ${shlibs:Depends}, ${misc:Depends}
-Suggests: resolvconf, avahi-autoipd
-Provides: dhcp-client, dhcp3-client
-Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2), resolvconf (<= 1.45), ifupdown (<< 0.6.8+nmu3)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
+ isc-dhcp-common (= ${binary:Version}),
+ iproute [linux-any],
+ inetutils-ping [!linux-any],
+Suggests:
+ resolvconf,
+ avahi-autoipd
+Provides:
+ dhcp-client,
+ dhcp3-client
+Conflicts:
+ dhcp-client (<< 3.0),
+ samba-common (<< 3.0.0beta1-2),
+ resolvconf (<= 1.45),
+ ifupdown (<< 0.6.8+nmu3)
 Replaces: dhcp3-client
 Description: ISC DHCP client
  This is the client from the Internet Software Consortium's implementation of
@@ -114,9 +158,17 @@ Package: isc-dhcp-client-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: resolvconf, avahi-autoipd
-Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
+ isc-dhcp-common (= ${binary:Version}),
+Suggests:
+ resolvconf,
+ avahi-autoipd
+Conflicts:
+ dhcp-client (<< 3.0),
+ samba-common (<< 3.0.0beta1-2)
 Description: ISC DHCP client (debugging symbols)
  This is the client from the Internet Software Consortium's implementation of
  DHCP. For more information visit http://www.isc.org.
@@ -137,7 +189,8 @@ Package: isc-dhcp-client-udeb
 Priority: extra
 Architecture: any
 Section: debian-installer
-Depends: ${shlibs:Depends}
+Depends:
+ ${shlibs:Depends}
 XC-Package-Type: udeb
 Description: ISC DHCP Client for debian-installer
  dhcp-client-udeb is a minimal dhcp package used by the debian-installer.
@@ -145,7 +198,11 @@ Description: ISC DHCP Client for debian-installer
 Package: isc-dhcp-relay
 Priority: optional
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
+ isc-dhcp-common (= ${binary:Version}),
 Provides: dhcp3-relay
 Conflicts: dhcp-relay
 Replaces: dhcp3-relay
@@ -163,7 +220,11 @@ Package: isc-dhcp-relay-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: debianutils (>= 2.8.2), isc-dhcp-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ debianutils (>= 2.8.2),
+ isc-dhcp-common (= ${binary:Version}),
 Conflicts: dhcp-relay
 Description: DHCP relay daemon (debugging symbols)
  This is the relay from the Internet Software Consortium's implementation of

-- 
ISC DHCP packaging for Debian