Fix incorrectly distributed guest-session apparmor data

diff --git a/NEWS b/NEWS
index e7c103c6044e21c8ce8ad6b45ef47108d300529f..09abd1ab1944394cf51d012c32f03834ce9ad4e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in lightdm 1.7.2
+
+    * Fix incorrectly distributed guest-session apparmor data
+
 Overview of changes in lightdm 1.7.1
 
     * Fix .pc file for liblightdm-qt5-3

diff --git a/configure.ac b/configure.ac
index db14757fd9764481f79d07920c2c40d49585f568..1575ed64a22cf7ba5fcd72841f9c780d57350629 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(lightdm, 1.7.1)
+AC_INIT(lightdm, 1.7.2)
 AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])

diff --git a/data/Makefile.am b/data/Makefile.am
index 6ed72a9e3c2c63c862e72653cff000c79f3df58b..35bbb67f528966b7681937054afb95705d19ad23 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,12 +12,12 @@ dist_pam_DATA = pam/lightdm \
                 pam/lightdm-autologin \
                 pam/lightdm-greeter
 
-apparmor/lightdm-guest-session: $(srcdir)/apparmor/lightdm-guest-session.in
+lightdm-guest-session: $(srcdir)/apparmor/lightdm-guest-session.in
        sed -e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g' $< >$@
 
 apparmor_profiledir = $(sysconfdir)/apparmor.d
-dist_apparmor_profile_DATA = \
-    apparmor/lightdm-guest-session
+apparmor_profile_DATA = \
+    lightdm-guest-session
 
 apparmor_profile_abstractionsdir = $(apparmor_profiledir)/abstractions
 dist_apparmor_profile_abstractions_DATA = \
@@ -27,7 +27,8 @@ dist_apparmor_profile_abstractions_DATA = \
 dist_man1_MANS = lightdm.1 \
                  lightdm-set-defaults.1
 
-CLEANFILES = apparmor/lightdm-guest-session
+EXTRA_DIST = lightdm-guest-session.in
+CLEANFILES = lightdm-guest-session
 
 DISTCLEANFILES = \
        Makefile.in