From 032beb511a4d0a9abd50f17c181413817785a23f Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 18 Aug 2018 22:14:37 -0500 Subject: [PATCH] It's a native packages; so move patches over to the actual files. --- debian/changelog | 6 ++++++ debian/patches/lxqt-sudo-as-sucommand.patch | 12 ------------ debian/patches/qterminal-window-size.patch | 12 ------------ debian/patches/series | 2 -- .../xdg/xdg-Lubuntu/pcmanfm-qt/lxqt/settings.conf | 2 +- src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini | 3 +++ 6 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/lxqt-sudo-as-sucommand.patch delete mode 100644 debian/patches/qterminal-window-size.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 9bdd0ac..42453dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lubuntu-default-settings (1.11) UNRELEASED; urgency=medium + + * It's a native packages; so move patches over to the actual files. + + -- Simon Quigley Sat, 18 Aug 2018 22:13:54 -0500 + lubuntu-default-settings (1.10) cosmic; urgency=medium * Use lxqt-sudo instead of pkexec as switch user command. diff --git a/debian/patches/lxqt-sudo-as-sucommand.patch b/debian/patches/lxqt-sudo-as-sucommand.patch deleted file mode 100644 index 182c5a0..0000000 --- a/debian/patches/lxqt-sudo-as-sucommand.patch +++ /dev/null @@ -1,12 +0,0 @@ -Description: Use lxqt-sudo instead of pkexec as switch user command. -Author: Walter Lapchynski ---- a/src/etc/xdg/xdg-Lubuntu/pcmanfm-qt/lxqt/settings.conf -+++ b/src/etc/xdg/xdg-Lubuntu/pcmanfm-qt/lxqt/settings.conf -@@ -1,6 +1,6 @@ - [System] - IconThemeName=Lubuntu --SuCommand=pkexec %s -+SuCommand=lxqt-sudo %s - Terminal=qterminal - TerminalDirCommand=qterminal - TerminalExecCommand=qterminal -e %s diff --git a/debian/patches/qterminal-window-size.patch b/debian/patches/qterminal-window-size.patch deleted file mode 100644 index ff5a9be..0000000 --- a/debian/patches/qterminal-window-size.patch +++ /dev/null @@ -1,12 +0,0 @@ -Description: Set qterminal window size to upstream default. -Author: Walter Lapchynski -Bug: https://launchpad.net/bugs/1786978 ---- a/src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini -+++ b/src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini -@@ -3,3 +3,6 @@ ConfirmMultilinePaste=true - HideTabBarWithOnlyOneTab=true - fontFamily=Ubuntu Mono - fontSize=14 -+ -+[MainWindow] -+size=@Size(800 600) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 1fe10cf..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -lxqt-sudo-as-sucommand.patch -qterminal-window-size.patch diff --git a/src/etc/xdg/xdg-Lubuntu/pcmanfm-qt/lxqt/settings.conf b/src/etc/xdg/xdg-Lubuntu/pcmanfm-qt/lxqt/settings.conf index d8814d3..58faeef 100644 --- a/src/etc/xdg/xdg-Lubuntu/pcmanfm-qt/lxqt/settings.conf +++ b/src/etc/xdg/xdg-Lubuntu/pcmanfm-qt/lxqt/settings.conf @@ -1,6 +1,6 @@ [System] IconThemeName=Lubuntu -SuCommand=pkexec %s +SuCommand=lxqt-sudo %s Terminal=qterminal TerminalDirCommand=qterminal TerminalExecCommand=qterminal -e %s diff --git a/src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini b/src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini index 8837fb6..2d32781 100644 --- a/src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini +++ b/src/etc/xdg/xdg-Lubuntu/qterminal.org/qterminal.ini @@ -3,3 +3,6 @@ ConfirmMultilinePaste=true HideTabBarWithOnlyOneTab=true fontFamily=Ubuntu Mono fontSize=14 + +[MainWindow] +size=@Size(800 600)