--- stickynotes/Makefile.in.orig	2015-01-22 17:42:18.261799026 +0100
+++ stickynotes/Makefile.in	2015-01-22 17:42:56.807795784 +0100
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -78,8 +78,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS =  \
-@BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes_applet$(EXEEXT)
+@BUILD_STICKYNOTES_APPLET_TRUE@libexec_PROGRAMS = mate-stickynotes-applet$(EXEEXT)
 subdir = stickynotes
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp README TODO
@@ -100,20 +99,21 @@
 	"$(DESTDIR)$(builderdir)" "$(DESTDIR)$(convertdir)" \
 	"$(DESTDIR)$(servicedir)" "$(DESTDIR)$(uidir)"
 PROGRAMS = $(libexec_PROGRAMS)
-am__stickynotes_applet_SOURCES_DIST = util.h util.c stickynotes.h \
+am__mate_stickynotes_applet_SOURCES_DIST = util.h util.c stickynotes.h \
 	stickynotes_callbacks.h stickynotes_applet.h \
 	stickynotes_applet_callbacks.h stickynotes.c \
 	stickynotes_callbacks.c stickynotes_applet.c \
 	stickynotes_applet_callbacks.c
-@BUILD_STICKYNOTES_APPLET_TRUE@am_stickynotes_applet_OBJECTS =  \
+@BUILD_STICKYNOTES_APPLET_TRUE@am_mate_stickynotes_applet_OBJECTS =  \
 @BUILD_STICKYNOTES_APPLET_TRUE@	util.$(OBJEXT) \
 @BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes.$(OBJEXT) \
 @BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes_callbacks.$(OBJEXT) \
 @BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes_applet.$(OBJEXT) \
 @BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes_applet_callbacks.$(OBJEXT)
-stickynotes_applet_OBJECTS = $(am_stickynotes_applet_OBJECTS)
+mate_stickynotes_applet_OBJECTS =  \
+	$(am_mate_stickynotes_applet_OBJECTS)
 am__DEPENDENCIES_1 =
-@BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_DEPENDENCIES =  \
+@BUILD_STICKYNOTES_APPLET_TRUE@mate_stickynotes_applet_DEPENDENCIES =  \
 @BUILD_STICKYNOTES_APPLET_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_STICKYNOTES_APPLET_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_STICKYNOTES_APPLET_TRUE@	$(am__DEPENDENCIES_1) \
@@ -157,8 +157,8 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(stickynotes_applet_SOURCES)
-DIST_SOURCES = $(am__stickynotes_applet_SOURCES_DIST)
+SOURCES = $(mate_stickynotes_applet_SOURCES)
+DIST_SOURCES = $(am__mate_stickynotes_applet_SOURCES_DIST)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -314,7 +314,6 @@
 GUCHARMAP_LIBS = @GUCHARMAP_LIBS@
 HAVE_LIBAPM = @HAVE_LIBAPM@
 HAVE_XKB = @HAVE_XKB@
-HELP_DIR = @HELP_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -330,7 +329,6 @@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
-ITSTOOL = @ITSTOOL@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@
@@ -409,18 +407,14 @@
 UPOWER_LIBS = @UPOWER_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
 XMKMF = @XMKMF@
 XML2_CFLAGS = @XML2_CFLAGS@
 XML2_LIBS = @XML2_LIBS@
-XMLLINT = @XMLLINT@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-YELP_LC_DIST = @YELP_LC_DIST@
-YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -501,7 +495,7 @@
 @BUILD_STICKYNOTES_APPLET_TRUE@	-DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\
 @BUILD_STICKYNOTES_APPLET_TRUE@	-DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\"
 
-@BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_SOURCES = \
+@BUILD_STICKYNOTES_APPLET_TRUE@mate_stickynotes_applet_SOURCES = \
 @BUILD_STICKYNOTES_APPLET_TRUE@	util.h \
 @BUILD_STICKYNOTES_APPLET_TRUE@	util.c \
 @BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes.h \
@@ -513,7 +507,7 @@
 @BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes_applet.c \
 @BUILD_STICKYNOTES_APPLET_TRUE@	stickynotes_applet_callbacks.c
 
-@BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_LDADD = \
+@BUILD_STICKYNOTES_APPLET_TRUE@mate_stickynotes_applet_LDADD = \
 @BUILD_STICKYNOTES_APPLET_TRUE@	$(STICKYNOTES_LIBS)	\
 @BUILD_STICKYNOTES_APPLET_TRUE@	$(MATE_APPLETS4_LIBS)	\
 @BUILD_STICKYNOTES_APPLET_TRUE@	$(MATEDESKTOP_LIBS)	\
@@ -624,9 +618,9 @@
 	echo " rm -f" $$list; \
 	rm -f $$list
 
-stickynotes_applet$(EXEEXT): $(stickynotes_applet_OBJECTS) $(stickynotes_applet_DEPENDENCIES) $(EXTRA_stickynotes_applet_DEPENDENCIES) 
-	@rm -f stickynotes_applet$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(stickynotes_applet_OBJECTS) $(stickynotes_applet_LDADD) $(LIBS)
+mate-stickynotes-applet$(EXEEXT): $(mate_stickynotes_applet_OBJECTS) $(mate_stickynotes_applet_DEPENDENCIES) $(EXTRA_mate_stickynotes_applet_DEPENDENCIES) 
+	@rm -f mate-stickynotes-applet$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(mate_stickynotes_applet_OBJECTS) $(mate_stickynotes_applet_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)