diff options
| -rw-r--r-- | shell/ChangeLog | 12 | ||||
| -rw-r--r-- | shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/e-config-upgrade.c | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 01d8f1fa42..a049281b7d 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,15 @@ +2003-06-05 Not Zed <NotZed@Ximian.com> + + ** For #42691. + + * Makefile.am (%.server.in): use implicit rule. + (BUILT_SOURCES): added server_DATA. + +2003-05-22 Not Zed <NotZed@Ximian.com> + + * e-config-upgrade.c (CONF_MAJOR, CONF_MINOR, CONF_REVISION): Set + to 1.4.0 for release. + 2003-06-10 Larry Ewing <lewing@ximian.com> * e-corba-storage-registry.c (listener_notify): don't leak nr.name. diff --git a/shell/Makefile.am b/shell/Makefile.am index fd608ef3cc..b6021ea02d 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -289,7 +289,7 @@ install-test-component: evolution-test-component server_in_files = GNOME_Evolution_Shell.server.in.in server_DATA = $(server_in_files:.server.in.in=.server) -$(server_in_files:.server.in.in=.server.in): $(server_in_files) +%.server.in: %.server.in.in sed -e "s|\@BINDIR\@|$(bindir)|" \ -e "s|\@VERSION\@|$(BASE_VERSION)|" \ $< > $@ @@ -377,7 +377,7 @@ evolution.pure: evolution endif -BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) +BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) CLEANFILES = $(BUILT_SOURCES) dist-hook: diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c index 9128dd6018..a1f0e14bd9 100644 --- a/shell/e-config-upgrade.c +++ b/shell/e-config-upgrade.c @@ -47,8 +47,8 @@ /* output revision of configuration */ #define CONF_MAJOR (1) -#define CONF_MINOR (3) -#define CONF_REVISION (1) +#define CONF_MINOR (4) +#define CONF_REVISION (0) /* major/minor/revision of existing config */ static unsigned int major = -1; |