[ 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.

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; \

debian/20-qlubuntu.conf

@@ -1,2 +0,0 @@
-[SeatDefaults]
-user-session=qlubuntu

debian/changelog

@@ -1,5 +1,6 @@
 lubuntu-default-settings (0.40) UNRELEASED; urgency=medium
 
+  [ Julien Lavergne ]
   * usr/share/xsessions/QLubuntu.desktop
    - Use LXQt as environment for the Qt session.
   * debian/control:
@@ -10,7 +11,20 @@ lubuntu-default-settings (0.40) UNRELEASED; urgency=medium
   * etc/xdg/lxsession/*/desktop.conf
    - Use Lubuntu of the icons theme.
 
- -- Julien Lavergne <gilir@freedom>  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 <gilir@ubuntu.com>  Mon, 12 May 2014 22:10:53 +0200
 
 lubuntu-default-settings (0.39) trusty; urgency=medium
 

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -2,9 +2,9 @@ Source: lubuntu-default-settings
 Section: x11
 Priority: optional
 Maintainer: Julien Lavergne <gilir@ubuntu.com>
-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
@@ -79,7 +79,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

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 <lubuntu-desktop@lists.launchpad.net>
+Upstream-Contact: Julien Lavergne <gilir@ubuntu.com>
 
 Files: *
-Copyright: Copyright 2009, Julien Lavergne <gilir@ubuntu.com>
+Copyright: Copyright 2009-2014, Julien Lavergne <gilir@ubuntu.com>
 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 <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

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

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

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

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

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

debian/rules

@@ -4,3 +4,6 @@
 
 override_dh_auto_build:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp
+
+override_dh_install:
+	dh_install --fail-missing

src/usr/share/lightdm/lightdm.conf.d/20-qlubuntu.conf

@@ -0,0 +1,2 @@
+[SeatDefaults]
+user-session=QLubuntu