From 590d86815e214fa866f558ff922962c24bbd6627 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 30 Apr 2016 17:57:44 +0200 Subject: [PATCH] Move lxqt files to not conflicts to lxqt-common (need to fix lxqt to read them) --- debian/control | 3 --- debian/lubuntu-default-settings.install | 2 +- src/etc/xdg/{ => xdg-Lubuntu}/lxqt/lxqt.conf | 0 src/etc/xdg/{ => xdg-Lubuntu}/lxqt/notifications.conf | 0 src/etc/xdg/{ => xdg-Lubuntu}/lxqt/session.conf | 0 src/etc/xdg/{ => xdg-Lubuntu}/lxqt/windowmanagers.conf | 0 6 files changed, 1 insertion(+), 4 deletions(-) rename src/etc/xdg/{ => xdg-Lubuntu}/lxqt/lxqt.conf (100%) rename src/etc/xdg/{ => xdg-Lubuntu}/lxqt/notifications.conf (100%) rename src/etc/xdg/{ => xdg-Lubuntu}/lxqt/session.conf (100%) rename src/etc/xdg/{ => xdg-Lubuntu}/lxqt/windowmanagers.conf (100%) diff --git a/debian/control b/debian/control index 938523a..f4f2a81 100644 --- a/debian/control +++ b/debian/control @@ -26,9 +26,6 @@ Suggests: amixer, galculator, xscreensaver, dmz-cursor-theme -Conflicts: lxqt-common -Replaces: lxqt-common -Provides: lxqt-common Description: default settings for Lubuntu Various system settings tailored for Lubuntu. diff --git a/debian/lubuntu-default-settings.install b/debian/lubuntu-default-settings.install index 7e12447..1171085 100644 --- a/debian/lubuntu-default-settings.install +++ b/debian/lubuntu-default-settings.install @@ -5,10 +5,10 @@ etc/xdg/lubuntu/lxdm/ etc/xdg/lubuntu/lxterminal/ etc/xdg/lubuntu/menus/lxde-applications.menu etc/xdg/lubuntu/menus/lxgames-applications.menu -etc/xdg/lxqt/ etc/xdg/lxsession/Lubuntu/ etc/xdg/lxsession/Lubuntu-Netbook/ etc/xdg/xdg-Lubuntu/xfce4/ +etc/xdg/xdg-Lubuntu/lxqt/ etc/xdg/pcmanfm/ usr/bin/ usr/share/applications/lubuntu-screenlock.desktop diff --git a/src/etc/xdg/lxqt/lxqt.conf b/src/etc/xdg/xdg-Lubuntu/lxqt/lxqt.conf similarity index 100% rename from src/etc/xdg/lxqt/lxqt.conf rename to src/etc/xdg/xdg-Lubuntu/lxqt/lxqt.conf diff --git a/src/etc/xdg/lxqt/notifications.conf b/src/etc/xdg/xdg-Lubuntu/lxqt/notifications.conf similarity index 100% rename from src/etc/xdg/lxqt/notifications.conf rename to src/etc/xdg/xdg-Lubuntu/lxqt/notifications.conf diff --git a/src/etc/xdg/lxqt/session.conf b/src/etc/xdg/xdg-Lubuntu/lxqt/session.conf similarity index 100% rename from src/etc/xdg/lxqt/session.conf rename to src/etc/xdg/xdg-Lubuntu/lxqt/session.conf diff --git a/src/etc/xdg/lxqt/windowmanagers.conf b/src/etc/xdg/xdg-Lubuntu/lxqt/windowmanagers.conf similarity index 100% rename from src/etc/xdg/lxqt/windowmanagers.conf rename to src/etc/xdg/xdg-Lubuntu/lxqt/windowmanagers.conf