[Xfce4-commits] [xfce/exo] 01/01: Remove library version from the perl script since it doesn't depend on the library
noreply at xfce.org
noreply at xfce.org
Fri Mar 29 05:10:06 CET 2019
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/exo.
commit 31cfb6ddb6a3b0fa91243013a03454965bbbf66b
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Fri Mar 29 00:09:58 2019 -0400
Remove library version from the perl script since it doesn't depend on the library
---
.gitignore | 1 +
exo-helper/helpers/Makefile.am | 10 ++++------
exo-helper/helpers/balsa.desktop.in.in | 2 +-
exo-helper/helpers/evolution.desktop.in.in | 2 +-
exo-helper/helpers/{exo-compose-mail-2 => exo-compose-mail} | 6 +++---
exo-helper/helpers/geary.desktop.in.in | 2 +-
exo-helper/helpers/icedove.desktop.in.in | 2 +-
exo-helper/helpers/kmail.desktop.in.in | 2 +-
exo-helper/helpers/mozilla-mailer.desktop.in.in | 2 +-
exo-helper/helpers/mutt.desktop.in.in | 2 +-
exo-helper/helpers/sylpheed-claws.desktop.in.in | 2 +-
exo-helper/helpers/sylpheed.desktop.in.in | 2 +-
exo-helper/helpers/thunderbird.desktop.in.in | 2 +-
13 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/.gitignore b/.gitignore
index 70f4453..7edff2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ test-driver
# Files generated by make
*.1
+*.bak
*.desktop
*.gmo
*.la
diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index 2fde669..296cfc3 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -62,14 +62,12 @@ desktop_in_in_files = \
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
%.desktop.in: %.desktop.in.in
- sed -e 's,\@HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO2_VERSION_API),g' \
- -e 's, at LIBEXO2_VERSION_API\@,$(LIBEXO2_VERSION_API),g' \
- < $< > $@
+ sed -e 's,\@HELPERDIR\@,$(HELPER_PATH_PREFIX)/xfce4/exo,g' < $< > $@
@INTLTOOL_DESKTOP_RULE@
-exo_composedir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO2_VERSION_API)
+exo_composedir = $(HELPER_PATH_PREFIX)/xfce4/exo
exo_compose_SCRIPTS = \
- exo-compose-mail-$(LIBEXO2_VERSION_API)
+ exo-compose-mail
DISTCLEANFILES = \
$(desktop_in_files) \
@@ -78,6 +76,6 @@ DISTCLEANFILES = \
EXTRA_DIST = \
$(defaults_DATA) \
$(desktop_in_in_files) \
- exo-compose-mail-$(LIBEXO2_VERSION_API)
+ exo-compose-mail
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/exo-helper/helpers/balsa.desktop.in.in b/exo-helper/helpers/balsa.desktop.in.in
index d4fe40f..bda726c 100644
--- a/exo-helper/helpers/balsa.desktop.in.in
+++ b/exo-helper/helpers/balsa.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=balsa;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ balsa %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail balsa %B "mailto:%s";
diff --git a/exo-helper/helpers/evolution.desktop.in.in b/exo-helper/helpers/evolution.desktop.in.in
index 68b81a2..17f9a39 100644
--- a/exo-helper/helpers/evolution.desktop.in.in
+++ b/exo-helper/helpers/evolution.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=evolution-2.4;evolution-2.3;evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ evolution %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail evolution %B "mailto:%s";
diff --git a/exo-helper/helpers/exo-compose-mail-2 b/exo-helper/helpers/exo-compose-mail
similarity index 97%
rename from exo-helper/helpers/exo-compose-mail-2
rename to exo-helper/helpers/exo-compose-mail
index ef94116..fae339f 100755
--- a/exo-helper/helpers/exo-compose-mail-2
+++ b/exo-helper/helpers/exo-compose-mail
@@ -1,8 +1,8 @@
#!/usr/bin/env perl
#
-# exo-compose-mail-2 - Perl script to parse mailto:-URIs and invoke the
-# various included MailReaders with the appropriate
-# parameters.
+# exo-compose-mail - Perl script to parse mailto:-URIs and invoke the
+# various included MailReaders with the appropriate
+# parameters.
#
# Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
#
diff --git a/exo-helper/helpers/geary.desktop.in.in b/exo-helper/helpers/geary.desktop.in.in
index f16a38c..99c1045 100644
--- a/exo-helper/helpers/geary.desktop.in.in
+++ b/exo-helper/helpers/geary.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=geary
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ geary %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail geary %B "mailto:%s";
diff --git a/exo-helper/helpers/icedove.desktop.in.in b/exo-helper/helpers/icedove.desktop.in.in
index 3cd59cb..23e2e11 100644
--- a/exo-helper/helpers/icedove.desktop.in.in
+++ b/exo-helper/helpers/icedove.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=icedove;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail mozilla %B "mailto:%s";
diff --git a/exo-helper/helpers/kmail.desktop.in.in b/exo-helper/helpers/kmail.desktop.in.in
index fd7ef12..b910ab8 100644
--- a/exo-helper/helpers/kmail.desktop.in.in
+++ b/exo-helper/helpers/kmail.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
X-XFCE-Binaries=kmail;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParamter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ kmail %B "mailto:%s";
+X-XFCE-CommandsWithParamter=@HELPERDIR@/exo-compose-mail kmail %B "mailto:%s";
diff --git a/exo-helper/helpers/mozilla-mailer.desktop.in.in b/exo-helper/helpers/mozilla-mailer.desktop.in.in
index cd208f7..fb08c41 100644
--- a/exo-helper/helpers/mozilla-mailer.desktop.in.in
+++ b/exo-helper/helpers/mozilla-mailer.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B -mail;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail mozilla %B "mailto:%s";
diff --git a/exo-helper/helpers/mutt.desktop.in.in b/exo-helper/helpers/mutt.desktop.in.in
index dcad525..6cf026e 100644
--- a/exo-helper/helpers/mutt.desktop.in.in
+++ b/exo-helper/helpers/mutt.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=mutt;
X-XFCE-Category=MailReader
X-XFCE-Commands=exo-open --launch TerminalEmulator %B;
-X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mutt %B "mailto:%s";
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @HELPERDIR@/exo-compose-mail mutt %B "mailto:%s";
diff --git a/exo-helper/helpers/sylpheed-claws.desktop.in.in b/exo-helper/helpers/sylpheed-claws.desktop.in.in
index ea4e1be..334c687 100644
--- a/exo-helper/helpers/sylpheed-claws.desktop.in.in
+++ b/exo-helper/helpers/sylpheed-claws.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
X-XFCE-Binaries=claws-mail;sylpheed-claws-gtk2;sylpheed-claws
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/sylpheed.desktop.in.in b/exo-helper/helpers/sylpheed.desktop.in.in
index 4340db7..04f2be5 100644
--- a/exo-helper/helpers/sylpheed.desktop.in.in
+++ b/exo-helper/helpers/sylpheed.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=true
X-XFCE-Binaries=sylpheed;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/thunderbird.desktop.in.in b/exo-helper/helpers/thunderbird.desktop.in.in
index f9a373c..f7c8224 100644
--- a/exo-helper/helpers/thunderbird.desktop.in.in
+++ b/exo-helper/helpers/thunderbird.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
X-XFCE-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail- at LIBEXO2_VERSION_API@ mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@HELPERDIR@/exo-compose-mail mozilla-remote %B "mailto:%s";@HELPERDIR@/exo-compose-mail mozilla %B "mailto:%s";
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list