[pkg-dhcp-commits] [SCM] ISC DHCP packaging for Debian branch, master, updated. c72ca3f6a5ed32cfc4e4596692fe84569b5c7160

[Andrew Pollock]

The following commit has been merged in the master branch:
commit c72ca3f6a5ed32cfc4e4596692fe84569b5c7160
Merge: 7e4d76f73302d5d1d16d44b8908c5159e0c858f0 d96b0e6e3157f49d67966405b1ce0f329c70bca1
Author: Andrew Pollock <apollock at debian.org>
Date:   Sat Mar 6 18:49:18 2010 -0800

    Merge branch 'master' of ssh://apollock@git.debian.org/git/pkg-dhcp/isc-dhcp

diff --combined debian/changelog
index 071ada9,510e324..62f659a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,9 @@@
 +isc-dhcp (4.1.1-1) UNRELEASED; urgency=low
 +
 +  * New Upstream Version
 +
 + -- Andrew Pollock <apollock at debian.org>  Sat, 06 Mar 2010 18:14:11 -0800
 +
  isc-dhcp (4.1.0-2) UNRELEASED; urgency=low
  
    * debian/README.Debian: update for current upstream version, specifically
@@@ -12,6 -6,7 +12,7 @@@
    * Fix dhclient-script so that changes in the DHCP-provided hostname
      cause a hostname change to occur on the client
    * Remove unnecessary sleep from dhclient-script
+   * Updated ldap patch
  
   -- Andrew Pollock <apollock at debian.org>  Sun, 01 Nov 2009 15:02:10 -0800
  
diff --combined debian/control
index ea17311,4039226..1888225
--- a/debian/control
+++ b/debian/control
@@@ -1,10 -1,10 +1,10 @@@
  Source: isc-dhcp
  Section: net
  Priority: important
 -Maintainer: Andrew Pollock <apollock at debian.org>
 -Uploaders: Eloy A. Paris <peloy at debian.org>
 +Maintainer: Debian ISC DHCP maintainers <pkg-dhcp-devel at lists.alioth.debian.org>
 +Uploaders: Andrew Pollock <apollock at debian.org>
  Build-Depends: debhelper (>> 7), dpkg-dev (>= 1.13.2), groff, dpatch, po-debconf, libldap2-dev, libssl-dev
 -Standards-Version: 3.8.3
 +Standards-Version: 3.8.4
  
  Package: isc-dhcp-server
  Priority: optional
@@@ -45,21 -45,24 +45,24 @@@ Description: ISC DHCP server for automa
   .
   This server can handle multiple ethernet interfaces.
  
- #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}
- #Enhances: isc-dhcp-server
- #Description: DHCP server able to use LDAP as backend
- # This is the server from the Internet Software Consortium's implementation of
- # DHCP. For more information, visit http://www.isc.org.
- # .
- # Dynamic Host Configuration Protocol (DHCP) is a protocol like BOOTP
- # (actually dhcpd includes much of the functionality of bootpd). It
- # gives client machines "leases" for IP addresses and can
- # automatically set their network configuration.
- # .
- # This is the DHCP server with LDAP patches applied to it.
+ 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}
+ Provides: dhcp3-server-ldap
+ Conflicts: dhcp, dhcp3-server, dhcp3-server-ldap
+ Replaces: dhcp3-server-ldap
+ Enhances: isc-dhcp-server
+ Description: DHCP server able to use LDAP as backend
+  This is the server from the Internet Software Consortium's implementation of
+  DHCP. For more information, visit http://www.isc.org.
+  .
+  Dynamic Host Configuration Protocol (DHCP) is a protocol like BOOTP
+  (actually dhcpd includes much of the functionality of bootpd). It
+  gives client machines "leases" for IP addresses and can
+  automatically set their network configuration.
+  .
+  This is the DHCP server with LDAP patches applied to it.
  
  Package: isc-dhcp-common
  Architecture: any

-- 
ISC DHCP packaging for Debian