From 0f858316b3a3128b696fb37428cc5699f1b5d3c9 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Wed, 25 Jun 2014 12:35:39 +0200
Subject: Use $(datadir)/mate instead of $(datadir)/mate-2.0

And also rename binaries without "-2" suffix
---
 accessx-status/Makefile.am                                        | 2 +-
 battstat/Makefile.am                                              | 8 ++++----
 battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in  | 2 +-
 battstat/org.mate.panel.applet.BattstatAppletFactory.service.in   | 2 +-
 charpick/Makefile.am                                              | 8 ++++----
 .../org.mate.applets.CharpickerApplet.mate-panel-applet.in.in     | 2 +-
 charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in | 2 +-
 cpufreq/Makefile.am                                               | 2 +-
 cpufreq/src/Makefile.am                                           | 2 +-
 drivemount/Makefile.am                                            | 8 ++++----
 .../org.mate.applets.DriveMountApplet.mate-panel-applet.in.in     | 2 +-
 .../org.mate.panel.applet.DriveMountAppletFactory.service.in      | 2 +-
 geyes/Makefile.am                                                 | 8 ++++----
 geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in        | 2 +-
 geyes/org.mate.panel.applet.GeyesAppletFactory.service.in         | 2 +-
 mateweather/Makefile.am                                           | 8 ++++----
 .../org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in    | 2 +-
 .../org.mate.panel.applet.MateWeatherAppletFactory.service.in     | 2 +-
 multiload/Makefile.am                                             | 8 ++++----
 .../org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in      | 2 +-
 multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in | 2 +-
 stickynotes/Makefile.am                                           | 2 +-
 trashapplet/Makefile.am                                           | 2 +-
 trashapplet/src/Makefile.am                                       | 2 +-
 24 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 2ef0be12..37f8430f 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -38,7 +38,7 @@ org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files)
 		-e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
 		$< > $@
 
-uidir   = $(datadir)/mate-2.0/ui
+uidir   = $(datadir)/mate/ui
 ui_DATA = accessx-status-applet-menu.xml
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(ACCESSX_STATUS_APPLET_CLEANFILES)
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index fec3e882..21ff989d 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -35,10 +35,10 @@ AM_CPPFLAGS =					\
 	-DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
 
 
-libexec_PROGRAMS = battstat-applet-2
+libexec_PROGRAMS = battstat-applet
 
 
-battstat_applet_2_SOURCES = \
+battstat_applet_SOURCES = \
 	battstat.h \
 	pixmaps.h \
 	properties.c \
@@ -54,7 +54,7 @@ battstat_applet_2_SOURCES = \
 	battstat-upower.h
 
 
-battstat_applet_2_LDADD = \
+battstat_applet_LDADD = \
 		     $(MATE_APPLETS4_LIBS) \
 		     $(MATEDESKTOP_LIBS) \
 		     $(LIBNOTIFY_LIBS) \
@@ -93,7 +93,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files)
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = battstat-applet-menu.xml
 
 EXTRA_DIST = 							\
diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
index f9b6d3ed..9600dfc7 100644
--- a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
+++ b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=BattstatAppletFactory
-Location=@LIBEXECDIR@/battstat-applet-2
+Location=@LIBEXECDIR@/battstat-applet
 _Name=Battstat Factory
 _Description=Battstat Factory
 
diff --git a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
index b2983113..050fd3c8 100644
--- a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
+++ b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.BattstatAppletFactory
-Exec=@LIBEXECDIR@/battstat-applet-2
+Exec=@LIBEXECDIR@/battstat-applet
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index c2608e8e..365fae44 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -8,13 +8,13 @@ AM_CPPFLAGS =					\
 	$(MATEDESKTOP_CFLAGS)		\
 	$(GUCHARMAP_CFLAGS)
 
-libexec_PROGRAMS = charpick_applet2
+libexec_PROGRAMS = charpick-applet
 
-charpick_applet2_SOURCES = charpick.c \
+charpick_applet_SOURCES = charpick.c \
                           charpick.h \
                           properties.c
 
-charpick_applet2_LDADD = \
+charpick_applet_LDADD = \
 		       $(MATE_APPLETS4_LIBS)	\
 		       $(MATEDESKTOP_LIBS)	\
 		       $(GUCHARMAP_LIBS)
