From bebf0df92e479f82790fc251d36d3d00cbed093b Mon Sep 17 00:00:00 2001 From: MotoHoss Date: Sun, 12 Oct 2014 13:37:49 -0500 Subject: drivemount: Rename binary and manpage. fixes #103 Avoid file collision with gnome applets. --- drivemount/Makefile.am | 6 ++--- ...pplets.DriveMountApplet.mate-panel-applet.in.in | 2 +- ...panel.applet.DriveMountAppletFactory.service.in | 2 +- man/Makefile.am | 6 ++--- man/drivemount_applet.1 | 30 ---------------------- man/mate-drivemount-applet.1 | 30 ++++++++++++++++++++++ 6 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 man/drivemount_applet.1 create mode 100644 man/mate-drivemount-applet.1 diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am index b2e99df5..dc0f225b 100644 --- a/drivemount/Makefile.am +++ b/drivemount/Makefile.am @@ -7,16 +7,16 @@ AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(MATEDESKTOP_CFLAGS) -libexec_PROGRAMS = drivemount-applet +libexec_PROGRAMS = mate-drivemount-applet -drivemount_applet_SOURCES = \ +mate_drivemount_applet_SOURCES = \ drivemount.c \ drive-list.c \ drive-list.h \ drive-button.c \ drive-button.h -drivemount_applet_LDADD = \ +mate_drivemount_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ $(MATEDESKTOP_LIBS) 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 2cff60f5..39bae82b 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-applet +Location=@LIBEXECDIR@/mate-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 898c4f09..90d44b42 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-applet +Exec=@LIBEXECDIR@/mate-drivemount-applet diff --git a/man/Makefile.am b/man/Makefile.am index b6c7ef51..14a8ef3a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,7 +1,7 @@ man_MANS = \ - mate-charpick-applet.1 \ - mate-cpufreq-selector.1 \ - drivemount_applet.1 \ + mate-charpick-applet.1 \ + mate-cpufreq-selector.1 \ + mate-drivemount-applet.1 \ geyes_applet.1 \ invest-chart.1 \ mateweather.1 \ diff --git a/man/drivemount_applet.1 b/man/drivemount_applet.1 deleted file mode 100644 index dc391c4b..00000000 --- a/man/drivemount_applet.1 +++ /dev/null @@ -1,30 +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 "DRIVEMOUNT_APPLET" "1" "10 februar 2002" "" "" -.SH NAME -drivemount_applet \- Drive Mount Applet for the MATE panel. -.SH SYNOPSIS - -\fBdrivemount_applet\fR [ \fB--activate-goad-server \fI[=GOAD_ID]\fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBdrivemount_applet\fR allows you to quickly and easily -mount and unmount various types of drives and file systems on your -computer. -.PP -To add this applet to a Panel, right-click on the Panel and -choose Applets->Utility->Drive Mount. -.SH "OPTIONS" -.TP -\fB--activate-goad-server\fR -(Internal use only) GOAD server ID to activate. - -GOAD_ID is usually the applet name [\fBdrivemount_applet\fR] -.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/mate-drivemount-applet.1 b/man/mate-drivemount-applet.1 new file mode 100644 index 00000000..e81b9a27 --- /dev/null +++ b/man/mate-drivemount-applet.1 @@ -0,0 +1,30 @@ +.\" 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-DRIVEMOUNT-APPLET" "1" "10 februar 2002" "" "" +.SH NAME +mate-drivemount-applet \- Drive Mount Applet for the MATE panel. +.SH SYNOPSIS + +\fBmate-drivemount-applet\fR [ \fB--activate-goad-server \fI[=GOAD_ID]\fB\fR ] + +.SH "DESCRIPTION" +.PP +\fBmate-drivemount-applet\fR allows you to quickly and easily +mount and unmount various types of drives and file systems on your +computer. +.PP +To add this applet to a Panel, right-click on the Panel and +choose Applets->Utility->Drive Mount. +.SH "OPTIONS" +.TP +\fB--activate-goad-server\fR +(Internal use only) GOAD server ID to activate. + +GOAD_ID is usually the applet name [\fBmate-drivemount-applet\fR] +.SH "AUTHOR" +.PP +This manual page was written by Christian Marillat for +the Debian GNU/Linux system (but may be used by others). -- cgit v1.2.1