From db623bf1d5437c2e75f56efcea53eb7ac6d8958d Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Fri, 8 Feb 2019 00:25:47 +0800
Subject: Fix make distcheck fail on debian.

---
 configure.ac                               |  2 --
 data/Makefile.am                           |  4 +---
 data/mate-session-properties.desktop.in    | 11 +++++++++++
 data/mate-session-properties.desktop.in.in | 15 ---------------
 data/mate-wm.desktop.in                    |  9 +++++++++
 data/mate-wm.desktop.in.in                 | 13 -------------
 po/POTFILES.in                             |  4 ++--
 po/POTFILES.skip                           |  2 --
 8 files changed, 23 insertions(+), 37 deletions(-)
 create mode 100644 data/mate-session-properties.desktop.in
 delete mode 100644 data/mate-session-properties.desktop.in.in
 create mode 100644 data/mate-wm.desktop.in
 delete mode 100644 data/mate-wm.desktop.in.in

diff --git a/configure.ac b/configure.ac
index baac15f..cd63871 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,8 +295,6 @@ doc/dbus/Makefile
 doc/dbus/mate-session.xml
 doc/man/Makefile
 data/Makefile
-data/mate-wm.desktop.in
-data/mate-session-properties.desktop.in
 data/org.mate.session.gschema.xml
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index d286601..5bf1791 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -31,6 +31,7 @@ EXTRA_DIST =					\
 	$(xsession_in_files)			\
 	$(gsettingsschema_in_files)		\
 	$(ui_DATA)				\
+	$(desktop_in_files)			\
 	$(pixmap_DATA_dist)
 
 CLEANFILES =					\
@@ -39,7 +40,4 @@ CLEANFILES =					\
 	$(gsettings_SCHEMAS)			\
 	mate-wm.desktop
 
-DISTCLEANFILES =				\
-	$(desktop_in_files)
-
 -include $(top_srcdir)/git.mk
diff --git a/data/mate-session-properties.desktop.in b/data/mate-session-properties.desktop.in
new file mode 100644
index 0000000..79a9ffc
--- /dev/null
+++ b/data/mate-session-properties.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_Name=Startup Applications
+_Comment=Choose what applications to start when you log in
+Exec=mate-session-properties
+Icon=mate-session-properties
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GTK;Settings;X-MATE-PersonalSettings;
+Keywords=MATE;session;properties;applications;login;start;
+OnlyShowIn=MATE;
diff --git a/data/mate-session-properties.desktop.in.in b/data/mate-session-properties.desktop.in.in
deleted file mode 100644
index 4b5bafd..0000000
--- a/data/mate-session-properties.desktop.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-_Name=Startup Applications
-_Comment=Choose what applications to start when you log in
-Exec=mate-session-properties
-Icon=mate-session-properties
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GTK;Settings;X-MATE-PersonalSettings;
-Keywords=MATE;session;properties;applications;login;start;
-OnlyShowIn=MATE;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-session
-X-MATE-Bugzilla-Component=mate-session-properties
-X-MATE-Bugzilla-Version=@VERSION@
diff --git a/data/mate-wm.desktop.in b/data/mate-wm.desktop.in
new file mode 100644
index 0000000..93a31ab
--- /dev/null
+++ b/data/mate-wm.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+_Name=Window Manager
+Exec=mate-wm
+Keywords=MATE;window;manager;launch;MDM;
+NoDisplay=true
+X-MATE-Autostart-Phase=WindowManager
+X-MATE-Provides=windowmanager
+X-MATE-Autostart-Notify=true
diff --git a/data/mate-wm.desktop.in.in b/data/mate-wm.desktop.in.in
deleted file mode 100644
index 271dbb4..0000000
--- a/data/mate-wm.desktop.in.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=Window Manager
-Exec=mate-wm
-Keywords=MATE;window;manager;launch;MDM;
-NoDisplay=true
-X-MATE-Autostart-Phase=WindowManager
-X-MATE-Provides=windowmanager
-X-MATE-Autostart-Notify=true
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-session
-X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=@VERSION@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0c8ccba..b5d4f1b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,9 +6,9 @@ capplet/gsp-app.c
 capplet/main.c
 [type: gettext/gsettings]data/org.mate.session.gschema.xml.in
 data/mate.desktop.in
-data/mate-wm.desktop.in.in
+data/mate-wm.desktop.in
 [type: gettext/glade]data/gsm-inhibit-dialog.ui
-data/mate-session-properties.desktop.in.in
+data/mate-session-properties.desktop.in
 [type: gettext/glade]data/session-properties.ui
 egg/eggdesktopfile.c
 egg/eggsmclient.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 17705b5..86d8710 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,6 +2,4 @@
 # translated.
 # Please keep this file sorted alphabetically.
 data/org.mate.session.gschema.xml.in
-data/mate-session-properties.desktop.in
 data/mate-session.schemas.in
-data/mate-wm.desktop.in
-- 
cgit v1.2.1