From 13e2322cb21a074eff95c5d79dee7195eaca0ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20P=2E=20M=C3=B6ller?= Date: Wed, 12 Feb 2020 17:12:51 -0800 Subject: [PATCH] Added nm-tray.conf to xdg-Lubuntu so nm-connection-editor is default. Bump standards, apply new debhelper and compat norms Summary: Added nm-tray to xdg-Lubuntu with nm-connection editor Test Plan: check if nm-tray uses nm-connection-editor instead of nmtui Reviewers: wxl Reviewed By: wxl Subscribers: kc2bez, wxl Differential Revision: https://phab.lubuntu.me/D82 --- debian/changelog | 8 ++++++++ debian/compat | 1 - debian/control | 5 +++-- src/etc/xdg/xdg-Lubuntu/nm-tray/nm-tray.conf | 2 ++ 4 files changed, 13 insertions(+), 3 deletions(-) delete mode 100644 debian/compat create mode 100644 src/etc/xdg/xdg-Lubuntu/nm-tray/nm-tray.conf diff --git a/debian/changelog b/debian/changelog index ef34530..f3a28b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +lubuntu-default-settings (20.04.3) focal; urgency=medium + + * Added nm-tray.conf in xdg for connection-editor + * Bump standards version, no changes needed + * Changed new debhelper and compat definition + + -- Hans P. Möller Mon, 10 Feb 2020 19:33:03 -0300 + lubuntu-default-settings (20.04.2) focal; urgency=medium * Added SAL_USE_VCLPLUGIN=qt5 env variable in session.conf. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index c1198b2..5c3b507 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,12 @@ Section: x11 Priority: optional Maintainer: Lubuntu Developers Uploaders: Simon Quigley -Build-Depends: debhelper (>= 12), intltool -Standards-Version: 4.4.0 +Build-Depends: debhelper-compat (= 12), intltool +Standards-Version: 4.5.0 Homepage: https://lubuntu.me Vcs-Browser: https://git.launchpad.net/lubuntu-default-settings?h=master Vcs-Git: https://git.launchpad.net/lubuntu-default-settings +Rules-Requires-Root: no Package: lubuntu-default-settings Architecture: all diff --git a/src/etc/xdg/xdg-Lubuntu/nm-tray/nm-tray.conf b/src/etc/xdg/xdg-Lubuntu/nm-tray/nm-tray.conf new file mode 100644 index 0000000..2c1e3e3 --- /dev/null +++ b/src/etc/xdg/xdg-Lubuntu/nm-tray/nm-tray.conf @@ -0,0 +1,2 @@ +[General] +connectionsEditor=nm-connection-editor