- honour system _libexecdir setting; release 2

[packages/mate-applets.git] / uidir.patch

diff --git a/uidir.patch b/uidir.patch
index 92b06579f235e6db13f988c45f2c0731978fb9f8..0f5b61e63f5cdd62c120f401472621d3ca0f7dfb 100644 (file)
--- a/uidir.patch
+++ b/uidir.patch
@@ -103,15 +103,15 @@
  appletdir       = $(datadir)/mate-panel/applets
 --- mate-applets-1.10.0/drivemount/Makefile.am~        2013-03-08 02:20:01.000000000 +0200
 +++ mate-applets-1.10.0/drivemount/Makefile.am 2013-03-14 20:04:02.671879372 +0200
-@@ -40,7 +40,7 @@
-             -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-             $< > $@
+@@ -20,7 +20,7 @@
+       $(MATE_APPLETS4_LIBS)   \
+       $(MATEDESKTOP_LIBS)
  
--uidir = $(datadir)/mate/ui
-+uidir = $(datadir)/mate-panel/ui
- ui_DATA = drivemount-applet-menu.xml
+-uidir           = $(datadir)/mate/ui
++uidir           = $(datadir)/mate-panel/ui
+ ui_DATA         = drivemount-applet-menu.xml
  
- CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
+ @INTLTOOL_XML_NOMERGE_RULE@
 --- mate-applets-1.10.0/geyes/Makefile.am~     2013-03-08 02:20:01.000000000 +0200
 +++ mate-applets-1.10.0/geyes/Makefile.am      2013-03-14 20:04:15.615808629 +0200
 @@ -40,7 +40,7 @@
@@ -134,3 +134,14 @@
  ui_DATA = charpick-applet-menu.xml
  
  CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
+--- mate-applets-1.14.0/netspeed/data/Makefile.am.old  2016-04-09 21:29:00.894029608 +0200
++++ mate-applets-1.14.0/netspeed/data/Makefile.am      2016-04-09 21:29:14.174108980 +0200
+@@ -10,7 +10,7 @@
+               $< > $@
+ %.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
+ 
+-xmluidir   = $(datadir)/mate/ui
++xmluidir   = $(datadir)/mate-panel/ui
+ xmlui_DATA = netspeed-menu.xml
+ 
+ servicedir       = $(datadir)/dbus-1/services