[Xfce4-commits] <exo:versioning-from-0.3-to-1> Switch from exo-0.3 to exo-1 (library and command names).
Jannis Pohlmann
jannis at xfce.org
Thu Aug 13 00:30:02 CEST 2009
Updating branch refs/heads/versioning-from-0.3-to-1
to 2de4f022e76541549f2c7a1e1e41116b8da98e2c (commit)
from 4c725114b766723232351bfb39f453d94cf8d631 (commit)
commit 2de4f022e76541549f2c7a1e1e41116b8da98e2c
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 00:09:35 2009 +0200
Switch from exo-0.3 to exo-1 (library and command names).
I might have missed a few spots. This is not tested yet.
configure.in.in | 6 +++---
docs/reference/tmpl/exo-hal.sgml | 2 +-
exo-hal/Makefile.am | 14 +++++++-------
exo-hal/{exo-hal-0.3.pc.in => exo-hal-1.pc.in} | 0
exo-helper/helpers/Makefile.am | 4 ++--
exo-helper/helpers/balsa.desktop.in.in | 2 +-
exo-helper/helpers/evolution.desktop.in.in | 2 +-
.../{exo-compose-mail-0.3 => exo-compose-mail-1} | 6 +++---
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 +-
exo-mount-notify/Makefile.am | 10 +++++-----
exo/Makefile.am | 14 +++++++-------
exo/{exo-0.3.pc.in => exo-1.pc.in} | 0
17 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 1e27787..ba91ecb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -162,7 +162,7 @@ dnl *** Check for HAL (optional) ***
dnl ********************************
XDT_CHECK_OPTIONAL_PACKAGE([HAL], [hal-storage], [0.5.7], [hal], [HAL support], [yes])
if test x"$HAL_FOUND" = x"yes"; then
- dnl # substituted into exo-hal-0.3.pc
+ dnl # substituted into exo-hal-1.pc
HAL_STORAGE_DEPENDENCY="hal-storage"
dnl # Check if LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL is declared
@@ -414,12 +414,12 @@ docs/reference/Makefile
docs/reference/version.xml
exo.spec
exo/Makefile
-exo/exo-0.3.pc
+exo/exo-1.pc
exo/exo-config.h
exo-csource/Makefile
exo-desktop-item-edit/Makefile
exo-hal/Makefile
-exo-hal/exo-hal-0.3.pc
+exo-hal/exo-hal-1.pc
exo-helper/Makefile
exo-helper/helpers/Makefile
exo-mount/Makefile
diff --git a/docs/reference/tmpl/exo-hal.sgml b/docs/reference/tmpl/exo-hal.sgml
index a698f10..584bffe 100644
--- a/docs/reference/tmpl/exo-hal.sgml
+++ b/docs/reference/tmpl/exo-hal.sgml
@@ -26,7 +26,7 @@ Miscellaneous Utility Functions for HAL integration
<para>
The HAL support module is not part of the main <filename>exo</filename> library, so you if you want to
use any of these functions you will need to explicitly link to the <filename>exo-hal</filename> library.
- This is done with the <command>pkg-config</command> utility, using <filename>exo-hal-0.3</filename> as
+ This is done with the <command>pkg-config</command> utility, using <filename>exo-hal-1</filename> as
the package name.
</para>
diff --git a/exo-hal/Makefile.am b/exo-hal/Makefile.am
index 574aed7..3b9e796 100644
--- a/exo-hal/Makefile.am
+++ b/exo-hal/Makefile.am
@@ -6,31 +6,31 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"exo-hal\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-libexohalincludedir = $(includedir)/exo-0.3/exo-hal
+libexohalincludedir = $(includedir)/exo-1/exo-hal
libexohalinclude_HEADERS = exo-hal.h
lib_LTLIBRARIES = \
- libexo-hal-0.3.la
+ libexo-hal-1.la
-libexo_hal_0_3_la_SOURCES = \
+libexo_hal_1_la_SOURCES = \
$(libexohalinclude_HEADERS) \
exo-hal.c
-libexo_hal_0_3_la_CFLAGS = \
+libexo_hal_1_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(HAL_CFLAGS)
-libexo_hal_0_3_la_LDFLAGS = \
+libexo_hal_1_la_LDFLAGS = \
-export-dynamic \
-version-info $(LIBEXO_VERINFO) \
-export-symbols-regex "^[^_].*" \
-no-undefined
-libexo_hal_0_3_la_LIBADD = \
+libexo_hal_1_la_LIBADD = \
$(GLIB_LIBS) \
$(HAL_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = exo-hal-0.3.pc
+pkgconfig_DATA = exo-hal-1.pc
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/exo-hal/exo-hal-0.3.pc.in b/exo-hal/exo-hal-1.pc.in
similarity index 100%
rename from exo-hal/exo-hal-0.3.pc.in
rename to exo-hal/exo-hal-1.pc.in
diff --git a/exo-helper/helpers/Makefile.am b/exo-helper/helpers/Makefile.am
index a765a71..528c163 100644
--- a/exo-helper/helpers/Makefile.am
+++ b/exo-helper/helpers/Makefile.am
@@ -42,7 +42,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
libexec_SCRIPTS = \
- exo-compose-mail-0.3
+ exo-compose-mail-1
DISTCLEANFILES = \
$(desktop_in_files) \
@@ -51,6 +51,6 @@ DISTCLEANFILES = \
EXTRA_DIST = \
$(defaults_DATA) \
$(desktop_in_in_files) \
- exo-compose-mail-0.3
+ exo-compose-mail-1
# 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 78b3bf0..84b71ef 100644
--- a/exo-helper/helpers/balsa.desktop.in.in
+++ b/exo-helper/helpers/balsa.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=balsa;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 balsa %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 balsa %B "mailto:%s";
diff --git a/exo-helper/helpers/evolution.desktop.in.in b/exo-helper/helpers/evolution.desktop.in.in
index f6cccef..c5d9d9b 100644
--- a/exo-helper/helpers/evolution.desktop.in.in
+++ b/exo-helper/helpers/evolution.desktop.in.in
@@ -8,4 +8,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=@libexecdir@/exo-compose-mail-0.3 evolution %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 evolution %B "mailto:%s";
diff --git a/exo-helper/helpers/exo-compose-mail-0.3 b/exo-helper/helpers/exo-compose-mail-1
similarity index 96%
rename from exo-helper/helpers/exo-compose-mail-0.3
rename to exo-helper/helpers/exo-compose-mail-1
index 58e2561..8ea65a9 100755
--- a/exo-helper/helpers/exo-compose-mail-0.3
+++ b/exo-helper/helpers/exo-compose-mail-1
@@ -1,8 +1,8 @@
#!/usr/bin/env perl
#
-# exo-compose-mail-0.3 - Perl script to parse mailto:-URIs and invoke the
-# various included MailReaders with the appropriate
-# parameters.
+# exo-compose-mail-1 - Perl script to parse mailto:-URIs and invoke the
+# various included MailReaders with the appropriate
+# parameters.
#
# $Id$
#
diff --git a/exo-helper/helpers/kmail.desktop.in.in b/exo-helper/helpers/kmail.desktop.in.in
index c287055..5dd3ffd 100644
--- a/exo-helper/helpers/kmail.desktop.in.in
+++ b/exo-helper/helpers/kmail.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=true
X-XFCE-Binaries=kmail;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParamter=@libexecdir@/exo-compose-mail-0.3 kmail %B "mailto:%s";
+X-XFCE-CommandsWithParamter=@libexecdir@/exo-compose-mail-1 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 f09b8bb..81b3aac 100644
--- a/exo-helper/helpers/mozilla-mailer.desktop.in.in
+++ b/exo-helper/helpers/mozilla-mailer.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B -mail;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-0.3 mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";
diff --git a/exo-helper/helpers/mutt.desktop.in.in b/exo-helper/helpers/mutt.desktop.in.in
index d1cdd5e..a8fd822 100644
--- a/exo-helper/helpers/mutt.desktop.in.in
+++ b/exo-helper/helpers/mutt.desktop.in.in
@@ -8,4 +8,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 @libexecdir@/exo-compose-mail-0.3 mutt %B "mailto:%s";
+X-XFCE-CommandsWithParameter=exo-open --launch TerminalEmulator @libexecdir@/exo-compose-mail-1 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 90e56f2..0c57c4e 100644
--- a/exo-helper/helpers/sylpheed-claws.desktop.in.in
+++ b/exo-helper/helpers/sylpheed-claws.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=true
X-XFCE-Binaries=claws-mail;sylpheed-claws-gtk2;sylpheed-claws
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/sylpheed.desktop.in.in b/exo-helper/helpers/sylpheed.desktop.in.in
index a39b899..7fa81ab 100644
--- a/exo-helper/helpers/sylpheed.desktop.in.in
+++ b/exo-helper/helpers/sylpheed.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=true
X-XFCE-Binaries=sylpheed;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 sylpheed %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 sylpheed %B "mailto:%s";
diff --git a/exo-helper/helpers/thunderbird.desktop.in.in b/exo-helper/helpers/thunderbird.desktop.in.in
index 40b7c5d..e8944b9 100644
--- a/exo-helper/helpers/thunderbird.desktop.in.in
+++ b/exo-helper/helpers/thunderbird.desktop.in.in
@@ -8,4 +8,4 @@ StartupNotify=false
X-XFCE-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
X-XFCE-Category=MailReader
X-XFCE-Commands=%B;
-X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-0.3 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-0.3 mozilla %B "mailto:%s";
+X-XFCE-CommandsWithParameter=@libexecdir@/exo-compose-mail-1 mozilla-remote %B "mailto:%s";@libexecdir@/exo-compose-mail-1 mozilla %B "mailto:%s";
diff --git a/exo-mount-notify/Makefile.am b/exo-mount-notify/Makefile.am
index 59aedd8..91e0b08 100644
--- a/exo-mount-notify/Makefile.am
+++ b/exo-mount-notify/Makefile.am
@@ -6,20 +6,20 @@ INCLUDES = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
libexec_PROGRAMS = \
- exo-mount-notify-0.3
+ exo-mount-notify-1
-exo_mount_notify_0_3_SOURCES = \
+exo_mount_notify_1_SOURCES = \
main.c
-exo_mount_notify_0_3_CFLAGS = \
+exo_mount_notify_1_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
-exo_mount_notify_0_3_LDFLAGS = \
+exo_mount_notify_1_LDFLAGS = \
-no-undefined
-exo_mount_notify_0_3_LDADD = \
+exo_mount_notify_1_LDADD = \
$(GTK_LIBS) \
$(LIBNOTIFY_LIBS) \
$(LIBXFCE4UTIL_LIBS)
diff --git a/exo/Makefile.am b/exo/Makefile.am
index cc8c4a3..3e710ba 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = \
-DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-lib_LTLIBRARIES = libexo-0.3.la
+lib_LTLIBRARIES = libexo-1.la
libexo_headers = \
exo-binding.h \
@@ -50,7 +50,7 @@ libexo_built_sources = \
exo-marshal.c \
exo-marshal.h
-libexoincludedir = $(includedir)/exo-0.3/exo
+libexoincludedir = $(includedir)/exo-1/exo
libexoinclude_HEADERS = \
$(libexo_built_public_sources) \
@@ -58,7 +58,7 @@ libexoinclude_HEADERS = \
exo.h \
exo-config.h
-libexo_0_3_la_SOURCES = \
+libexo_1_la_SOURCES = \
$(libexoinclude_HEADERS) \
$(libexo_built_sources) \
exo-binding.c \
@@ -100,24 +100,24 @@ libexo_0_3_la_SOURCES = \
exo-wrap-table.c \
exo-xsession-client.c
-libexo_0_3_la_CFLAGS = \
+libexo_1_la_CFLAGS = \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
-libexo_0_3_la_LDFLAGS = \
+libexo_1_la_LDFLAGS = \
-export-dynamic \
-version-info $(LIBEXO_VERINFO) \
-export-symbols-regex "^[^_].*" \
-no-undefined
-libexo_0_3_la_LIBADD = \
+libexo_1_la_LIBADD = \
$(GIO_LIBS) \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = exo-0.3.pc
+pkgconfig_DATA = exo-1.pc
##
diff --git a/exo/exo-0.3.pc.in b/exo/exo-1.pc.in
similarity index 100%
rename from exo/exo-0.3.pc.in
rename to exo/exo-1.pc.in
More information about the Xfce4-commits
mailing list