diff -Nru zentyal-dhcp-3.1.3/ChangeLog zentyal-dhcp-3.1.4/ChangeLog --- zentyal-dhcp-3.1.3/ChangeLog 2013-09-10 21:16:26.000000000 +0000 +++ zentyal-dhcp-3.1.4/ChangeLog 2013-09-17 09:16:03.000000000 +0000 @@ -1,3 +1,5 @@ +3.1.4 + + Override daemons when migrating from 3.0 3.1.3 + Removed integration with ltsp module 3.1.2 diff -Nru zentyal-dhcp-3.1.3/debian/changelog zentyal-dhcp-3.1.4/debian/changelog --- zentyal-dhcp-3.1.3/debian/changelog 2013-09-10 21:16:26.000000000 +0000 +++ zentyal-dhcp-3.1.4/debian/changelog 2013-09-17 09:16:03.000000000 +0000 @@ -1,3 +1,9 @@ +zentyal-dhcp (3.1.4) precise; urgency=low + + * New upstream release + + -- José A. Calvo Tue, 17 Sep 2013 11:16:03 +0200 + zentyal-dhcp (3.1.3) precise; urgency=low * New upstream release diff -Nru zentyal-dhcp-3.1.3/src/EBox/DHCP.pm zentyal-dhcp-3.1.4/src/EBox/DHCP.pm --- zentyal-dhcp-3.1.3/src/EBox/DHCP.pm 2013-09-10 21:16:26.000000000 +0000 +++ zentyal-dhcp-3.1.4/src/EBox/DHCP.pm 2013-09-17 09:16:03.000000000 +0000 @@ -160,6 +160,11 @@ push (@cmds, 'chmod 0750 ' . KEYS_DIR); EBox::Sudo::root(@cmds); } + + # Upgrade from 3.0 + if (defined ($version) and (EBox::Util::Version::compare($version, '3.1') < 0)) { + $self->_overrideDaemons() if $self->configured(); + } } # Method: appArmorProfiles