From 1bc4f5406954093d6967a9482aea74b4338981ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20P=2E=20M=C3=B6ller?= Date: Thu, 4 Jul 2019 12:10:44 -0700 Subject: [PATCH] Changed connection editor to nm-connection-editor Summary: Changed connection editor to nm-connection-editor from network-manager-gnome Test Plan: check if nm-tray open nm-connection-editor instead of nmtui Reviewers: wxl, tsimonq2 Reviewed By: wxl, tsimonq2 Subscribers: hmollercl Differential Revision: https://phab.lubuntu.me/D16 --- debian/changelog | 6 ++++++ debian/patches/generalize-terminal-for-edits.patch | 10 ---------- debian/patches/nm-connection-editor.patch | 10 ++++++++++ debian/patches/series | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 debian/patches/generalize-terminal-for-edits.patch create mode 100644 debian/patches/nm-connection-editor.patch diff --git a/debian/changelog b/debian/changelog index eea6c36..caa2126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nm-tray (0.4.1-0ubuntu2) eoan; urgency=medium + + * Changed connection editor to nm-connnection-editor + + -- Hans P Möller Mon, 01 Jul 2019 10:28:06 -0400 + nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium * New upstream bugfix release. diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/generalize-terminal-for-edits.patch deleted file mode 100644 index acbb64d..0000000 --- a/debian/patches/generalize-terminal-for-edits.patch +++ /dev/null @@ -1,10 +0,0 @@ -Description: Use x-terminal emulator in lieu of xterm for connection edits. -Author: Walter Lapchynski -Bug: https://launchpad.net/bugs/1786978 ---- a/resources/nm-tray.conf -+++ b/resources/nm-tray.conf -@@ -1,3 +1,3 @@ - [General] --connectionsEditor=xterm, -e, nmtui-edit -+connectionsEditor=x-terminal-emulator, -e, nmtui-edit - enableNotifications=true diff --git a/debian/patches/nm-connection-editor.patch b/debian/patches/nm-connection-editor.patch new file mode 100644 index 0000000..78d0ca9 --- /dev/null +++ b/debian/patches/nm-connection-editor.patch @@ -0,0 +1,10 @@ +Description: Use nm-connection-editor from network-manager-gnome for connection edits. +Author: Hans P. Möller +Bug-Ubuntu: https://launchpad.net/bugs/1810095 +--- a/resources/nm-tray.conf ++++ b/resources/nm-tray.conf +@@ -1,3 +1,3 @@ + [General] +-connectionsEditor=xterm, -e, nmtui-edit ++connectionsEditor=nm-connection-editor + enableNotifications=true diff --git a/debian/patches/series b/debian/patches/series index 7cdc5d4..bce1a1c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -generalize-terminal-for-edits.patch +nm-connection-editor.patch blacklist-from-menu.patch