[pkg-wpa-devel] [wpa] 03/04: Reformat patches to please gbp-pq.

Andrew Shadura andrewsh at debian.org
Tue Dec 20 21:13:16 UTC 2016 

This is an automated email from the git hooks/post-receive script.

andrewsh pushed a commit to branch debian/master
in repository wpa.

commit 99cb2ce40af901c3a973fb4642bf5bd4cf2b9ca2
Author: Andrew Shadura <andrewsh at debian.org>
Date:   Tue Dec 20 22:00:40 2016 +0100

    Reformat patches to please gbp-pq.
---
 debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch   |  9 +++++----
 debian/patches/02_dbus_group_policy.patch                     | 11 +++++++----
 debian/patches/06_wpa_gui_menu_exec_path.patch                |  8 +++++---
 debian/patches/07_dbus_service_syslog.patch                   |  5 +++--
 debian/patches/12_wpa_gui_knotify_support.patch               |  5 +++--
 debian/patches/networkd-driver-fallback.patch                 |  5 +++--
 ...licant_fix-dependency-odering-when-invoked-with-dbus.patch |  5 +++--
 7 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch b/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
index 06788e3..f4e69df 100644
--- a/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
+++ b/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
@@ -1,7 +1,8 @@
-Description: Use pkg-config for libpcsclite linkage flags
- At least in debian, we can rely on pkg-config being available and
- returning more accurate ldflags.
-Author: Reinhard Tartler <siretart at tauware.de>
+From: Reinhard Tartler <siretart at tauware.de>
+Subject: Use pkg-config for libpcsclite linkage flags
+
+At least in debian, we can rely on pkg-config being available and
+returning more accurate ldflags.
 ---
 diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
 index f3e86c1de6c0..ba3fe350675a 100644
diff --git a/debian/patches/02_dbus_group_policy.patch b/debian/patches/02_dbus_group_policy.patch
index af2e483..07fde87 100644
--- a/debian/patches/02_dbus_group_policy.patch
+++ b/debian/patches/02_dbus_group_policy.patch
@@ -1,7 +1,10 @@
-Description: Debian does not use pam_console but uses group membership
- to control access to D-Bus. Activating both options in the conf file
- makes it work on Debian and Ubuntu.
-Author: Michael Biebl <biebl at debian.org>
+From: Michael Biebl <biebl at debian.org>
+Subject: Add D-Bus group policy
+
+Debian does not use pam_console but uses group membership
+to control access to D-Bus. Activating both options in the conf file
+makes it work on Debian and Ubuntu.
+
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;bug=412179
 ---
 --- a/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
diff --git a/debian/patches/06_wpa_gui_menu_exec_path.patch b/debian/patches/06_wpa_gui_menu_exec_path.patch
index c0a5807..9fbd72f 100644
--- a/debian/patches/06_wpa_gui_menu_exec_path.patch
+++ b/debian/patches/06_wpa_gui_menu_exec_path.patch
@@ -1,6 +1,8 @@
-Description: Debian specific patch to desktop meny entry, so that we may exec
- wpa_gui which being in /usr/sbin may not be in the PATH
-Author: Kel Modderman <kel at otaku42.de>
+From: Kel Modderman <kel at otaku42.de>
+Subject: Use full executable path into wpa_gui.desktop
+
+Debian specific patch to desktop meny entry, so that we may exec
+wpa_gui which being in /usr/sbin may not be in the PATH
 ---
 --- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
 +++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
diff --git a/debian/patches/07_dbus_service_syslog.patch b/debian/patches/07_dbus_service_syslog.patch
index b9aae4e..003e0aa 100644
--- a/debian/patches/07_dbus_service_syslog.patch
+++ b/debian/patches/07_dbus_service_syslog.patch
@@ -1,8 +1,9 @@
-Description: Tweak D-Bus/systemd service activation configuration files:
+From: Kel Modderman <kel at otaku42.de>
+Subject: Tweak D-Bus/systemd service activation configuration files:
+
  * log wpa_supplicant messages to syslog
  * activate control socket interface so that wpa_cli can be used by D-Bus
    activated wpa_supplicant daemon
-Author: Kel Modderman <kel at otaku42.de>
 ---
 diff --git a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
 index a75918f9380b..714ef9ea556f 100644
diff --git a/debian/patches/12_wpa_gui_knotify_support.patch b/debian/patches/12_wpa_gui_knotify_support.patch
index eeecfc8..452b18b 100644
--- a/debian/patches/12_wpa_gui_knotify_support.patch
+++ b/debian/patches/12_wpa_gui_knotify_support.patch
@@ -1,5 +1,6 @@
-Description: Use KDE's KNotify when running under KDE
-Author: Raphael Geissert <geissert at debian.org>
+From: Raphael Geissert <geissert at debian.org>
+Subject: Use KDE's KNotify when running under KDE
+
 Bug-Debian: http://bugs.debian.org/582793
 ---
 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
diff --git a/debian/patches/networkd-driver-fallback.patch b/debian/patches/networkd-driver-fallback.patch
index a233711..2696409 100644
--- a/debian/patches/networkd-driver-fallback.patch
+++ b/debian/patches/networkd-driver-fallback.patch
@@ -1,7 +1,8 @@
-wpasupplicant: configure driver fallback for networkd
+From: Stefan Lippers-Hollmann <s.l-h at gmx.de>
+Subject: wpasupplicant: configure driver fallback for networkd
 
 Signed-off-by: Stefan Lippers-Hollmann <s.l-h at gmx.de>
-
+---
 --- a/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
 +++ b/wpa_supplicant/systemd/wpa_supplicant.service.arg.in
 @@ -9,7 +9,7 @@ Wants=network.target
diff --git a/debian/patches/wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch b/debian/patches/wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch
index 824b0d5..976b7be 100644
--- a/debian/patches/wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch
+++ b/debian/patches/wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch
@@ -1,4 +1,5 @@
-wpa_supplicant: Fix dependency odering when invoked with DBus
+From: Stefan Lippers-Hollmann <s.l-h at gmx.de>
+Subject: wpa_supplicant: Fix dependency odering when invoked with DBus
 
 Make sure that DBus isn't shut down before wpa_supplicant, as that would
 also bring down wireless links which are still holding open NFS shares.
@@ -7,7 +8,7 @@ Debian bug: https://bugs.debian.org/785579
 systemd upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=89847
 
 Signed-off-by: Stefan Lippers-Hollmann <s.l-h at gmx.de>
-
+---
 --- a/wpa_supplicant/systemd/wpa_supplicant.service.in
 +++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
 @@ -1,6 +1,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wpa.git

More information about the Pkg-wpa-devel mailing list