diff --git a/debian/changelog b/debian/changelog index bda60e5..4e67e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,12 @@ lubuntu-default-settings (0.36) UNRELEASED; urgency=low - Use lightdm conf files to set default session (LP: #1259525). * debian/control: - Make lightdm requirement to >= 1.9.4 for the conf files mechanism. + * debian/rules: + - Correctly use dh_install. + * debian/lubuntu-default-settings.install: + - Remove non-existent files. - -- Julien Lavergne Fri, 13 Dec 2013 20:22:07 +0100 + -- Julien Lavergne Fri, 13 Dec 2013 20:32:30 +0100 lubuntu-default-settings (0.35) trusty; urgency=low diff --git a/debian/lubuntu-default-settings.install b/debian/lubuntu-default-settings.install index d2520fc..b374f5e 100644 --- a/debian/lubuntu-default-settings.install +++ b/debian/lubuntu-default-settings.install @@ -3,9 +3,6 @@ usr/bin/ usr/share/gdm/ usr/share/lubuntu/ usr/share/lxpanel/ -usr/share/lxterminal/ usr/share/upstart/sessions/ usr/share/xsessions/ usr/share/applications/lubuntu-screenlock.desktop -usr/share/applications/lubuntu-browser.desktop -usr/share/applications/lubuntu-logout.desktop diff --git a/debian/rules b/debian/rules index 74ae84a..53a072f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ dh $@ override_dh_auto_build: - # Skip, just use dh_install. + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp override_dh_install: - $(MAKE) DESTDIR=$(CURDIR)/debian/lubuntu-default-settings + dh_install