callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hard-coded EDS version number. Read it from

Browse Source 
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
This commit is contained in:
Harish Krishnaswamy
2006-02-06 08:47:45 +00:00
committed by Harish Krishnaswamy
parent efc4ab93cf
commit 3c44c1e40d
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

3
configure.in
View File

@ -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

2
data/Makefile.am
View File

@ -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@

2
data/evolution.desktop.in.in
View File

@ -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;