@@ -47,7 +47,7 @@ gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml
 %.gschema.xml.in: %.gschema.xml.in.in Makefile
 	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = charpick-applet-menu.xml
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
index c7160c71..f7a9d2b0 100644
--- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
+++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=CharpickerAppletFactory
-Location=@LIBEXECDIR@/charpick_applet2
+Location=@LIBEXECDIR@/charpick-applet
 _Name=Charpicker Applet Factory
 _Description=Charpicker Applet Factory
 
diff --git a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
index 66669019..bfca2847 100644
--- a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
+++ b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.CharpickerAppletFactory
-Exec=@LIBEXECDIR@/charpick_applet2
+Exec=@LIBEXECDIR@/charpick-applet
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 9e821585..ea9ea2aa 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -30,7 +30,7 @@ org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files)
 
 builder_DATA = cpufreq-preferences.ui
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = cpufreq-applet-menu.xml
 
 CLEANFILES = \
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 0d7abefd..9d0a1140 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -5,7 +5,7 @@ endif
 SUBDIRS = $(selector_SUBDIR)
 
 AM_CPPFLAGS = \
-	-DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\" 	\
+	-DCPUFREQ_MENU_UI_DIR=\""$(datadir)/mate/ui"\" 	\
 	$(MATE_APPLETS4_CFLAGS) 				\
 	$(MATEDESKTOP_CFLAGS) 				\
 	$(LIBGLADE_CFLAGS)					\
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index ef482faf..b2e99df5 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -7,16 +7,16 @@ AM_CPPFLAGS =					\
 	$(MATE_APPLETS4_CFLAGS)			\
 	$(MATEDESKTOP_CFLAGS)
 
-libexec_PROGRAMS = drivemount_applet2
+libexec_PROGRAMS = drivemount-applet
 
-drivemount_applet2_SOURCES =	\
+drivemount_applet_SOURCES =	\
 	drivemount.c		\
 	drive-list.c		\
 	drive-list.h		\
 	drive-button.c		\
 	drive-button.h
 
-drivemount_applet2_LDADD =	\
+drivemount_applet_LDADD =	\
 	$(MATE_APPLETS4_LIBS)	\
 	$(MATEDESKTOP_LIBS)
 
@@ -42,7 +42,7 @@ org.mate.panel.applet.DriveMountAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = drivemount-applet-menu.xml
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
diff --git a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
index 376c9447..2cff60f5 100644
--- a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
+++ b/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=DriveMountAppletFactory
-Location=@LIBEXECDIR@/drivemount_applet2
+Location=@LIBEXECDIR@/drivemount-applet
 _Name=Drive Mount Applet Factory
 _Description=Factory for drive mount applet
 
diff --git a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in
index 454d0a1f..898c4f09 100644
--- a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in
+++ b/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.DriveMountAppletFactory
-Exec=@LIBEXECDIR@/drivemount_applet2
+Exec=@LIBEXECDIR@/drivemount-applet
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index ba9750c8..d23fa119 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -9,14 +9,14 @@ AM_CPPFLAGS =						\
 	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"	\
 	-DGEYES_MENU_UI_DIR=\""$(uidir)"\"
 
-libexec_PROGRAMS = geyes_applet2
+libexec_PROGRAMS = geyes-applet
 
-geyes_applet2_SOURCES =	\
+geyes_applet_SOURCES =	\
         geyes.c \
 	themes.c \
 	geyes.h
 
-geyes_applet2_LDADD = 		\
+geyes_applet_LDADD = 		\
 	$(MATE_APPLETS4_LIBS) \
 	$(MATEDESKTOP_LIBS) \
 	-lm
@@ -42,7 +42,7 @@ org.mate.panel.applet.GeyesAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = geyes-applet-menu.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
index d512ed20..d2080905 100644
--- a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
+++ b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=GeyesAppletFactory
-Location=@LIBEXECDIR@/geyes_applet2
+Location=@LIBEXECDIR@/geyes-applet
 _Name=Geyes Applet Factory
 _Description=Geyes Applet Factory
 
diff --git a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in
index 783f42b4..f1363812 100644
--- a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in
+++ b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.GeyesAppletFactory
-Exec=@LIBEXECDIR@/geyes_applet2
+Exec=@LIBEXECDIR@/geyes-applet
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index d94173d2..db2f004c 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -13,9 +13,9 @@ AM_CPPFLAGS =					\
 	$(NETWORKMANAGER_CFLAGS)			\
 	$(DBUS_CFLAGS)
 
