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

[Andrew Pollock]

The following commit has been merged in the master branch:
commit 304c3743d3f6f39e23a3702275569e6902518b0a
Author: Andrew Pollock <apollock at debian.org>
Date:   Sun Jan 8 13:15:21 2012 -0800

    Correctly fix #648140
    
    Turns out I was asleep at the keyboard last night and didn't realise that the change I
    made in f0c0083402178590d989f81cae4bbf90d1a05cac didn't build successfully

diff --git a/debian/changelog b/debian/changelog
index ea31f7a..e5c7141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,8 @@
-isc-dhcp (4.2.2-4) UNRELEASED; urgency=low
+isc-dhcp (4.2.2-3) UNRELEASED; urgency=low
 
   * debian/control: remove transitional packages
   * debian/rules: apply the intent of Pierre Chifflier's patch to enable
     hardening options (closes: #644413)
-
- -- Andrew Pollock <apollock at debian.org>  Sun, 08 Jan 2012 09:47:17 -0800
-
-isc-dhcp (4.2.2-3) unstable; urgency=low
-
   * debian/control: also add inetutils-ping to the dependencies for
     isc-dhcp-client on hurd (closes: #648140)
 
diff --git a/debian/control b/debian/control
index 69a88ff..b7e4025 100644
--- a/debian/control
+++ b/debian/control
@@ -89,7 +89,7 @@ Description: 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 [kfreebsd-any, hurd-any], ${shlibs:Depends}, ${misc:Depends}
+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)

-- 
ISC DHCP packaging for Debian