diff --git a/Makefile b/Makefile index bfdf06c..96e2b6c 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: install install: mkdir -pv $(DESTDIR) - cp -a etc usr $(DESTDIR)/. + cp -a src/etc src/usr $(DESTDIR)/. # po generation for i in $(SUBDIRS); do \ make -C $(DESTDIR)/$$i; \ diff --git a/debian/20-qlubuntu.conf b/debian/20-qlubuntu.conf deleted file mode 100644 index 3c08a3d..0000000 --- a/debian/20-qlubuntu.conf +++ /dev/null @@ -1,2 +0,0 @@ -[SeatDefaults] -user-session=qlubuntu diff --git a/debian/changelog b/debian/changelog index e05776e..a7d1f15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,23 @@ lubuntu-default-settings (0.40) UNRELEASED; urgency=medium + [ Julien Lavergne ] * usr/share/xsessions/QLubuntu.desktop - Use LXQt as environment for the Qt session. - -- Julien Lavergne Mon, 12 May 2014 22:10:53 +0200 + [ Unit 193 ] + * Move etc/ and usr/ under src/ + * Update debhelper compat to level 9. + * Update standards-version to 3.9.5. + * qlubuntu-default-session: Alternatively depend on lxqt-lightdm-greeter. + * d/copyright: Update to copyright format 1.0, update copyright years. + * d/copyright: Set Julien Lavergne as Upstream-Contact. + * d/maintscript: Move lightdm config to usr/share, this follows standard + lightdm config such that the file is removed when the package is. + * Move d/20-*.conf to src/usr/share/lightdm/lightdm.conf.d/ + * d/rules: Call dh_install with --fail-missing. + * 20-qlubuntu.conf: The session name is QLubuntu, not qlubuntu. + + -- Julien Lavergne Mon, 12 May 2014 22:10:53 +0200 lubuntu-default-settings (0.39) trusty; urgency=medium diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 25d5089..284daee 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: lubuntu-default-settings Section: x11 Priority: optional Maintainer: Julien Lavergne -Build-Depends: debhelper (>= 8.1.0~), +Build-Depends: debhelper (>= 9), intltool -Standards-Version: 3.8.3 +Standards-Version: 3.9.5 Homepage: https://launchpad.net/~lubuntu-desktop Vcs-Bzr: lp:lubuntu-default-settings Vcs-Browser: http://bazaar.launchpad.net/~lubuntu-dev/lubuntu-default-settings/trunk/files @@ -78,7 +78,7 @@ Package: qlubuntu-default-session Architecture: all Depends: ${misc:Depends}, lubuntu-default-settings, - razorqt-lightdm-greeter (>= 0.5.2), + razorqt-lightdm-greeter (>= 0.5.2) | lxqt-lightdm-greeter, lubuntu-extra-sessions Provides: razorqt-lightdm-greeter-config Description: Set default session to QLubuntu version diff --git a/debian/copyright b/debian/copyright index 01358ee..c0114bb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,22 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Lubuntu Default Settings -Upstream-Maintainer: Lubuntu Team +Upstream-Contact: Julien Lavergne Files: * -Copyright: Copyright 2009, Julien Lavergne +Copyright: Copyright 2009-2014, Julien Lavergne License: GPL-2+ - On Debian systems the full text of the GNU General Public License can be found - in the `/usr/share/common-licenses/GPL-2' file. + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/lubuntu-default-session.install b/debian/lubuntu-default-session.install index 58066fc..37d228c 100644 --- a/debian/lubuntu-default-session.install +++ b/debian/lubuntu-default-session.install @@ -1 +1 @@ -debian/20-lubuntu.conf etc/lightdm/lightdm.conf.d/ +usr/share/lightdm/lightdm.conf.d/20-lubuntu.conf diff --git a/debian/lubuntu-nexus7-default-session.install b/debian/lubuntu-nexus7-default-session.install index 67f3f7e..afe72c1 100644 --- a/debian/lubuntu-nexus7-default-session.install +++ b/debian/lubuntu-nexus7-default-session.install @@ -1 +1 @@ -debian/20-lubuntu-nexus7.conf etc/lightdm/lightdm.conf.d/ +usr/share/lightdm/lightdm.conf.d/20-lubuntu-nexus7.conf diff --git a/debian/lxgames-default-session.install b/debian/lxgames-default-session.install index 4ec1d88..6356126 100644 --- a/debian/lxgames-default-session.install +++ b/debian/lxgames-default-session.install @@ -1 +1 @@ -debian/20-lxgames.conf etc/lightdm/lightdm.conf.d/ +usr/share/lightdm/lightdm.conf.d/20-lxgames.conf diff --git a/debian/maintscript b/debian/maintscript index b3633ea..b430320 100644 --- a/debian/maintscript +++ b/debian/maintscript @@ -1 +1,5 @@ mv_conffile /etc/xdg/pcmanfm/lubuntu.conf /etc/xdg/pcmanfm/lubuntu/pcmanfm.conf 0.15 +rm_conffile /etc/lightdm/lightdm.conf.d/20-lubuntu.conf 0.40 +rm_conffile /etc/lightdm/lightdm.conf.d/20-lubuntu-nexus7.conf 0.40 +rm_conffile /etc/lightdm/lightdm.conf.d/20-lxgames.conf 0.40 +rm_conffile /etc/lightdm/lightdm.conf.d/20-qlubuntu.conf 0.40 diff --git a/debian/qlubuntu-default-session.install b/debian/qlubuntu-default-session.install index 604777a..78f990d 100644 --- a/debian/qlubuntu-default-session.install +++ b/debian/qlubuntu-default-session.install @@ -1 +1 @@ -debian/20-qlubuntu.conf etc/lightdm/lightdm.conf.d/ +usr/share/lightdm/lightdm.conf.d/20-qlubuntu.conf diff --git a/debian/rules b/debian/rules index 2c4b17a..a36f4b5 100755 --- a/debian/rules +++ b/debian/rules @@ -4,3 +4,6 @@ override_dh_auto_build: $(MAKE) DESTDIR=$(CURDIR)/debian/tmp + +override_dh_install: + dh_install --fail-missing diff --git a/etc/xdg/lubuntu/applications/defaults.list b/src/etc/xdg/lubuntu/applications/defaults.list similarity index 100% rename from etc/xdg/lubuntu/applications/defaults.list rename to src/etc/xdg/lubuntu/applications/defaults.list diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/src/etc/xdg/lubuntu/libfm/libfm.conf similarity index 100% rename from etc/xdg/lubuntu/libfm/libfm.conf rename to src/etc/xdg/lubuntu/libfm/libfm.conf diff --git a/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf b/src/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf similarity index 100% rename from etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf rename to src/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf diff --git a/etc/xdg/lubuntu/lxdm/lxdm.conf b/src/etc/xdg/lubuntu/lxdm/lxdm.conf similarity index 100% rename from etc/xdg/lubuntu/lxdm/lxdm.conf rename to src/etc/xdg/lubuntu/lxdm/lxdm.conf diff --git a/etc/xdg/lubuntu/lxterminal/lxterminal.conf b/src/etc/xdg/lubuntu/lxterminal/lxterminal.conf similarity index 100% rename from etc/xdg/lubuntu/lxterminal/lxterminal.conf rename to src/etc/xdg/lubuntu/lxterminal/lxterminal.conf diff --git a/etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu b/src/etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu similarity index 100% rename from etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu rename to src/etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu diff --git a/etc/xdg/lubuntu/menus/lxde-applications.menu b/src/etc/xdg/lubuntu/menus/lxde-applications.menu similarity index 100% rename from etc/xdg/lubuntu/menus/lxde-applications.menu rename to src/etc/xdg/lubuntu/menus/lxde-applications.menu diff --git a/etc/xdg/lubuntu/menus/lxgames-applications.menu b/src/etc/xdg/lubuntu/menus/lxgames-applications.menu similarity index 100% rename from etc/xdg/lubuntu/menus/lxgames-applications.menu rename to src/etc/xdg/lubuntu/menus/lxgames-applications.menu diff --git a/etc/xdg/lxsession/LX-Games/autostart b/src/etc/xdg/lxsession/LX-Games/autostart similarity index 100% rename from etc/xdg/lxsession/LX-Games/autostart rename to src/etc/xdg/lxsession/LX-Games/autostart diff --git a/etc/xdg/lxsession/LX-Games/conffiles.conf b/src/etc/xdg/lxsession/LX-Games/conffiles.conf similarity index 100% rename from etc/xdg/lxsession/LX-Games/conffiles.conf rename to src/etc/xdg/lxsession/LX-Games/conffiles.conf diff --git a/etc/xdg/lxsession/LX-Games/desktop.conf b/src/etc/xdg/lxsession/LX-Games/desktop.conf similarity index 100% rename from etc/xdg/lxsession/LX-Games/desktop.conf rename to src/etc/xdg/lxsession/LX-Games/desktop.conf diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/autostart b/src/etc/xdg/lxsession/Lubuntu-Netbook/autostart similarity index 100% rename from etc/xdg/lxsession/Lubuntu-Netbook/autostart rename to src/etc/xdg/lxsession/Lubuntu-Netbook/autostart diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf b/src/etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf similarity index 100% rename from etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf rename to src/etc/xdg/lxsession/Lubuntu-Netbook/conffiles.conf diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf b/src/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf similarity index 100% rename from etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf rename to src/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf diff --git a/etc/xdg/lxsession/Lubuntu-Nexus7/autostart b/src/etc/xdg/lxsession/Lubuntu-Nexus7/autostart similarity index 100% rename from etc/xdg/lxsession/Lubuntu-Nexus7/autostart rename to src/etc/xdg/lxsession/Lubuntu-Nexus7/autostart diff --git a/etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf b/src/etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf similarity index 100% rename from etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf rename to src/etc/xdg/lxsession/Lubuntu-Nexus7/conffiles.conf diff --git a/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf b/src/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf similarity index 100% rename from etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf rename to src/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/src/etc/xdg/lxsession/Lubuntu/autostart similarity index 100% rename from etc/xdg/lxsession/Lubuntu/autostart rename to src/etc/xdg/lxsession/Lubuntu/autostart diff --git a/etc/xdg/lxsession/Lubuntu/conffiles.conf b/src/etc/xdg/lxsession/Lubuntu/conffiles.conf similarity index 100% rename from etc/xdg/lxsession/Lubuntu/conffiles.conf rename to src/etc/xdg/lxsession/Lubuntu/conffiles.conf diff --git a/etc/xdg/lxsession/Lubuntu/desktop.conf b/src/etc/xdg/lxsession/Lubuntu/desktop.conf similarity index 100% rename from etc/xdg/lxsession/Lubuntu/desktop.conf rename to src/etc/xdg/lxsession/Lubuntu/desktop.conf diff --git a/etc/xdg/lxsession/QLubuntu/autostart b/src/etc/xdg/lxsession/QLubuntu/autostart similarity index 100% rename from etc/xdg/lxsession/QLubuntu/autostart rename to src/etc/xdg/lxsession/QLubuntu/autostart diff --git a/etc/xdg/lxsession/QLubuntu/conffiles.conf b/src/etc/xdg/lxsession/QLubuntu/conffiles.conf similarity index 100% rename from etc/xdg/lxsession/QLubuntu/conffiles.conf rename to src/etc/xdg/lxsession/QLubuntu/conffiles.conf diff --git a/etc/xdg/lxsession/QLubuntu/desktop.conf b/src/etc/xdg/lxsession/QLubuntu/desktop.conf similarity index 100% rename from etc/xdg/lxsession/QLubuntu/desktop.conf rename to src/etc/xdg/lxsession/QLubuntu/desktop.conf diff --git a/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf b/src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf similarity index 100% rename from etc/xdg/pcmanfm/lubuntu/pcmanfm.conf rename to src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf diff --git a/usr/bin/lubuntu-logout b/src/usr/bin/lubuntu-logout similarity index 100% rename from usr/bin/lubuntu-logout rename to src/usr/bin/lubuntu-logout diff --git a/usr/bin/openbox-lubuntu b/src/usr/bin/openbox-lubuntu similarity index 100% rename from usr/bin/openbox-lubuntu rename to src/usr/bin/openbox-lubuntu diff --git a/usr/share/applications/lubuntu-logout.desktop b/src/usr/share/applications/lubuntu-logout.desktop similarity index 100% rename from usr/share/applications/lubuntu-logout.desktop rename to src/usr/share/applications/lubuntu-logout.desktop diff --git a/usr/share/applications/lubuntu-nexus7-identica.desktop b/src/usr/share/applications/lubuntu-nexus7-identica.desktop similarity index 100% rename from usr/share/applications/lubuntu-nexus7-identica.desktop rename to src/usr/share/applications/lubuntu-nexus7-identica.desktop diff --git a/usr/share/applications/lubuntu-nexus7-rotate.desktop b/src/usr/share/applications/lubuntu-nexus7-rotate.desktop similarity index 100% rename from usr/share/applications/lubuntu-nexus7-rotate.desktop rename to src/usr/share/applications/lubuntu-nexus7-rotate.desktop diff --git a/usr/share/applications/lubuntu-screenlock.desktop b/src/usr/share/applications/lubuntu-screenlock.desktop similarity index 100% rename from usr/share/applications/lubuntu-screenlock.desktop rename to src/usr/share/applications/lubuntu-screenlock.desktop diff --git a/usr/share/gdm/autostart/LoginWindow/lxsession.desktop b/src/usr/share/gdm/autostart/LoginWindow/lxsession.desktop similarity index 100% rename from usr/share/gdm/autostart/LoginWindow/lxsession.desktop rename to src/usr/share/gdm/autostart/LoginWindow/lxsession.desktop diff --git a/debian/20-lubuntu-nexus7.conf b/src/usr/share/lightdm/lightdm.conf.d/20-lubuntu-nexus7.conf similarity index 100% rename from debian/20-lubuntu-nexus7.conf rename to src/usr/share/lightdm/lightdm.conf.d/20-lubuntu-nexus7.conf diff --git a/debian/20-lubuntu.conf b/src/usr/share/lightdm/lightdm.conf.d/20-lubuntu.conf similarity index 100% rename from debian/20-lubuntu.conf rename to src/usr/share/lightdm/lightdm.conf.d/20-lubuntu.conf diff --git a/debian/20-lxgames.conf b/src/usr/share/lightdm/lightdm.conf.d/20-lxgames.conf similarity index 100% rename from debian/20-lxgames.conf rename to src/usr/share/lightdm/lightdm.conf.d/20-lxgames.conf diff --git a/src/usr/share/lightdm/lightdm.conf.d/20-qlubuntu.conf b/src/usr/share/lightdm/lightdm.conf.d/20-qlubuntu.conf new file mode 100644 index 0000000..bb37c2d --- /dev/null +++ b/src/usr/share/lightdm/lightdm.conf.d/20-qlubuntu.conf @@ -0,0 +1,2 @@ +[SeatDefaults] +user-session=QLubuntu diff --git a/usr/share/lubuntu/leafpad/leafpadrc b/src/usr/share/lubuntu/leafpad/leafpadrc similarity index 100% rename from usr/share/lubuntu/leafpad/leafpadrc rename to src/usr/share/lubuntu/leafpad/leafpadrc diff --git a/usr/share/lubuntu/openbox/menu.xml b/src/usr/share/lubuntu/openbox/menu.xml similarity index 100% rename from usr/share/lubuntu/openbox/menu.xml rename to src/usr/share/lubuntu/openbox/menu.xml diff --git a/usr/share/lubuntu/openbox/nexus-rc.xml b/src/usr/share/lubuntu/openbox/nexus-rc.xml similarity index 100% rename from usr/share/lubuntu/openbox/nexus-rc.xml rename to src/usr/share/lubuntu/openbox/nexus-rc.xml diff --git a/usr/share/lubuntu/openbox/rc.xml b/src/usr/share/lubuntu/openbox/rc.xml similarity index 100% rename from usr/share/lubuntu/openbox/rc.xml rename to src/usr/share/lubuntu/openbox/rc.xml diff --git a/usr/share/lubuntu/pcmanfm-qt/lxqt/settings.conf b/src/usr/share/lubuntu/pcmanfm-qt/lxqt/settings.conf similarity index 100% rename from usr/share/lubuntu/pcmanfm-qt/lxqt/settings.conf rename to src/usr/share/lubuntu/pcmanfm-qt/lxqt/settings.conf diff --git a/usr/share/lubuntu/pcmanfm/main.lubuntu b/src/usr/share/lubuntu/pcmanfm/main.lubuntu similarity index 100% rename from usr/share/lubuntu/pcmanfm/main.lubuntu rename to src/usr/share/lubuntu/pcmanfm/main.lubuntu diff --git a/usr/share/lubuntu/qt/Trolltech-qt-session.conf b/src/usr/share/lubuntu/qt/Trolltech-qt-session.conf similarity index 100% rename from usr/share/lubuntu/qt/Trolltech-qt-session.conf rename to src/usr/share/lubuntu/qt/Trolltech-qt-session.conf diff --git a/usr/share/lubuntu/qt/Trolltech.conf b/src/usr/share/lubuntu/qt/Trolltech.conf similarity index 100% rename from usr/share/lubuntu/qt/Trolltech.conf rename to src/usr/share/lubuntu/qt/Trolltech.conf diff --git a/usr/share/lubuntu/xscreensaver/xscreensaver b/src/usr/share/lubuntu/xscreensaver/xscreensaver similarity index 100% rename from usr/share/lubuntu/xscreensaver/xscreensaver rename to src/usr/share/lubuntu/xscreensaver/xscreensaver diff --git a/usr/share/lxpanel/profile/Lubuntu-Nexus7/config b/src/usr/share/lxpanel/profile/Lubuntu-Nexus7/config similarity index 100% rename from usr/share/lxpanel/profile/Lubuntu-Nexus7/config rename to src/usr/share/lxpanel/profile/Lubuntu-Nexus7/config diff --git a/usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/bottom b/src/usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/bottom similarity index 100% rename from usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/bottom rename to src/usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/bottom diff --git a/usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/top b/src/usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/top similarity index 100% rename from usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/top rename to src/usr/share/lxpanel/profile/Lubuntu-Nexus7/panels/top diff --git a/usr/share/lxpanel/profile/Lubuntu/config b/src/usr/share/lxpanel/profile/Lubuntu/config similarity index 100% rename from usr/share/lxpanel/profile/Lubuntu/config rename to src/usr/share/lxpanel/profile/Lubuntu/config diff --git a/usr/share/lxpanel/profile/Lubuntu/panels/panel b/src/usr/share/lxpanel/profile/Lubuntu/panels/panel similarity index 100% rename from usr/share/lxpanel/profile/Lubuntu/panels/panel rename to src/usr/share/lxpanel/profile/Lubuntu/panels/panel diff --git a/usr/share/upstart/sessions/lxsession.conf b/src/usr/share/upstart/sessions/lxsession.conf similarity index 100% rename from usr/share/upstart/sessions/lxsession.conf rename to src/usr/share/upstart/sessions/lxsession.conf diff --git a/usr/share/xsessions/Lubuntu-Netbook.desktop b/src/usr/share/xsessions/Lubuntu-Netbook.desktop similarity index 100% rename from usr/share/xsessions/Lubuntu-Netbook.desktop rename to src/usr/share/xsessions/Lubuntu-Netbook.desktop diff --git a/usr/share/xsessions/Lubuntu.desktop b/src/usr/share/xsessions/Lubuntu.desktop similarity index 100% rename from usr/share/xsessions/Lubuntu.desktop rename to src/usr/share/xsessions/Lubuntu.desktop diff --git a/usr/share/xsessions/QLubuntu.desktop b/src/usr/share/xsessions/QLubuntu.desktop similarity index 100% rename from usr/share/xsessions/QLubuntu.desktop rename to src/usr/share/xsessions/QLubuntu.desktop diff --git a/usr/share/xsessions/lubuntu-nexus7.desktop b/src/usr/share/xsessions/lubuntu-nexus7.desktop similarity index 100% rename from usr/share/xsessions/lubuntu-nexus7.desktop rename to src/usr/share/xsessions/lubuntu-nexus7.desktop diff --git a/usr/share/xsessions/lxgames.desktop b/src/usr/share/xsessions/lxgames.desktop similarity index 100% rename from usr/share/xsessions/lxgames.desktop rename to src/usr/share/xsessions/lxgames.desktop