-libexec_PROGRAMS = mateweather-applet-2
+libexec_PROGRAMS = mateweather-applet
 
-mateweather_applet_2_SOURCES = \
+mateweather_applet_SOURCES = \
 	mateweather.h \
 	main.c \
 	mateweather-about.c mateweather-about.h \
@@ -23,7 +23,7 @@ mateweather_applet_2_SOURCES = \
 	mateweather-dialog.c mateweather-dialog.h \
 	mateweather-applet.c mateweather-applet.h
 
-mateweather_applet_2_LDADD = 	\
+mateweather_applet_LDADD = 	\
 	$(LIBNOTIFY_LIBS) 	\
 	$(MATE_APPLETS4_LIBS)	\
 	$(MATEDESKTOP_LIBS)	\
@@ -32,7 +32,7 @@ mateweather_applet_2_LDADD = 	\
 	$(NETWORKMANAGER_LIBS)	\
 	$(DBUS_LIBS)
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = mateweather-applet-menu.xml
 
 appletdir       = $(datadir)/mate-panel/applets
diff --git a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
index af58a727..c0a1a4f6 100644
--- a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
+++ b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=MateWeatherAppletFactory
-Location=@LIBEXECDIR@/mateweather-applet-2
+Location=@LIBEXECDIR@/mateweather-applet
 _Name=Mateweather Applet Factory
 _Description=Factory for creating the weather applet.
 
diff --git a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in
index 2be7b633..e1d0174a 100644
--- a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in
+++ b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.MateWeatherAppletFactory
-Exec=@LIBEXECDIR@/mateweather-applet-2
+Exec=@LIBEXECDIR@/mateweather-applet
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index e6073c5b..43b238e4 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS =			\
 	$(MATEDESKTOP_CFLAGS)	\
 	$(GIO_CFLAGS)
 
-libexec_PROGRAMS = multiload-applet-2
+libexec_PROGRAMS = multiload-applet
 
-multiload_applet_2_SOURCES = \
+multiload_applet_SOURCES = \
 			global.h	\
 			linux-proc.h	\
 			load-graph.h	\
@@ -22,7 +22,7 @@ multiload_applet_2_SOURCES = \
 			autoscaler.c	\
 			autoscaler.h
 
-multiload_applet_2_LDADD = \
+multiload_applet_LDADD = \
 				$(MATE_APPLETS4_LIBS) 	\
 				$(GTOP_APPLETS_LIBS)	\
 				$(MATEDESKTOP_LIBS)		\
@@ -42,7 +42,7 @@ EXTRA_DIST =							\
 	$(gsettings_SCHEMAS).in.in			\
 	$(ui_DATA)
 
-uidir		= $(datadir)/mate-2.0/ui
+uidir		= $(datadir)/mate/ui
 ui_DATA		= multiload-applet-menu.xml
 
 appletdir       = $(datadir)/mate-panel/applets
diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
index f62ca12b..584b0c03 100644
--- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
+++ b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=MultiLoadAppletFactory
-Location=@LIBEXECDIR@/multiload-applet-2
+Location=@LIBEXECDIR@/multiload-applet
 Name=MultiLoad Applet Factory
 Description=Factory for creating the load applet.
 
diff --git a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
index 8c37aecd..f592f048 100644
--- a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
+++ b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.MultiLoadAppletFactory
-Exec=@LIBEXECDIR@/multiload-applet-2
+Exec=@LIBEXECDIR@/multiload-applet
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index c483ad38..b58f553c 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -44,7 +44,7 @@ stickynotes_applet_LDADD =	\
 
 builder_DATA = $(builder_files)
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = $(ui_files)
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am
index ad69c8c8..27160254 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -21,7 +21,7 @@ org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files)
             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = trashapplet-menu.xml
 
 builder_DATA = trashapplet-empty-progress.ui
diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am
index ebdfbe9f..e24c9233 100644
--- a/trashapplet/src/Makefile.am
+++ b/trashapplet/src/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir)		\
 	   $(MATE_APPLETS4_CFLAGS)	\
 	   $(MATEDESKTOP_CFLAGS)	\
 	   $(GIO_CFLAGS)		\
-           -DTRASH_MENU_UI_DIR=\""$(datadir)/mate-2.0/ui"\"
+           -DTRASH_MENU_UI_DIR=\""$(datadir)/mate/ui"\"
 
 libexec_PROGRAMS = trashapplet
 
-- 
cgit v1.2.1