From 6ae66da5cfa159067868269c8b601eb6902c3613 Mon Sep 17 00:00:00 2001 From: MotoHoss Date: Sun, 12 Oct 2014 14:15:08 -0500 Subject: multiload: Rename binary and manpage. fixes #103 Avoid file collision with gnome applets. --- man/Makefile.am | 4 +- man/mate-multiload-applet.1 | 50 ++++++++++++++++++++++ man/multiload_applet.1 | 50 ---------------------- multiload/Makefile.am | 6 +-- ...applets.MultiLoadApplet.mate-panel-applet.in.in | 2 +- ....panel.applet.MultiLoadAppletFactory.service.in | 2 +- 6 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 man/mate-multiload-applet.1 delete mode 100644 man/multiload_applet.1 diff --git a/man/Makefile.am b/man/Makefile.am index 0343a20a..ad1cdd15 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -4,8 +4,8 @@ man_MANS = \ mate-drivemount-applet.1 \ mate-geyes-applet.1 \ mate-invest-chart.1 \ - mateweather.1 \ - multiload_applet.1 + mateweather.1 \ + mate-multiload-applet.1 EXTRA_DIST = $(man_MANS) diff --git a/man/mate-multiload-applet.1 b/man/mate-multiload-applet.1 new file mode 100644 index 00000000..04e93d11 --- /dev/null +++ b/man/mate-multiload-applet.1 @@ -0,0 +1,50 @@ +.\" This manpage has been automatically generated by docbook2man +.\" from a DocBook document. This tool can be found at: +.\" +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng . +.TH "MATE-MULTILOAD-APPLET" "1" "10 februar 2002" "" "" +.SH NAME +mate-multiload-applet \- Multiload (cpu, load average, memory, net, swap) applet for the MATE panel. +.SH SYNOPSIS + +\fBmate-multiload-applet\fR [ \fB--activate-goad-server\fI[=GOAD_ID]\fB\fR ] + +.SH "DESCRIPTION" +.PP +\fBmate-multiload-applet\fR Contains 5 applets. +.PP +CPU Load Applet. To add this applet to a Panel, right-click on the +Panel and choose Applets->Monitors->CPULoad +.PP +Load Average Applet. To add this applet to a Panel, right-click on the +Panel and choose Applets->Monitors->Load Average +.PP +Memory Applet. To add this applet to a Panel, right-click on the +Panel and choose Applets->Monitors->MemLoad +.PP +Net Applet. To add this applet to a Panel, right-click on the +Panel and choose Applets->Monitors->NetLoad +.PP +Swap Applet. To add this applet to a Panel, right-click on the +Panel and choose Applets->Monitors->SwapLoad +.SH "OPTIONS" +.TP +\fB--activate-goad-server\fR +(Internal use only) GOAD server ID to activate + +GOAD_ID may be: + +\fBmultiload_cpuload_applet \fRstart the cpu applet. + +\fBmultiload_loadavg_applet \fRstart the load average applet. + +\fBmultiload_memload_applet \fRstart the memory applet. + +\fBmultiload_netload_applet \fRstart the net applet. + +\fBmultiload_swapload_applet \fRstart the swap applet. +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat for +the Debian GNU/Linux system (but may be used by others). diff --git a/man/multiload_applet.1 b/man/multiload_applet.1 deleted file mode 100644 index d6c90b87..00000000 --- a/man/multiload_applet.1 +++ /dev/null @@ -1,50 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "MULTILOAD_APPLET" "1" "10 februar 2002" "" "" -.SH NAME -multiload_applet \- Multiload (cpu, load average, memory, net, swap) applet for the MATE panel. -.SH SYNOPSIS - -\fBmultiload_applet\fR [ \fB--activate-goad-server\fI[=GOAD_ID]\fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBmultiload_applet\fR Contains 5 applets. -.PP -CPU Load Applet. To add this applet to a Panel, right-click on the -Panel and choose Applets->Monitors->CPULoad -.PP -Load Average Applet. To add this applet to a Panel, right-click on the -Panel and choose Applets->Monitors->Load Average -.PP -Memory Applet. To add this applet to a Panel, right-click on the -Panel and choose Applets->Monitors->MemLoad -.PP -Net Applet. To add this applet to a Panel, right-click on the -Panel and choose Applets->Monitors->NetLoad -.PP -Swap Applet. To add this applet to a Panel, right-click on the -Panel and choose Applets->Monitors->SwapLoad -.SH "OPTIONS" -.TP -\fB--activate-goad-server\fR -(Internal use only) GOAD server ID to activate - -GOAD_ID may be: - -\fBmultiload_cpuload_applet \fRstart the cpu applet. - -\fBmultiload_loadavg_applet \fRstart the load average applet. - -\fBmultiload_memload_applet \fRstart the memory applet. - -\fBmultiload_netload_applet \fRstart the net applet. - -\fBmultiload_swapload_applet \fRstart the swap applet. -.SH "AUTHOR" -.PP -This manual page was written by Christian Marillat for -the Debian GNU/Linux system (but may be used by others). diff --git a/multiload/Makefile.am b/multiload/Makefile.am index 43b238e4..4241b48b 100644 --- a/multiload/Makefile.am +++ b/multiload/Makefile.am @@ -8,9 +8,9 @@ AM_CPPFLAGS = \ $(MATEDESKTOP_CFLAGS) \ $(GIO_CFLAGS) -libexec_PROGRAMS = multiload-applet +libexec_PROGRAMS = mate-multiload-applet -multiload_applet_SOURCES = \ +mate_multiload_applet_SOURCES = \ global.h \ linux-proc.h \ load-graph.h \ @@ -22,7 +22,7 @@ multiload_applet_SOURCES = \ autoscaler.c \ autoscaler.h -multiload_applet_LDADD = \ +mate_multiload_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ $(GTOP_APPLETS_LIBS) \ $(MATEDESKTOP_LIBS) \ 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 584b0c03..ad17fffe 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 +Location=@LIBEXECDIR@/mate-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 f592f048..d4c7da3c 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 +Exec=@LIBEXECDIR@/mate-multiload-applet -- cgit v1.2.1