From 81f335088850182319383ec75856fb9a559c82c1 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 15 Dec 2011 13:36:10 +0000 Subject: [PATCH 1/2] Fixed version file to 2.0.0. Monotone-Parent: e58b519a51a061b80853202ec91f07ec470a2bf0 Monotone-Revision: 46c94a711dad0272d530ac34edf0d0a9918b7510 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-15T13:36:10 Monotone-Branch: ca.inverse.sogo --- Version | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Version b/Version index 640430005..09503ebca 100644 --- a/Version +++ b/Version @@ -2,6 +2,6 @@ # This file is included by library makefiles to set the version information # of the executable. -MAJOR_VERSION=1 -MINOR_VERSION=3 -SUBMINOR_VERSION=12 +MAJOR_VERSION=2 +MINOR_VERSION=0 +SUBMINOR_VERSION=0 From dcc991ca4e1044795fe6327451492730e8da5199 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 22 Dec 2011 21:13:53 +0000 Subject: [PATCH 2/2] Monotone-Parent: 9f17d2137546528e36f23d8a37a6bbdb69bc3a3f Monotone-Revision: 441881b5757d734efa6d8072844aa767ef1709e2 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-12-22T21:13:53 Monotone-Branch: ca.inverse.sogo --- OpenChange/GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile index 7452c39fc..a28abc6d3 100644 --- a/OpenChange/GNUmakefile +++ b/OpenChange/GNUmakefile @@ -172,12 +172,12 @@ LIBMAPISTORE_CFLAGS = $(shell pkg-config libmapistore --cflags) -DSAMBA_PREFIX=" LIBMAPISTORE_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy $(MAPISTORESOGO)_INSTALL_DIR = $(DESTDIR)/$(SAMBA_LIB_DIR)/mapistore_backends -$(MAPISTORESOGO)_LDFLAGS += \ +$(MAPISTORESOGO)_LIB_DIRS += \ -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \ $(LIBMAPI_LIBS) \ $(LIBMAPISTORE_LIBS) -$(SOGOBACKEND)_LDFLAGS += \ +$(SOGOBACKEND)_LIB_DIRS += \ -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \ -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \ $(LIBMAPI_LIBS) \