From b73e65ebeb13cf4b13f00a321d709e74dd795dfa Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Tue, 9 Jan 2018 19:08:30 -0500
Subject: [PATCH] (fix) disabled OC packaging

---
 packaging/debian-multiarch/rules | 34 ++++++++++++++++----------------
 packaging/debian/rules           | 34 ++++++++++++++++----------------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/packaging/debian-multiarch/rules b/packaging/debian-multiarch/rules
index 085b092f0..bdf71b21f 100755
--- a/packaging/debian-multiarch/rules
+++ b/packaging/debian-multiarch/rules
@@ -37,13 +37,13 @@ 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; \
+#	  if pkg-config --atleast-version=1.0 libmapi; \
+#	  then \
+#	    (cd OpenChange; make clean); \
+#	  fi; \
 	  make clean; \
 	fi
-	-rm -f OpenChange/MAPIStorePropertySelectors.*
+#	-rm -f OpenChange/MAPIStorePropertySelectors.*
 	-rm -f config.make
 	(cd ActiveSync; make clean); \
 	dh_clean 
@@ -62,18 +62,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
+#	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
 	(cd ActiveSync; $(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install)
 
 	install -D -m 644 Scripts/sogo-default debian/tmp/etc/default/sogo
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 3792ee0f0..17f91a73e 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -39,14 +39,14 @@ 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; \
+#	  if pkg-config --atleast-version=1.0 libmapi; \
+#	  then \
+#	    (cd OpenChange; make clean); \
+#	  fi; \
 	  (cd ActiveSync; $(MAKE) clean); \
 	  make clean; \
 	fi
-	-rm -f OpenChange/MAPIStorePropertySelectors.*
+#	-rm -f OpenChange/MAPIStorePropertySelectors.*
 	-rm -f config.make
 	dh_clean 
 
@@ -64,18 +64,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/mapistore_backends/libMAPIStoreSOGo.so.1; \
-	  rm -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so; \
-	  mv -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so.1.0.0 \
-	           $(DESTDIR)/usr/lib/mapistore_backends/SOGo.so; \
-	fi
+#	if pkg-config --atleast-version=1.0 libmapi; \
+#	then \
+#	  (cd OpenChange; \
+#	   $(MAKE) \
+#	       DESTDIR=$(DESTDIR) \
+#	       GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+#	     install); \
+#	  rm -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so.1; \
+#	  rm -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so; \
+#	  mv -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so.1.0.0 \
+#	           $(DESTDIR)/usr/lib/mapistore_backends/SOGo.so; \
+#	fi
 	(cd ActiveSync; $(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install)
 
 	install -D -m 644 Scripts/sogo-default debian/tmp/etc/default/sogo