From 81ae219f9626c9c49c22bf6a9e90ec3c8f8e5ac5 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Thu, 7 Feb 2019 21:37:59 +0800 Subject: fixed distcheck fail on debian --- capplets/about-me/Makefile.am | 2 +- capplets/about-me/mate-about-me.desktop.in | 11 +++++++++ capplets/about-me/mate-about-me.desktop.in.in | 11 --------- capplets/accessibility/at-properties/Makefile.am | 4 ++-- .../at-properties/mate-at-properties.desktop.in | 11 +++++++++ .../at-properties/mate-at-properties.desktop.in.in | 11 --------- capplets/appearance/data/Makefile.am | 5 ++--- .../data/mate-appearance-properties.desktop.in | 11 +++++++++ .../data/mate-appearance-properties.desktop.in.in | 11 --------- .../data/mate-theme-installer.desktop.in | 13 +++++++++++ .../data/mate-theme-installer.desktop.in.in | 13 ----------- capplets/default-applications/Makefile.am | 4 ++-- ...mate-default-applications-properties.desktop.in | 11 +++++++++ ...e-default-applications-properties.desktop.in.in | 11 --------- capplets/display/Makefile.am | 4 ++-- .../display/mate-display-properties.desktop.in | 11 +++++++++ .../display/mate-display-properties.desktop.in.in | 11 --------- capplets/keybindings/Makefile.am | 3 +-- capplets/keybindings/mate-keybinding.desktop.in | 11 +++++++++ capplets/keybindings/mate-keybinding.desktop.in.in | 11 --------- capplets/keyboard/Makefile.am | 4 ++-- capplets/keyboard/mate-keyboard.desktop.in | 11 +++++++++ capplets/keyboard/mate-keyboard.desktop.in.in | 11 --------- capplets/mouse/Makefile.am | 4 ++-- capplets/mouse/mate-settings-mouse.desktop.in | 11 +++++++++ capplets/mouse/mate-settings-mouse.desktop.in.in | 11 --------- capplets/network/Makefile.am | 3 ++- .../network/mate-network-properties.desktop.in | 11 +++++++++ .../network/mate-network-properties.desktop.in.in | 11 --------- capplets/windows/Makefile.am | 3 ++- capplets/windows/mate-window-properties.desktop.in | 11 +++++++++ .../windows/mate-window-properties.desktop.in.in | 11 --------- configure.ac | 13 ----------- font-viewer/Makefile.am | 4 ++-- font-viewer/mate-font-viewer.desktop.in | 11 +++++++++ font-viewer/mate-font-viewer.desktop.in.in | 16 ------------- po/POTFILES.in | 26 +++++++++++----------- po/POTFILES.skip | 13 ----------- shell/Makefile.am | 4 ++-- shell/matecc.desktop.in | 12 ++++++++++ shell/matecc.desktop.in.in | 12 ---------- 41 files changed, 181 insertions(+), 212 deletions(-) create mode 100644 capplets/about-me/mate-about-me.desktop.in delete mode 100644 capplets/about-me/mate-about-me.desktop.in.in create mode 100644 capplets/accessibility/at-properties/mate-at-properties.desktop.in delete mode 100644 capplets/accessibility/at-properties/mate-at-properties.desktop.in.in create mode 100644 capplets/appearance/data/mate-appearance-properties.desktop.in delete mode 100644 capplets/appearance/data/mate-appearance-properties.desktop.in.in create mode 100644 capplets/appearance/data/mate-theme-installer.desktop.in delete mode 100644 capplets/appearance/data/mate-theme-installer.desktop.in.in create mode 100644 capplets/default-applications/mate-default-applications-properties.desktop.in delete mode 100644 capplets/default-applications/mate-default-applications-properties.desktop.in.in create mode 100644 capplets/display/mate-display-properties.desktop.in delete mode 100644 capplets/display/mate-display-properties.desktop.in.in create mode 100644 capplets/keybindings/mate-keybinding.desktop.in delete mode 100644 capplets/keybindings/mate-keybinding.desktop.in.in create mode 100644 capplets/keyboard/mate-keyboard.desktop.in delete mode 100644 capplets/keyboard/mate-keyboard.desktop.in.in create mode 100644 capplets/mouse/mate-settings-mouse.desktop.in delete mode 100644 capplets/mouse/mate-settings-mouse.desktop.in.in create mode 100644 capplets/network/mate-network-properties.desktop.in delete mode 100644 capplets/network/mate-network-properties.desktop.in.in create mode 100644 capplets/windows/mate-window-properties.desktop.in delete mode 100644 capplets/windows/mate-window-properties.desktop.in.in create mode 100644 font-viewer/mate-font-viewer.desktop.in delete mode 100644 font-viewer/mate-font-viewer.desktop.in.in create mode 100644 shell/matecc.desktop.in delete mode 100644 shell/matecc.desktop.in.in diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am index 01b07f95..a973ea9b 100644 --- a/capplets/about-me/Makefile.am +++ b/capplets/about-me/Makefile.am @@ -56,6 +56,6 @@ AM_CPPFLAGS += \ endif CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES) -EXTRA_DIST = $(ui_files) fprintd-marshal.list +EXTRA_DIST = $(ui_files) fprintd-marshal.list $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/about-me/mate-about-me.desktop.in b/capplets/about-me/mate-about-me.desktop.in new file mode 100644 index 00000000..71d3f704 --- /dev/null +++ b/capplets/about-me/mate-about-me.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=About Me +_Comment=Set your personal information +Exec=mate-about-me +Icon=user-info +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;X-MATE-PersonalSettings; +Keywords=mate-control-center;MATE;personal;information; +OnlyShowIn=MATE; diff --git a/capplets/about-me/mate-about-me.desktop.in.in b/capplets/about-me/mate-about-me.desktop.in.in deleted file mode 100644 index 71d3f704..00000000 --- a/capplets/about-me/mate-about-me.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=About Me -_Comment=Set your personal information -Exec=mate-about-me -Icon=user-info -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;X-MATE-PersonalSettings; -Keywords=mate-control-center;MATE;personal;information; -OnlyShowIn=MATE; diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index 178a3165..2af0ca50 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = $(AT_CAPPLET_CFLAGS) \ -DPIXMAPDIR=\""$(pixmapdir)"\" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATELOCALEDIR="\"$(datadir)/locale\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) -EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/accessibility/at-properties/mate-at-properties.desktop.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in new file mode 100644 index 00000000..e07d332a --- /dev/null +++ b/capplets/accessibility/at-properties/mate-at-properties.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Assistive Technologies +_Comment=Choose which accessibility features to enable when you log in +Exec=mate-at-properties +Icon=preferences-desktop-accessibility +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;Accessibility; +Keywords=mate-control-center;MATE;accessibility;features; +OnlyShowIn=MATE; diff --git a/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in deleted file mode 100644 index e07d332a..00000000 --- a/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Assistive Technologies -_Comment=Choose which accessibility features to enable when you log in -Exec=mate-at-properties -Icon=preferences-desktop-accessibility -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;Accessibility; -Keywords=mate-control-center;MATE;accessibility;features; -OnlyShowIn=MATE; diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am index ff85ab63..4bec1621 100644 --- a/capplets/appearance/data/Makefile.am +++ b/capplets/appearance/data/Makefile.am @@ -47,9 +47,8 @@ if ENABLE_UPDATE_MIMEDB $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" endif -EXTRA_DIST = $(xml_in_files) +EXTRA_DIST = $(xml_in_files) $(desktop_in_files) - -CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(mime_DATA) +CLEANFILES = $(desktop_DATA) $(mime_DATA) -include $(top_srcdir)/git.mk diff --git a/capplets/appearance/data/mate-appearance-properties.desktop.in b/capplets/appearance/data/mate-appearance-properties.desktop.in new file mode 100644 index 00000000..b984155a --- /dev/null +++ b/capplets/appearance/data/mate-appearance-properties.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Appearance +_Comment=Customize the look of the desktop +Exec=mate-appearance-properties %F +Icon=preferences-desktop-theme +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;DesktopSettings; +Keywords=mate-control-center;MATE;appearance;properties;desktop;customize;look; +OnlyShowIn=MATE; diff --git a/capplets/appearance/data/mate-appearance-properties.desktop.in.in b/capplets/appearance/data/mate-appearance-properties.desktop.in.in deleted file mode 100644 index b984155a..00000000 --- a/capplets/appearance/data/mate-appearance-properties.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Appearance -_Comment=Customize the look of the desktop -Exec=mate-appearance-properties %F -Icon=preferences-desktop-theme -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;DesktopSettings; -Keywords=mate-control-center;MATE;appearance;properties;desktop;customize;look; -OnlyShowIn=MATE; diff --git a/capplets/appearance/data/mate-theme-installer.desktop.in b/capplets/appearance/data/mate-theme-installer.desktop.in new file mode 100644 index 00000000..0c9fc718 --- /dev/null +++ b/capplets/appearance/data/mate-theme-installer.desktop.in @@ -0,0 +1,13 @@ +[Desktop Entry] +_Name=Theme Installer +_Comment=Installs themes packages for various parts of the desktop +Exec=mate-appearance-properties -i %u +Icon=preferences-desktop-theme +Terminal=false +Type=Application +MimeType=application/x-mate-theme-package; +StartupNotify=true +Categories=GTK;Settings; +Keywords=mate-control-center;MATE;install;desktop;themes; +NoDisplay=true +OnlyShowIn=MATE; diff --git a/capplets/appearance/data/mate-theme-installer.desktop.in.in b/capplets/appearance/data/mate-theme-installer.desktop.in.in deleted file mode 100644 index 0c9fc718..00000000 --- a/capplets/appearance/data/mate-theme-installer.desktop.in.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -_Name=Theme Installer -_Comment=Installs themes packages for various parts of the desktop -Exec=mate-appearance-properties -i %u -Icon=preferences-desktop-theme -Terminal=false -Type=Application -MimeType=application/x-mate-theme-package; -StartupNotify=true -Categories=GTK;Settings; -Keywords=mate-control-center;MATE;install;desktop;themes; -NoDisplay=true -OnlyShowIn=MATE; diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 96d979c2..756018fe 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -26,7 +26,7 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR=\""$(datadir)/locale"\"\ -DMATECC_UI_DIR=\""$(uidir)"\" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(autostart_DATA) -EXTRA_DIST = mate-default-applications.pc.in mate-default-applications-properties.desktop.in.in +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(autostart_DATA) +EXTRA_DIST = mate-default-applications.pc.in $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/default-applications/mate-default-applications-properties.desktop.in b/capplets/default-applications/mate-default-applications-properties.desktop.in new file mode 100644 index 00000000..072dd304 --- /dev/null +++ b/capplets/default-applications/mate-default-applications-properties.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Preferred Applications +_Comment=Select your default applications +Exec=mate-default-applications-properties +Icon=preferences-desktop-default-applications +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;X-MATE-PersonalSettings; +Keywords=mate-control-center;MATE;default;preferred;applications; +OnlyShowIn=MATE; diff --git a/capplets/default-applications/mate-default-applications-properties.desktop.in.in b/capplets/default-applications/mate-default-applications-properties.desktop.in.in deleted file mode 100644 index 072dd304..00000000 --- a/capplets/default-applications/mate-default-applications-properties.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Preferred Applications -_Comment=Select your default applications -Exec=mate-default-applications-properties -Icon=preferences-desktop-default-applications -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;X-MATE-PersonalSettings; -Keywords=mate-control-center;MATE;default;preferred;applications; -OnlyShowIn=MATE; diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index 4a304a97..d442fe6f 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -58,7 +58,7 @@ AM_CPPFLAGS = $(DISPLAY_CAPPLET_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor install-data-hook: update-icon-cache @@ -72,7 +72,7 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi -EXTRA_DIST = org.mate.randr.policy.in +EXTRA_DIST = org.mate.randr.policy.in $(Desktop_in_files) DISTCLEANFILES = org.mate.randr.policy -include $(top_srcdir)/git.mk diff --git a/capplets/display/mate-display-properties.desktop.in b/capplets/display/mate-display-properties.desktop.in new file mode 100644 index 00000000..324529fa --- /dev/null +++ b/capplets/display/mate-display-properties.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Displays +_Comment=Change resolution and position of monitors and projectors +Exec=mate-display-properties +Icon=mate-preferences-desktop-display +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;HardwareSettings; +Keywords=mate-control-center;MATE;resolution;position;monitors;display;properties; +OnlyShowIn=MATE; diff --git a/capplets/display/mate-display-properties.desktop.in.in b/capplets/display/mate-display-properties.desktop.in.in deleted file mode 100644 index 324529fa..00000000 --- a/capplets/display/mate-display-properties.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Displays -_Comment=Change resolution and position of monitors and projectors -Exec=mate-display-properties -Icon=mate-preferences-desktop-display -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;HardwareSettings; -Keywords=mate-control-center;MATE;resolution;position;monitors;display;properties; -OnlyShowIn=MATE; diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 09a0b1fc..e5efb109 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -37,10 +37,9 @@ AM_CPPFLAGS = \ -DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\"" CLEANFILES = \ $(MATECC_CAPPLETS_CLEANFILES) \ - $(Desktop_in_files) \ $(desktop_DATA) \ $(xml_DATA) -EXTRA_DIST = $(ui_DATA) $(xml_in_files) mate-keybindings.pc.in +EXTRA_DIST = $(ui_DATA) $(xml_in_files) mate-keybindings.pc.in $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/keybindings/mate-keybinding.desktop.in b/capplets/keybindings/mate-keybinding.desktop.in new file mode 100644 index 00000000..d154d342 --- /dev/null +++ b/capplets/keybindings/mate-keybinding.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Keyboard Shortcuts +_Comment=Assign shortcut keys to commands +Exec=mate-keybinding-properties +Icon=preferences-desktop-keyboard-shortcuts +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;HardwareSettings; +Keywords=mate-control-center;MATE;assign;keyboard;shortcuts;keybindings; +OnlyShowIn=MATE; diff --git a/capplets/keybindings/mate-keybinding.desktop.in.in b/capplets/keybindings/mate-keybinding.desktop.in.in deleted file mode 100644 index d154d342..00000000 --- a/capplets/keybindings/mate-keybinding.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Keyboard Shortcuts -_Comment=Assign shortcut keys to commands -Exec=mate-keybinding-properties -Icon=preferences-desktop-keyboard-shortcuts -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;HardwareSettings; -Keywords=mate-control-center;MATE;assign;keyboard;shortcuts;keybindings; -OnlyShowIn=MATE; diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index 0b48fbbd..b1a7c5af 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -36,7 +36,7 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATECC_UI_DIR="\"$(uidir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) -EXTRA_DIST = $(ui_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(ui_DATA) $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/keyboard/mate-keyboard.desktop.in b/capplets/keyboard/mate-keyboard.desktop.in new file mode 100644 index 00000000..5f366a65 --- /dev/null +++ b/capplets/keyboard/mate-keyboard.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Keyboard +_Comment=Set your keyboard preferences +Exec=mate-keyboard-properties +Icon=preferences-desktop-keyboard +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;HardwareSettings; +Keywords=mate-control-center;MATE;keyboard;preferences; +OnlyShowIn=MATE; diff --git a/capplets/keyboard/mate-keyboard.desktop.in.in b/capplets/keyboard/mate-keyboard.desktop.in.in deleted file mode 100644 index 5f366a65..00000000 --- a/capplets/keyboard/mate-keyboard.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Keyboard -_Comment=Set your keyboard preferences -Exec=mate-keyboard-properties -Icon=preferences-desktop-keyboard -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;HardwareSettings; -Keywords=mate-control-center;MATE;keyboard;preferences; -OnlyShowIn=MATE; diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 4b78498d..1cfc2f1f 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -29,7 +29,7 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATECC_UI_DIR="\"$(uidir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) -EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/mouse/mate-settings-mouse.desktop.in b/capplets/mouse/mate-settings-mouse.desktop.in new file mode 100644 index 00000000..d309131e --- /dev/null +++ b/capplets/mouse/mate-settings-mouse.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Mouse +_Comment=Set your mouse preferences +Exec=mate-mouse-properties +Icon=input-mouse +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;HardwareSettings; +Keywords=mate-control-center;MATE;mouse;preferences; +OnlyShowIn=MATE; diff --git a/capplets/mouse/mate-settings-mouse.desktop.in.in b/capplets/mouse/mate-settings-mouse.desktop.in.in deleted file mode 100644 index d309131e..00000000 --- a/capplets/mouse/mate-settings-mouse.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Mouse -_Comment=Set your mouse preferences -Exec=mate-mouse-properties -Icon=input-mouse -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;HardwareSettings; -Keywords=mate-control-center;MATE;mouse;preferences; -OnlyShowIn=MATE; diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index 6ec1e224..e0e934a1 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -45,6 +45,7 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/network/mate-network-properties.desktop.in b/capplets/network/mate-network-properties.desktop.in new file mode 100644 index 00000000..f6d135bf --- /dev/null +++ b/capplets/network/mate-network-properties.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Network Proxy +_Comment=Set your network proxy preferences +Exec=mate-network-properties +Icon=mate-network-properties +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;X-MATE-NetworkSettings; +Keywords=mate-control-center;MATE;network;http;socks;proxy; +OnlyShowIn=MATE; diff --git a/capplets/network/mate-network-properties.desktop.in.in b/capplets/network/mate-network-properties.desktop.in.in deleted file mode 100644 index f6d135bf..00000000 --- a/capplets/network/mate-network-properties.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Network Proxy -_Comment=Set your network proxy preferences -Exec=mate-network-properties -Icon=mate-network-properties -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;X-MATE-NetworkSettings; -Keywords=mate-control-center;MATE;network;http;socks;proxy; -OnlyShowIn=MATE; diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index 4b0fe063..cf1b9307 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -21,6 +21,7 @@ AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DPIXMAPDIR=\""$(pixmapdir)"\" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/windows/mate-window-properties.desktop.in b/capplets/windows/mate-window-properties.desktop.in new file mode 100644 index 00000000..49d2bc76 --- /dev/null +++ b/capplets/windows/mate-window-properties.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=Windows +_Comment=Set your window properties +Exec=mate-window-properties +Icon=preferences-system-windows +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;DesktopSettings; +Keywords=mate-control-center;MATE;window;manager;properties;marco;preferences; +OnlyShowIn=MATE; diff --git a/capplets/windows/mate-window-properties.desktop.in.in b/capplets/windows/mate-window-properties.desktop.in.in deleted file mode 100644 index 49d2bc76..00000000 --- a/capplets/windows/mate-window-properties.desktop.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -_Name=Windows -_Comment=Set your window properties -Exec=mate-window-properties -Icon=preferences-system-windows -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;DesktopSettings; -Keywords=mate-control-center;MATE;window;manager;properties;marco;preferences; -OnlyShowIn=MATE; diff --git a/configure.ac b/configure.ac index d6fbc0a1..b993aea8 100644 --- a/configure.ac +++ b/configure.ac @@ -277,34 +277,22 @@ org.mate.control-center.gschema.xml org.mate.control-center.keybinding.gschema.xml capplets/Makefile capplets/about-me/Makefile -capplets/about-me/mate-about-me.desktop.in capplets/about-me/icons/Makefile capplets/accessibility/Makefile -capplets/accessibility/at-properties/mate-at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/appearance/Makefile capplets/appearance/data/Makefile -capplets/appearance/data/mate-appearance-properties.desktop.in -capplets/appearance/data/mate-theme-installer.desktop.in capplets/common/Makefile capplets/default-applications/Makefile -capplets/default-applications/mate-default-applications-properties.desktop.in capplets/default-applications/mate-default-applications.pc capplets/display/Makefile -capplets/display/mate-display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/mate-keybindings.pc -capplets/keybindings/mate-keybinding.desktop.in capplets/keyboard/Makefile -capplets/keyboard/mate-keyboard.desktop.in capplets/mouse/Makefile -capplets/mouse/mate-settings-mouse.desktop.in capplets/network/Makefile -capplets/network/mate-network-properties.desktop.in capplets/windows/Makefile -capplets/windows/mate-window-properties.desktop.in font-viewer/Makefile -font-viewer/mate-font-viewer.desktop.in help/Makefile libwindow-settings/Makefile libwindow-settings/mate-window-settings-2.0.pc @@ -313,7 +301,6 @@ po/Makefile.in libslab/mate-slab.pc libslab/Makefile shell/Makefile -shell/matecc.desktop.in typing-break/Makefile ]) diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am index 1ef5affe..b71ed500 100644 --- a/font-viewer/Makefile.am +++ b/font-viewer/Makefile.am @@ -47,11 +47,11 @@ uninstall-local: @INTLTOOL_DIRECTORY_RULE@ @INTLTOOL_SCHEMAS_RULE@ -CLEANFILES = $(desktop_in_files) $(desktop_DATA) \ +CLEANFILES = $(desktop_DATA) \ $(schemas_DATA) $(directory_DATA) EXTRA_DIST = \ $(thumbnailer_DATA) \ - mate-font-viewer.desktop.in.in + $(desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/font-viewer/mate-font-viewer.desktop.in b/font-viewer/mate-font-viewer.desktop.in new file mode 100644 index 00000000..de4993a4 --- /dev/null +++ b/font-viewer/mate-font-viewer.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +_Name=MATE Font Viewer +_Comment=View fonts on your system +Icon=preferences-desktop-font +Exec=mate-font-viewer %u +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Utility; +MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf; +Keywords=mate-control-center;MATE;font;viewer;preview;desktop;preferences; diff --git a/font-viewer/mate-font-viewer.desktop.in.in b/font-viewer/mate-font-viewer.desktop.in.in deleted file mode 100644 index 8d9776fb..00000000 --- a/font-viewer/mate-font-viewer.desktop.in.in +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -_Name=MATE Font Viewer -_Comment=View fonts on your system -Icon=preferences-desktop-font -Exec=mate-font-viewer %u -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Utility; -MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf; -Keywords=mate-control-center;MATE;font;viewer;preview;desktop;preferences; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=gnome-font-viewer -X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-OtherBinaries=gnome-thumbnail-font -X-MATE-Bugzilla-Version=@VERSION@ diff --git a/po/POTFILES.in b/po/POTFILES.in index 82e4f8fc..9e935c75 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,13 +6,13 @@ capplets/about-me/e-image-chooser.c capplets/about-me/mate-about-me.c [type: gettext/glade]capplets/about-me/mate-about-me-dialog.ui -capplets/about-me/mate-about-me.desktop.in.in +capplets/about-me/mate-about-me.desktop.in capplets/about-me/mate-about-me-fingerprint.c [type: gettext/glade]capplets/about-me/mate-about-me-fingerprint.ui capplets/about-me/mate-about-me-password.c [type: gettext/glade]capplets/about-me/mate-about-me-password.ui [type: gettext/glade]capplets/accessibility/at-properties/at-enable-dialog.ui -capplets/accessibility/at-properties/mate-at-properties.desktop.in.in +capplets/accessibility/at-properties/mate-at-properties.desktop.in capplets/accessibility/at-properties/main.c capplets/appearance/appearance-desktop.c capplets/appearance/appearance-font.c @@ -20,8 +20,8 @@ capplets/appearance/appearance-main.c capplets/appearance/appearance-style.c capplets/appearance/appearance-themes.c [type: gettext/glade]capplets/appearance/data/appearance.ui -capplets/appearance/data/mate-appearance-properties.desktop.in.in -capplets/appearance/data/mate-theme-installer.desktop.in.in +capplets/appearance/data/mate-appearance-properties.desktop.in +capplets/appearance/data/mate-theme-installer.desktop.in capplets/appearance/data/mate-theme-package.xml.in capplets/appearance/mate-wp-info.c capplets/appearance/mate-wp-item.c @@ -34,11 +34,11 @@ capplets/common/capplet-util.c capplets/common/file-transfer-dialog.c capplets/common/mate-theme-info.c capplets/common/theme-thumbnail.c -capplets/default-applications/mate-default-applications-properties.desktop.in.in +capplets/default-applications/mate-default-applications-properties.desktop.in capplets/default-applications/mate-da-capplet.c [type: gettext/glade]capplets/default-applications/mate-default-applications-properties.ui [type: gettext/glade]capplets/display/display-capplet.ui -capplets/display/mate-display-properties.desktop.in.in +capplets/display/mate-display-properties.desktop.in capplets/display/mate-display-properties-install-systemwide.c capplets/display/org.mate.randr.policy.in capplets/display/xrandr-capplet.c @@ -47,7 +47,7 @@ capplets/keybindings/01-desktop-key.xml.in capplets/keybindings/eggcellrendererkeys.c capplets/keybindings/mate-keybinding-properties.c [type: gettext/glade]capplets/keybindings/mate-keybinding-properties.ui -capplets/keybindings/mate-keybinding.desktop.in.in +capplets/keybindings/mate-keybinding.desktop.in capplets/keyboard/mate-keyboard-properties.c [type: gettext/glade]capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui [type: gettext/glade]capplets/keyboard/mate-keyboard-properties-dialog.ui @@ -60,26 +60,26 @@ capplets/keyboard/mate-keyboard-properties-xkblt.c capplets/keyboard/mate-keyboard-properties-xkbmc.c capplets/keyboard/mate-keyboard-properties-xkbot.c capplets/keyboard/mate-keyboard-properties-xkbpv.c -capplets/keyboard/mate-keyboard.desktop.in.in +capplets/keyboard/mate-keyboard.desktop.in capplets/mouse/mate-mouse-properties.c [type: gettext/glade]capplets/mouse/mate-mouse-properties.ui -capplets/mouse/mate-settings-mouse.desktop.in.in +capplets/mouse/mate-settings-mouse.desktop.in capplets/network/mate-network-properties.c -capplets/network/mate-network-properties.desktop.in.in +capplets/network/mate-network-properties.desktop.in [type: gettext/glade]capplets/network/mate-network-properties.ui capplets/windows/mate-metacity-support.c capplets/windows/mate-window-properties.c -capplets/windows/mate-window-properties.desktop.in.in +capplets/windows/mate-window-properties.desktop.in libwindow-settings/mate-wm-manager.c libwindow-settings/marco-window-manager.c shell/control-center.c -shell/matecc.desktop.in.in +shell/matecc.desktop.in shell/matecc.directory.in typing-break/drw-break-window.c typing-break/drwright.c typing-break/main.c font-viewer/font-view.c -font-viewer/mate-font-viewer.desktop.in.in +font-viewer/mate-font-viewer.desktop.in font-viewer/font-thumbnailer.c libslab/app-shell.c libslab/application-tile.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 586d68f7..5228a531 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,15 +1,2 @@ -capplets/about-me/mate-about-me.desktop.in capplets/about-me/fingerprint-strings.h -capplets/accessibility/at-properties/mate-at-properties.desktop.in -capplets/appearance/data/mate-appearance-properties.desktop.in -capplets/appearance/data/mate-theme-installer.desktop.in capplets/appearance/data/mate-theme-package.xml -capplets/default-applications/mate-default-applications-properties.desktop.in -capplets/display/mate-display-properties.desktop.in -capplets/keybindings/mate-keybinding.desktop.in -capplets/keyboard/mate-keyboard.desktop.in -capplets/mouse/mate-settings-mouse.desktop.in -capplets/network/mate-network-properties.desktop.in -capplets/windows/mate-window-properties.desktop.in -font-viewer/mate-font-viewer.desktop.in -shell/matecc.desktop.in diff --git a/shell/Makefile.am b/shell/Makefile.am index ea502fd7..5d87e4aa 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -29,8 +29,8 @@ directory_DATA = $(directory_in_files:.directory.in=.directory) menudir = $(sysconfdir)/xdg/menus menu_DATA = matecc.menu -EXTRA_DIST = matecc.desktop.in.in matecc.directory.in matecc.menu +EXTRA_DIST = $(sys_in_files) matecc.directory.in matecc.menu -DISTCLEANFILES = matecc.desktop matecc.desktop.in matecc.directory +DISTCLEANFILES = $(sys_DATA) matecc.directory -include $(top_srcdir)/git.mk diff --git a/shell/matecc.desktop.in b/shell/matecc.desktop.in new file mode 100644 index 00000000..9b1b4c22 --- /dev/null +++ b/shell/matecc.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +_Name=Control Center +_GenericName=The MATE configuration tool +_Comment=Configure MATE settings +Icon=preferences-desktop +Exec=mate-control-center +Terminal=false +Type=Application +StartupNotify=false +Categories=GTK;Settings; +Keywords=MATE;control;center;configuration;tool;destop;preferences; +OnlyShowIn=MATE; diff --git a/shell/matecc.desktop.in.in b/shell/matecc.desktop.in.in deleted file mode 100644 index 9b1b4c22..00000000 --- a/shell/matecc.desktop.in.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -_Name=Control Center -_GenericName=The MATE configuration tool -_Comment=Configure MATE settings -Icon=preferences-desktop -Exec=mate-control-center -Terminal=false -Type=Application -StartupNotify=false -Categories=GTK;Settings; -Keywords=MATE;control;center;configuration;tool;destop;preferences; -OnlyShowIn=MATE; -- cgit v1.2.1