~racb/ubuntu/+source/ntp:merge

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

46f9a07... by Robie Basak on 2016-07-29

Changelog for AppArmor in d/ntp.dirs

6a24fa2... by Robie Basak on 2016-07-29

Create etc/apparmor.d/{force-complain,tunables}/

It looks like these were inadvertently dropped.

14:01 <rbasak> tyhicks: I'm reviewing a merge for cpaelzer and the
Ubuntu->Ubuntu diff includes this: http://paste.ubuntu.com/21398245/

14:01 <rbasak> tyhicks: do you know if this is OK please? Does
apparmor/dh-apparmor require the package to drop in these directories?

14:01 <rbasak> I suspect it's fine, but I thought I'd check.

14:05 <jdstrand> I can answer that

14:05 <jdstrand> unless someone changed dh_apparmor very recently
without us knowing, ntp.dirs should not have dropped those entries

14:05 <jdstrand> tyhicks: ^ (I answered rbasak)

180f992... by Christian Ehrhardt  on 2016-07-29

mention that dropping some fixes was due to upstream changes

1453dac... by Christian Ehrhardt  on 2016-07-29

Adapt changelog to new state of Debian (no longer dropping ppskit)

Fixes: 1cba707 Add PPS support (LP: #1512980):

a150b43... by Christian Ehrhardt  on 2016-07-29

change workding Ask -> Asked in changelog after updating deb-bug 643954

2f6c744... by Christian Ehrhardt  on 2016-07-29

Mark fixing 1567540 at the right place

In the merge header line one would assume this is "the merge bug", which
it is now. This also removes that remaining TODO in the changelog which
was meant as placeholder for this.

fixes: 349df26 changelog: mark LP 1567540 as fixed

c10610b... by Christian Ehrhardt  on 2016-07-29

Revert "changelog: d/ntpdate-debian do not ignore ntpdate.dhcp"

This reverts commit fed5fb332ea976c85bdbe53818ebba560156ee33.
Reason: following the merge review discussion we want to avoid diverging
from Debian and better what until Debian has picked it up.
Dropping for now to unblock the merge - even if we get to add it later
it doesn't have to block the merge now.

8059549... by Christian Ehrhardt  on 2016-07-29

Revert "changelog: d/ntpdate-debian allow disabling the call to ntpdate"

This reverts commit 4a4310aa315a434cf3505267f3e1696b90e51876.
Reason: following the merge review discussion we want to avoid diverging
from Debian and better what until Debian has picked it up.
Dropping for now to unblock the merge - even if we get to add it later
it doesn't have to block the merge now.

bb7879c... by Christian Ehrhardt  on 2016-07-29

Revert "changelog: provide an option to specify a custom ntp.conf"

This reverts commit c8488168090d1690c143469342f780fce925b799.
Reason: following the merge review discussion we want to avoid diverging
from Debian and better what until Debian has picked it up.
Dropping for now to unblock the merge - even if we get to add it later
it doesn't have to block the merge now.

2a9dfc3... by Christian Ehrhardt  on 2016-07-29

Revert "d/ntpdate-debian do not ignore ntpdate.dhcp"

This reverts commit b8d4e466aca1558decfc1a7ddc369b7283b4c872.
Reason: following the merge review discussion we want to avoid diverging
from Debian and better what until Debian has picked it up.
Dropping for now to unblock the merge - even if we get to add it later
it doesn't have to block the merge now.