From 20b6dcb99dd4cf36ddde513f18e2d19a10fe382f Mon Sep 17 00:00:00 2001 From: MotoHoss Date: Sat, 11 Oct 2014 21:10:34 -0500 Subject: charpick: Rename binary and manpage. fixes #103 Avoid file collision with gnome applets. --- charpick/Makefile.am | 6 ++--- ...pplets.CharpickerApplet.mate-panel-applet.in.in | 2 +- ...panel.applet.CharpickerAppletFactory.service.in | 2 +- man/Makefile.am | 2 +- man/charpick_applet.1 | 31 ---------------------- man/mate-charpick-applet.1 | 31 ++++++++++++++++++++++ 6 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 man/charpick_applet.1 create mode 100644 man/mate-charpick-applet.1 diff --git a/charpick/Makefile.am b/charpick/Makefile.am index 365fae44..b58c4c98 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -8,13 +8,13 @@ AM_CPPFLAGS = \ $(MATEDESKTOP_CFLAGS) \ $(GUCHARMAP_CFLAGS) -libexec_PROGRAMS = charpick-applet +libexec_PROGRAMS = mate-charpick-applet -charpick_applet_SOURCES = charpick.c \ +mate_charpick_applet_SOURCES = charpick.c \ charpick.h \ properties.c -charpick_applet_LDADD = \ +mate_charpick_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ $(MATEDESKTOP_LIBS) \ $(GUCHARMAP_LIBS) 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 f7a9d2b0..3642f058 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-applet +Location=@LIBEXECDIR@/mate-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 bfca2847..531430b2 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-applet +Exec=@LIBEXECDIR@/mate-charpick-applet diff --git a/man/Makefile.am b/man/Makefile.am index 6eb58659..ffc75f1a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,5 @@ man_MANS = \ - charpick_applet.1 \ + mate-charpick-applet.1 \ cpufreq-selector.1 \ drivemount_applet.1 \ geyes_applet.1 \ diff --git a/man/charpick_applet.1 b/man/charpick_applet.1 deleted file mode 100644 index 13a452e2..00000000 --- a/man/charpick_applet.1 +++ /dev/null @@ -1,31 +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 "CHARPICK_APPLET" "1" "10 februar 2002" "" "" -.SH NAME -charpick_applet \- Character Picker Applet for the MATE panel. -.SH SYNOPSIS - -\fBcharpick_applet\fR [ \fB--activate-goad-server \fI[=GOAD_ID] \fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBcharpick_applet\fR allows you to easily write many -characters which are not available on standard keyboards such as -accented characters, certain mathematical symbols and punctuation, -and some other special symbols. -.PP -To add this applet to a Panel, right-click on the Panel and -choose Applets->Utility->Character Picker. -.SH "OPTIONS" -.TP -\fB--activate-goad-server\fR -(Internal use only) GOAD server ID to activate. - -GOAD_ID is usually the applet name [\fBcharpick_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-charpick-applet.1 b/man/mate-charpick-applet.1 new file mode 100644 index 00000000..75862564 --- /dev/null +++ b/man/mate-charpick-applet.1 @@ -0,0 +1,31 @@ +.\" 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-CHARPICK-APPLET" "1" "10 februar 2002" "" "" +.SH NAME +mate-charpick-applet \- Character Picker Applet for the MATE panel. +.SH SYNOPSIS + +\fBmate-charpick-applet\fR [ \fB--activate-goad-server \fI[=GOAD_ID] \fB\fR ] + +.SH "DESCRIPTION" +.PP +\fBmate-charpick-applet\fR allows you to easily write many +characters which are not available on standard keyboards such as +accented characters, certain mathematical symbols and punctuation, +and some other special symbols. +.PP +To add this applet to a Panel, right-click on the Panel and +choose Applets->Utility->Character Picker. +.SH "OPTIONS" +.TP +\fB--activate-goad-server\fR +(Internal use only) GOAD server ID to activate. + +GOAD_ID is usually the applet name [\fBmate-charpick-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