This is an automated email from the git hooks/post-receive script.
andrewsh pushed a commit to branch debian/sid
in repository wpa.
commit ce107d68dd4803b596d4c587215c00191e154dae
Merge: 1ae968c e6f57b4
Author: Andrew Shadura <andrewsh at debian.org>
Date: Tue Aug 9 20:04:28 2016 +0200
Merge a fix from 2.5-2.
debian/changelog | 9 ++++-
...monitor_to_attach_if_no_control_interface.patch | 26 +++++++++++++
...linux_iface_up_for_a_dedicated_p2p_device.patch | 43 ++++++++++++++++++++++
debian/patches/series | 3 ++
..._wait_for_monitor_on_p2p_device_interface.patch | 28 ++++++++++++++
5 files changed, 108 insertions(+), 1 deletion(-)
diff --cc debian/changelog
index 960a489,33f9764..f54c7fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,11 +1,15 @@@
-wpa (2.5-2) unstable; urgency=medium
++wpa (2.5-2+v2.4-2) UNRELEASED; urgency=medium
+
+ * Apply patches from upstream to unbreak dedicated P2P Device support
- (hopefully closes: #833402).
++ (closes: #833402).
+
- -- Andrew Shadura <andrewsh at debian.org> Thu, 04 Aug 2016 11:17:37 +0300
++ -- Andrew Shadura <andrewsh at debian.org> Tue, 09 Aug 2016 20:02:00 +0200
+
-wpa (2.5-1) unstable; urgency=medium
+wpa (2.5-2+v2.4-1) unstable; urgency=medium
+
+ [ Ricardo Salveti de Araujo ]
+ * debian/patches/dbus-fix-operations-for-p2p-mgmt.patch: fix operations
+ when P2P management interface is used (LP: #1482439)
[ Stefan Lippers-Hollmann ]
* wpasupplicant: install systemd unit (Closes: #766746).
@@@ -55,12 -52,12 +62,12 @@@
back missing Wifi connection after resuming. (LP: #1422143)
[ Andrew Shadura ]
++ * Backout 2.5 release, switch to 2.4 (see #833507 for details).
* New upstream release (Closes: #806889).
* Refresh patches, drop patches applied upstream.
-- * Fix pkcs11 OpenSSL engine initialisation (Closes: #827253).
* Update Vcs-* to point to Git.
- -- Andrew Shadura <andrewsh at debian.org> Sun, 31 Jul 2016 18:05:59 +0300
+ -- Andrew Shadura <andrewsh at debian.org> Fri, 05 Aug 2016 20:45:14 +0200
wpa (2.3-2.4) unstable; urgency=medium
diff --cc debian/patches/series
index 9dec43c,3c9ca88..70bc8db
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -26,4 -14,7 +26,7 @@@ wpa_supplicant_fix-dependency-odering-w
2016-1/0003-Remove-newlines-from-wpa_supplicant-config-network-o.patch
2016-1/0004-Reject-SET_CRED-commands-with-newline-characters-in-.patch
2016-1/0005-Reject-SET-commands-with-newline-characters-in-the-s.patch
-openssl-initialise-pkcs-11.patch
+dbus-fix-operations-for-p2p-mgmt.patch
+ nl80211_dont_call_linux_iface_up_for_a_dedicated_p2p_device.patch
+ do_not_wait_for_monitor_to_attach_if_no_control_interface.patch
-wpa_supplicant_do_not_wait_for_monitor_on_p2p_device_interface.patch
++wpa_supplicant_do_not_wait_for_monitor_on_p2p_device_interface.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wpa.git