diff -u isc-dhcp-4.1.1-P1/debian/changelog isc-dhcp-4.1.1-P1/debian/changelog --- isc-dhcp-4.1.1-P1/debian/changelog +++ isc-dhcp-4.1.1-P1/debian/changelog @@ -1,4 +1,4 @@ -isc-dhcp (4.1.1-P1-11ubuntu1~ppa2) natty; urgency=low +isc-dhcp (4.1.1-P1-11ubuntu1~ppa3) natty; urgency=low * Resynchronise with Debian. Remaining changes: - Deroot server (Debian #308832). @@ -40,6 +40,9 @@ * Make isc-dhcp-server depend on adduser for its postinst. * Fix configure test for ber_init to work correctly with 'ld --no-add-needed'. + * isc-dhcp-client Breaks: network-manager (<< 0.8.2~rc1), since earlier + versions were patched in Ubuntu to hardcode assumptions for + dhcp3-client. -- Colin Watson Wed, 03 Nov 2010 16:19:15 +0000 diff -u isc-dhcp-4.1.1-P1/debian/control isc-dhcp-4.1.1-P1/debian/control --- isc-dhcp-4.1.1-P1/debian/control +++ isc-dhcp-4.1.1-P1/debian/control @@ -95,6 +95,7 @@ Provides: dhcp3-client Conflicts: dhcp-client (<< 3.0), samba-common (<< 3.0.0beta1-2), resolvconf (<= 1.45), ifupdown (<< 0.6.8+nmu3) Replaces: dhcp3-client +Breaks: network-manager (<< 0.8.2~rc1) Description: ISC DHCP client This is the client from the Internet Software Consortium's implementation of DHCP. For more information visit http://www.isc.org.