mate-gnome-conflicts.patch

   1 --- mate-applets-1.5.0/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in~   2012-12-08 23:37:32.000000000 +0200
   2 +++ mate-applets-1.5.0/cpufreq/org.mate.panel.applet.CPUFreqAppletFactory.service.in    2012-12-24 23:08:34.722100915 +0200
   3 @@ -1,3 +1,3 @@
   4  [D-BUS Service]
   5  Name=org.mate.panel.applet.CPUFreqAppletFactory
   6 -Exec=@LIBEXECDIR@/cpufreq-applet
   7 +Exec=@LIBEXECDIR@/mate-cpufreq-applet
   8 --- mate-applets-1.5.0/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in~  2012-12-08 23:37:32.000000000 +0200
   9 +++ mate-applets-1.5.0/cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in   2012-12-24 23:09:31.912661587 +0200
  10 @@ -1,6 +1,6 @@
  11  [Applet Factory]
  12  Id=CPUFreqAppletFactory
  13 -Location=@LIBEXECDIR@/cpufreq-applet
  14 +Location=@LIBEXECDIR@/mate-cpufreq-applet
  15  _Name=CPU Frequency Scaling Monitor
  16  _Description=Monitor the CPU Frequency Scaling
  17
  18 --- mate-applets-1.5.0/cpufreq/src/Makefile.am~ 2012-12-08 23:37:32.000000000 +0200
  19 +++ mate-applets-1.5.0/cpufreq/src/Makefile.am  2012-12-24 23:11:26.621571494 +0200
  20 @@ -10,13 +10,13 @@
  21         $(LIBGLADE_CFLAGS)                                      \
  22         $(DBUS_CFLAGS)
  23
  24 -libexec_PROGRAMS = cpufreq-applet
  25 +libexec_PROGRAMS = mate-cpufreq-applet
  26
  27  if HAVE_LIBCPUFREQ
  28  cpufreq_files=cpufreq-monitor-libcpufreq.c    cpufreq-monitor-libcpufreq.h
  29  endif
  30
  31 -cpufreq_applet_SOURCES =  \
  32 +mate_cpufreq_applet_SOURCES =  \
  33         cpufreq-applet.c                cpufreq-applet.h                \
  34         cpufreq-utils.c                 cpufreq-utils.h                 \
  35         cpufreq-prefs.c                 cpufreq-prefs.h                 \
  36 @@ -29,7 +29,7 @@
  37         $(cpufreq_files)                                                \
  38         cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
  39
  40 -cpufreq_applet_LDADD =  \
  41 +mate_cpufreq_applet_LDADD =  \
  42         $(MATE_APPLETS4_LIBS)           \
  43         $(LIBGLADE_LIBS)                \
  44         $(LIBCPUFREQ_LIBS)              \