propagate from branch 'ca.inverse.sogo.1_3_17' (head 0b971c913f1dcc574124f2fbec92bfc772b4677f)

to branch 'ca.inverse.sogo' (head 2e1d45aecc2da519dcdd145e1c625ddca3fbffc7)

Monotone-Parent: 0b971c913f1dcc574124f2fbec92bfc772b4677f
Monotone-Parent: 2e1d45aecc2da519dcdd145e1c625ddca3fbffc7
Monotone-Revision: ee420c08e441b07f51979bdf3e0f1ff9cb692563

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-26T20:42:57
Monotone-Branch: ca.inverse.sogo

debian-multiarch/control

@@ -35,6 +35,20 @@ Description: a modern and scalable groupware - development files
  .
  This package contains the development files for developing SOGo modules.
 
+Package: sogo-openchange
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Section: net
+Priority: extra
+Architecture: any
+Depends: sogo (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: a modern and scalable groupware - OpenChange backend
+ SOGo is a groupware server built around OpenGroupware.org (OGo) and
+ the SOPE application server with focus on scalability.
+ .
+ This package contains the backend plugin for using SOGo as a backend
+ to OpenChange.
+
 Package: sogo-dbg
 Section: debug
 Priority: extra

debian-multiarch/rules

@@ -20,6 +20,9 @@ build-arch: build-arch-stamp
 build-arch-stamp:  config.make 
 #	 Add here commands to compile the arch part of the package.
 	$(MAKE)
+	if pkg-config --atleast-version=1.0 libmapi; \
+	then (cd OpenChange; $(MAKE));  \
+	fi
 	touch $@
 
 clean: 
@@ -31,8 +34,15 @@ clean:
 	-find Tests -name "*.pyc" -exec rm -f {} \;
 	if [ -f config.make ]; \
 	then \
+	  if pkg-config --atleast-version=1.0 libmapi; \
+	  then \
+	    (cd OpenChange; make clean); \
+	  fi; \
 	  make clean; \
 	fi
+	-rm -f OpenChange/MAPIStorePropertySelectors.*
+	-find OpenChange -type d -name "unrtf-*" -exec rm -rf {} \;
+	-rm -f OpenChange/unrtf*-stamp
 	-rm -f config.make
 	dh_clean 
 
@@ -50,6 +60,18 @@ install-arch: build-arch
 #	dh_installdirs -s
 
 	$(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install
+	if pkg-config --atleast-version=1.0 libmapi; \
+	then \
+	  (cd OpenChange; \
+	   $(MAKE) \
+	       DESTDIR=$(DESTDIR) \
+	       GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+	     install); \
+	  rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so.1; \
+	  rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so; \
+	  mv -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so.1.0.0 \
+	           $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/SOGo.so; \
+	fi
 
 	mkdir -p debian/tmp/etc/default
 	cp Scripts/sogo-default debian/tmp/etc/default/sogo

debian-multiarch/sogo-openchange.install

@@ -0,0 +1,2 @@
+usr/lib/*/mapistore_backends/*
+usr/lib/GNUstep/SOGo/SOGoBackend.MAPIStore