From a57792697c9cefc565307a186c693d1fc914c918 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Thu, 7 Feb 2019 11:53:58 +0800
Subject: fix make distcheck fail on debian

---
 configure.ac                        |  1 -
 mate-panel/mate-panel.desktop.in    | 15 +++++++++++++++
 mate-panel/mate-panel.desktop.in.in | 19 -------------------
 po/POTFILES.in                      |  2 +-
 po/POTFILES.skip                    |  1 -
 5 files changed, 16 insertions(+), 22 deletions(-)
 create mode 100644 mate-panel/mate-panel.desktop.in
 delete mode 100644 mate-panel/mate-panel.desktop.in.in

diff --git a/configure.ac b/configure.ac
index 8fc7572e..65380992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,7 +302,6 @@ mate-panel/libegg/Makefile
 mate-panel/libmate-panel-applet-private/Makefile
 mate-panel/libpanel-util/Makefile
 mate-panel/wayland-protocols/Makefile
-mate-panel/mate-panel.desktop.in
 libmate-panel-applet/libmatepanelapplet-4.0.pc
 libmate-panel-applet/libmatepanelapplet-4.0-uninstalled.pc
 libmate-panel-applet/Makefile
diff --git a/mate-panel/mate-panel.desktop.in b/mate-panel/mate-panel.desktop.in
new file mode 100644
index 00000000..b686af43
--- /dev/null
+++ b/mate-panel/mate-panel.desktop.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+_Name=Panel
+_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
+Icon=mate-panel
+Exec=mate-panel
+StartupNotify=true
+Terminal=false
+Categories=GTK;System;Core;
+OnlyShowIn=MATE;
+NoDisplay=true
+X-MATE-AutoRestart=true
+X-MATE-Autostart-Phase=Panel
+X-MATE-Provides=panel
+X-MATE-Autostart-Notify=true
diff --git a/mate-panel/mate-panel.desktop.in.in b/mate-panel/mate-panel.desktop.in.in
deleted file mode 100644
index 6ce322d9..00000000
--- a/mate-panel/mate-panel.desktop.in.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=Panel
-_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
-Icon=mate-panel
-Exec=mate-panel
-StartupNotify=true
-Terminal=false
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-panel
-X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=@VERSION@
-Categories=GTK;System;Core;
-OnlyShowIn=MATE;
-NoDisplay=true
-X-MATE-AutoRestart=true
-X-MATE-Autostart-Phase=Panel
-X-MATE-Provides=panel
-X-MATE-Autostart-Notify=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 66af1975..8ef4859b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,7 +42,7 @@ mate-panel/applet.c
 mate-panel/button-widget.c
 mate-panel/drawer.c
 mate-panel/mate-desktop-item-edit.c
-mate-panel/mate-panel.desktop.in.in
+mate-panel/mate-panel.desktop.in
 mate-panel/launcher.c
 mate-panel/main.c
 mate-panel/menu.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e9c8e2cd..65816ada 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,4 +4,3 @@ applets/clock/MATE_ClockApplet_Factory.server.in
 applets/fish/MATE_FishApplet_Factory.server.in
 applets/notification_area/MATE_NotificationAreaApplet.server.in
 applets/wncklet/MATE_Wncklet_Factory.server.in
-mate-panel/mate-panel.desktop.in
-- 
cgit v1.2.1