1 --- mate-applets-1.10.0/battstat/Makefile.am.orig 2015-05-12 17:58:54.269026483 +0200
2 +++ mate-applets-1.10.0/battstat/Makefile.am 2015-05-12 20:58:20.245241344 +0200
5 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid
7 -uidir = $(datadir)/mate/ui
8 +uidir = $(datadir)/mate-panel/ui
9 ui_DATA = battstat-applet-menu.xml
12 --- mate-applets-1.10.0/multiload/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
13 +++ mate-applets-1.10.0/multiload/Makefile.am 2013-03-14 20:00:28.041998082 +0200
15 $(gsettings_SCHEMAS_in_in) \
18 -uidir = $(datadir)/mate/ui
19 +uidir = $(datadir)/mate-panel/ui
20 ui_DATA = multiload-applet-menu.xml
22 appletdir = $(datadir)/mate-panel/applets
23 --- mate-applets-1.10.0/stickynotes/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
24 +++ mate-applets-1.10.0/stickynotes/Makefile.am 2013-03-14 20:00:40.159222611 +0200
27 builder_DATA = $(builder_files)
29 -uidir = $(datadir)/mate/ui
30 +uidir = $(datadir)/mate-panel/ui
33 @INTLTOOL_XML_NOMERGE_RULE@
34 --- mate-applets-1.10.0/accessx-status/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
35 +++ mate-applets-1.10.0/accessx-status/Makefile.am 2013-03-14 20:00:51.406407084 +0200
37 -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
40 -uidir = $(datadir)/mate/ui
41 +uidir = $(datadir)/mate-panel/ui
42 ui_DATA = accessx-status-applet-menu.xml
44 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
45 --- mate-applets-1.10.0/trashapplet/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
46 +++ mate-applets-1.10.0/trashapplet/Makefile.am 2013-03-14 20:01:02.450248862 +0200
48 -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
51 -uidir = $(datadir)/mate/ui
52 +uidir = $(datadir)/mate-panel/ui
53 ui_DATA = trashapplet-menu.xml
55 builder_DATA = trashapplet-empty-progress.ui
56 --- mate-applets-1.10.0/trashapplet/src/Makefile.am.orig 2015-05-12 21:00:56.068568138 +0200
57 +++ mate-applets-1.10.0/trashapplet/src/Makefile.am 2015-05-12 21:02:20.331897935 +0200
59 +uidir = $(datadir)/mate-panel/ui
60 AM_CPPFLAGS = -I$(top_srcdir) \
61 $(MATE_APPLETS4_CFLAGS) \
62 $(MATEDESKTOP_CFLAGS) \
64 - -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
65 + -DTRASH_MENU_UI_DIR=\""$(uidir)"\"
67 libexec_PROGRAMS = trashapplet
69 --- mate-applets-1.10.0/cpufreq/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
70 +++ mate-applets-1.10.0/cpufreq/Makefile.am 2013-03-14 20:02:57.252200866 +0200
73 builder_DATA = cpufreq-preferences.ui
75 -uidir = $(datadir)/mate/ui
76 +uidir = $(datadir)/mate-panel/ui
77 ui_DATA = cpufreq-applet-menu.xml
80 --- mate-applets-1.10.0/cpufreq/src/Makefile.am.orig 2014-01-01 11:01:50.666615515 +0100
81 +++ mate-applets-1.10.0/cpufreq/src/Makefile.am 2014-01-01 11:03:13.679945361 +0100
84 SUBDIRS = $(selector_SUBDIR)
86 +uidir = $(datadir)/mate-panel/ui
88 - -DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate/ui"\" \
89 + -DCPUFREQ_MENU_UI_DIR=\""$(uidir)"\" \
90 $(MATE_APPLETS4_CFLAGS) \
93 --- mate-applets-1.10.0/mateweather/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
94 +++ mate-applets-1.10.0/mateweather/Makefile.am 2013-03-14 20:03:47.911199809 +0200
96 $(NETWORKMANAGER_LIBS) \
99 -uidir = $(datadir)/mate/ui
100 +uidir = $(datadir)/mate-panel/ui
101 ui_DATA = mateweather-applet-menu.xml
103 appletdir = $(datadir)/mate-panel/applets
104 --- mate-applets-1.10.0/drivemount/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
105 +++ mate-applets-1.10.0/drivemount/Makefile.am 2013-03-14 20:04:02.671879372 +0200
107 $(MATE_APPLETS4_LIBS) \
110 -uidir = $(datadir)/mate/ui
111 +uidir = $(datadir)/mate-panel/ui
112 ui_DATA = drivemount-applet-menu.xml
114 @INTLTOOL_XML_NOMERGE_RULE@
115 --- mate-applets-1.10.0/geyes/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
116 +++ mate-applets-1.10.0/geyes/Makefile.am 2013-03-14 20:04:15.615808629 +0200
118 -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
121 -uidir = $(datadir)/mate/ui
122 +uidir = $(datadir)/mate-panel/ui
123 ui_DATA = geyes-applet-menu.xml
125 @INTLTOOL_XML_NOMERGE_RULE@
126 --- mate-applets-1.10.0/charpick/Makefile.am~ 2013-03-08 02:20:01.000000000 +0200
127 +++ mate-applets-1.10.0/charpick/Makefile.am 2013-03-14 20:04:26.936329764 +0200
129 %.gschema.xml.in: %.gschema.xml.in.in Makefile
130 $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
132 -uidir = $(datadir)/mate/ui
133 +uidir = $(datadir)/mate-panel/ui
134 ui_DATA = charpick-applet-menu.xml
136 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid
137 --- mate-applets-1.14.0/netspeed/data/Makefile.am.old 2016-04-09 21:29:00.894029608 +0200
138 +++ mate-applets-1.14.0/netspeed/data/Makefile.am 2016-04-09 21:29:14.174108980 +0200
141 %.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
143 -xmluidir = $(datadir)/mate/ui
144 +xmluidir = $(datadir)/mate-panel/ui
145 xmlui_DATA = netspeed-menu.xml
147 servicedir = $(datadir)/dbus-1/services
148 --- mate-applets-1.20.3.orig/netspeed/src/Makefile.am 2019-01-09 23:44:33.037400475 +0100
149 +++ mate-applets-1.20.3/netspeed/src/Makefile.am 2019-01-09 23:49:31.625098023 +0100
151 +uidir = $(datadir)/mate-panel/ui
152 AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) \
153 $(GIO_CFLAGS) $(GTOP_APPLETS_CFLAGS) \
154 $(MATE_APPLETS4_CFLAGS) $(MATEDESKTOP_CFLAGS) \
155 - -DNETSPEED_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
156 + -DNETSPEED_MENU_UI_DIR=\""$(uidir)"\"
158 libexec_PROGRAMS = mate-netspeed-applet