summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Xiaotian <[email protected]>2019-02-07 18:21:19 +0800
committerraveit65 <[email protected]>2019-02-08 23:10:25 +0100
commit89c003e4e1aee19685e9d5f769ec01f21a03f696 (patch)
treef1a9efd58adbaeb22920020eb6bd3aa6667f77c0
parent87ff53b86535a1ee0d06943b309e2309c9e874d7 (diff)
downloadmate-desktop-89c003e4e1aee19685e9d5f769ec01f21a03f696.tar.bz2
mate-desktop-89c003e4e1aee19685e9d5f769ec01f21a03f696.tar.xz
Fixed make distcheck fail on debian.
-rw-r--r--configure.ac2
-rw-r--r--mate-about/Makefile.am4
-rw-r--r--mate-about/mate-about.desktop.in (renamed from mate-about/mate-about.desktop.in.in)4
-rw-r--r--po/POTFILES.in4
-rw-r--r--po/POTFILES.skip3
-rw-r--r--tools/Makefile.am4
-rw-r--r--tools/mate-color-select.desktop.in (renamed from tools/mate-color-select.desktop.in.in)0
7 files changed, 8 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index 13586ca..2d7f768 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,7 +231,6 @@ GTK_DOC_CHECK([1.4])
AC_CONFIG_FILES([
Makefile
mate-about/Makefile
-mate-about/mate-about.desktop.in
libmate-desktop/Makefile
libmate-desktop/mate-desktop-2.0.pc
libmate-desktop/mate-desktop-2.0-uninstalled.pc
@@ -260,7 +259,6 @@ schemas/org.mate.thumbnail-cache.gschema.xml
schemas/org.mate.thumbnailers.gschema.xml
schemas/org.mate.typing-break.gschema.xml
man/Makefile
-tools/mate-color-select.desktop.in
tools/Makefile
icons/Makefile
])
diff --git a/mate-about/Makefile.am b/mate-about/Makefile.am
index da3bbc7..5c07102 100644
--- a/mate-about/Makefile.am
+++ b/mate-about/Makefile.am
@@ -15,7 +15,9 @@ desktopdir = $(datadir)/applications
desktop_in_files = mate-about.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-CLEANFILES = mate-about.desktop mate-about
+EXTRA_DIST = $(desktop_in_files)
+
+CLEANFILES = $(desktop_DATA) $(bin_PROGRAMS)
#-include $(top_srcdir)/git.mk
diff --git a/mate-about/mate-about.desktop.in.in b/mate-about/mate-about.desktop.in
index e78114a..01eb829 100644
--- a/mate-about/mate-about.desktop.in.in
+++ b/mate-about/mate-about.desktop.in
@@ -7,9 +7,5 @@ Terminal=false
Type=Application
Categories=GTK;Core;Utility;
OnlyShowIn=MATE;
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=mate-desktop
-X-MATE-Bugzilla-Component=mate-about
-X-MATE-Bugzilla-Version=@VERSION@
StartupNotify=false
NoDisplay=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ac45977..2e51989 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
mate-about/mate-about.c
-mate-about/mate-about.desktop.in.in
+mate-about/mate-about.desktop.in
mate-about/mate-about.h
# When adding a file here, make sure that the entry point in the API of this
# file calls _mate_desktop_init_i18n ()
@@ -33,5 +33,5 @@ libmate-desktop/mate-rr-labeler.c
[type: gettext/gsettings]schemas/org.mate.thumbnailers.gschema.xml.in
[type: gettext/gsettings]schemas/org.mate.typing-break.gschema.xml.in
tools/mate-color-select.c
-tools/mate-color-select.desktop.in.in
+tools/mate-color-select.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 7b0b6b2..72fb944 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,4 @@
# List of source files containing translatable strings that should not be
# translated.
# Please keep this file sorted alphabetically.
-mate-about/mate-about.desktop.in
mate-version.xml.in
-tools/mate-color-select.desktop.in
-
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 301ef25..281e127 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -21,4 +21,6 @@ desktopdir = $(datadir)/applications
desktop_in_files = mate-color-select.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-CLEANFILES = *.desktop *.desktop.in
+EXTRA_DIST = $(desktop_in_files)
+
+CLEANFILES = $(desktop_DATA) $(bin_PROGRAMS)
diff --git a/tools/mate-color-select.desktop.in.in b/tools/mate-color-select.desktop.in
index 458ab6e..458ab6e 100644
--- a/tools/mate-color-select.desktop.in.in
+++ b/tools/mate-color-select.desktop.in