From 9a0b0ccb832fdc3b196691cb651f3aa5821672a2 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 15 May 2020 11:10:14 -0400
Subject: [PATCH] fix(packaging): more openchange cleanups

---
 packaging/debian-multiarch/rules | 13 -------------
 packaging/debian/rules           | 13 -------------
 2 files changed, 26 deletions(-)

diff --git a/packaging/debian-multiarch/rules b/packaging/debian-multiarch/rules
index 2f08506be..7eb9bcc00 100755
--- a/packaging/debian-multiarch/rules
+++ b/packaging/debian-multiarch/rules
@@ -62,18 +62,6 @@ 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
 	(cd ActiveSync; $(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install)
 
 	install -D -m 644 Scripts/sogo-default debian/tmp/etc/default/sogo
@@ -103,7 +91,6 @@ binary-arch: build-arch install-arch
 	  ln -s GNUstep/Frameworks/SOGo.framework/Versions/*/libSOGo* ./ )
 	dh_compress -X.py -X.sh
 	dh_fixperms
-#	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 393741036..2d6994df9 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -64,18 +64,6 @@ 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
 	(cd ActiveSync; $(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install)
 
 	install -D -m 644 Scripts/sogo-default debian/tmp/etc/default/sogo
@@ -105,7 +93,6 @@ binary-arch: build-arch install-arch
 	  ln -s GNUstep/Frameworks/SOGo.framework/Versions/*/libSOGo* ./ )
 	dh_compress -X.py -X.sh
 	dh_fixperms
-#	dh_makeshlibs -X/usr/lib/mapistore_backends
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol