fixed distcheck fail on debian

28 files changed, 35 insertions, 66 deletions

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.in b/capplets/about-me/mate-about-me.desktop.in
index 71d3f704..71d3f704 100644
--- a/capplets/about-me/mate-about-me.desktop.in.in
+++ b/capplets/about-me/mate-about-me.desktop.in
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.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in
index e07d332a..e07d332a 100644
--- a/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
+++ b/capplets/accessibility/at-properties/mate-at-properties.desktop.in
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.in b/capplets/appearance/data/mate-appearance-properties.desktop.in
index b984155a..b984155a 100644
--- a/capplets/appearance/data/mate-appearance-properties.desktop.in.in
+++ b/capplets/appearance/data/mate-appearance-properties.desktop.in
diff --git a/capplets/appearance/data/mate-theme-installer.desktop.in.in b/capplets/appearance/data/mate-theme-installer.desktop.in
index 0c9fc718..0c9fc718 100644
--- a/capplets/appearance/data/mate-theme-installer.desktop.in.in
+++ b/capplets/appearance/data/mate-theme-installer.desktop.in
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.in b/capplets/default-applications/mate-default-applications-properties.desktop.in
index 072dd304..072dd304 100644
--- a/capplets/default-applications/mate-default-applications-properties.desktop.in.in
+++ b/capplets/default-applications/mate-default-applications-properties.desktop.in
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.in b/capplets/display/mate-display-properties.desktop.in
index 324529fa..324529fa 100644
--- a/capplets/display/mate-display-properties.desktop.in.in
+++ b/capplets/display/mate-display-properties.desktop.in
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.in b/capplets/keybindings/mate-keybinding.desktop.in
index d154d342..d154d342 100644
--- a/capplets/keybindings/mate-keybinding.desktop.in.in
+++ b/capplets/keybindings/mate-keybinding.desktop.in
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.in b/capplets/keyboard/mate-keyboard.desktop.in
index 5f366a65..5f366a65 100644
--- a/capplets/keyboard/mate-keyboard.desktop.in.in
+++ b/capplets/keyboard/mate-keyboard.desktop.in
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.in b/capplets/mouse/mate-settings-mouse.desktop.in
index d309131e..d309131e 100644
--- a/capplets/mouse/mate-settings-mouse.desktop.in.in
+++ b/capplets/mouse/mate-settings-mouse.desktop.in
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.in b/capplets/network/mate-network-properties.desktop.in
index f6d135bf..f6d135bf 100644
--- a/capplets/network/mate-network-properties.desktop.in.in
+++ b/capplets/network/mate-network-properties.desktop.in
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.in b/capplets/windows/mate-window-properties.desktop.in
index 49d2bc76..49d2bc76 100644
--- a/capplets/windows/mate-window-properties.desktop.in.in
+++ b/capplets/windows/mate-window-properties.desktop.in
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.in b/font-viewer/mate-font-viewer.desktop.in
index 8d9776fb..de4993a4 100644
--- a/font-viewer/mate-font-viewer.desktop.in.in
+++ b/font-viewer/mate-font-viewer.desktop.in
@@ -9,8 +9,3 @@ 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.in b/shell/matecc.desktop.in
index 9b1b4c22..9b1b4c22 100644
--- a/shell/matecc.desktop.in.in
+++ b/shell/matecc.desktop.in