diff options
| author | Michael Biebl <biebl@debian.org> | 2010-12-05 04:26:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-12-05 04:26:47 +0100 |
| commit | 602ec1e2e06c6cbb92dc2da2ab2ebfe433a7ef94 (patch) | |
| tree | c3e336e21ad50568e8c9775195d43734a8e50360 /debian/changelog | |
| parent | 29b523273500fbeeb296763e7de0a2aea9476772 (diff) | |
| parent | 44eff6984a48b7ef12115ab6f06c1199f969efcc (diff) | |
Merge branch 'master' into experimental
Conflicts: debian/changelog debian/patches/series
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c13666c0..934c8acd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,20 @@ network-manager (0.8.2-1) UNRELEASED; urgency=low -- Michael Biebl <biebl@debian.org> Mon, 29 Nov 2010 19:03:34 +0100 +network-manager (0.8.1-6) unstable; urgency=low + + * debian/patches/40-umanaged-interfaces.patch + - For devices to be marked unmanaged, do not require a valid connection + configuration. (Closes: #569215) + * debian/patches/50-bridge-interfaces.patch + - Parse bridge configurations in /etc/network/interfaces and add + interfaces defined via bridge_ports to well_known_interfaces. This + allows to mark those interfaces as unmanaged if managed=false. + The "all" keyword and regexes are not supported and simply skipped. + (Closes: #530335) + + -- Michael Biebl <biebl@debian.org> Sat, 04 Dec 2010 17:11:13 +0100 + network-manager (0.8.1-5) unstable; urgency=low * Update Vcs-* fields: Move packaging from svn to git. |