aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@novell.com>2006-02-06 16:47:45 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2006-02-06 16:47:45 +0800
commit3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f (patch)
tree4aada6d340aa9c1d24750658fb46da1f84d022be
parentefc4ab93cf38cafea912e793cc38ef63a658d4e0 (diff)
downloadgsoc2013-evolution-3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f.tar
gsoc2013-evolution-3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f.tar.gz
gsoc2013-evolution-3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f.tar.bz2
gsoc2013-evolution-3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f.tar.lz
gsoc2013-evolution-3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f.tar.xz
gsoc2013-evolution-3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f.tar.zst
gsoc2013-evolution-3c44c1e40dd87f7869f19c1ab82fcdcfdf2b720f.zip
Remove hard-coded EDS version number. Read it from
2006-02-06 Harish Krishnaswamy <kharish@novell.com> * configure.in, data/Makefile.am, data/evolution.desktop.in.in: Remove hard-coded EDS version number. Read it from evolution-data-server.pc instead. svn path=/trunk/; revision=31417
-rw-r--r--ChangeLog7
-rw-r--r--configure.in3
-rw-r--r--data/Makefile.am2
-rw-r--r--data/evolution.desktop.in.in2
4 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 46aa224abc..dd9cac38fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-06 Harish Krishnaswamy <kharish@novell.com>
+
+ * configure.in, data/Makefile.am,
+ data/evolution.desktop.in.in: Remove hard-coded
+ EDS version number. Read it from
+ evolution-data-server.pc instead.
+
2006-01-30 Harish Krishnaswamy <kharish@novell.com>
* configure.in, NEWS: Release updates, version bump.
diff --git a/configure.in b/configure.in
index 5cc25a9d0c..cec35705b7 100644
--- a/configure.in
+++ b/configure.in
@@ -1288,6 +1288,9 @@ dnl -- evolution-data-server IDL and version
AC_DEFINE(DATASERVER_API_VERSION, "1.2", evolution-data-server API version)
AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`pkg-config --modversion evolution-data-server-1.2`", evolution-data-server version)
+DATASERVER_EXEC_VERSION=`pkg-config --variable=execversion evolution-data-server-1.2`
+AC_SUBST(DATASERVER_EXEC_VERSION)
+
AC_MSG_CHECKING(for evolution-data-server IDL)
DATASERVER_IDL=`pkg-config --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl
if test -f "$DATASERVER_IDL"; then
diff --git a/data/Makefile.am b/data/Makefile.am
index dfee0f16e3..934d1c6a4b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@ desktopdir = $(datadir)/applications
desktop_in_in_file = evolution.desktop.in.in
desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
%.desktop.in: %.desktop.in.in
- sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" $< > $@
+ sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" -e "s|\@DATASERVER_EXEC_VERSION\@|$(DATASERVER_EXEC_VERSION)|" $< > $@
@INTLTOOL_DESKTOP_RULE@
diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in
index 93b1011e6e..dcb8235bb2 100644
--- a/data/evolution.desktop.in.in
+++ b/data/evolution.desktop.in.in
@@ -9,5 +9,5 @@ Type=Application
Categories=GNOME;Application;Office;X-Red-Hat-Base;
StartupNotify=true
X-GNOME-Bugzilla-Product=Evolution
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.4;evolution-exchange-storage;evolution-alarm-notify;
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-@DATASERVER_EXEC_VERSION@;evolution-exchange-storage;evolution-alarm-notify;