From 68f9946a1c3c5c534d6b2beab9fd6aa20d49f388 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 24 Nov 2015 00:13:48 +0100 Subject: Rebase patches. --- ...ix-parse-commandline-options-into-correct.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 debian/patches/config-bugfix-parse-commandline-options-into-correct.patch (limited to 'debian/patches/config-bugfix-parse-commandline-options-into-correct.patch') diff --git a/debian/patches/config-bugfix-parse-commandline-options-into-correct.patch b/debian/patches/config-bugfix-parse-commandline-options-into-correct.patch deleted file mode 100644 index f9ecf21f..00000000 --- a/debian/patches/config-bugfix-parse-commandline-options-into-correct.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: =?utf-8?q?Ulrich_=C3=96lmann?= -Date: Thu, 27 Aug 2015 22:18:55 +0200 -Subject: config: bugfix: parse commandline options into correct object -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Config related commandline options should be parsed into a function argument but -were instead parsed into an object with local scope. As a result none of them -had any impact. - -Signed-off-by: Ulrich Ölmann - -Fixes: b4ad7434a87c165a77b615accbe1868a9df9221b - -https://mail.gnome.org/archives/networkmanager-list/2015-August/msg00033.html - -(cherry-picked from commit 8a22a98157f7f6773f3d1f295419569c6c880a47) ---- - src/main.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index 495262e..a9bc479 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -246,7 +246,6 @@ do_early_setup (int *argc, char **argv[], NMConfigCmdLineOptions *config_cli) - {NULL} - }; - -- config_cli = nm_config_cmd_line_options_new (); - if (!nm_main_utils_early_setup ("NetworkManager", - argc, - argv, -- cgit 1.3.0-6-gf8a5