Kolab Groupware OBS

Changes of Revision 50

debian.control Changed

debian.rules Changed

@@ -19,11 +19,16 @@
 nextver = $(shell echo $(call currver,$(1)) | perl -pe 's/((\d+\.)*)(\d+)$$/$$1.($$3+1)/e')
 pinvermin = $(1) (>= $(call currver,$(1)))
 pinvermax = $(1) (<< $(call nextver,$(1)))
+pinver    = $(call pinvermin,$(1)), $(call pinvermax,$(1))
 pinvererlmin = $(1) (>= $(call currver,erlang))
 pinvererlmax = $(1) (<< $(call nextver,erlang))
 altbundle = $(call pinvermin,$(1)) | $(GBL), $(call pinvermax,$(1)) | $(GBL)
-SUBSTVARS += -Vdist:GuamDepends="$(call pinvererlmin,erlang-base) | $(call pinvererlmin,erlang-base-hipe) | $(GBL), $(call pinvererlmax,erlang-base) | $(call pinvererlmax,erlang-base-hipe) | $(GBL), $(call altbundle,erlang-asn1), $(call altbundle,erlang-eimap), $(call altbundle,erlang-inets), $(call altbundle,erlang-lager), $(call altbundle,erlang-lager-syslog), $(call altbundle,erlang-public-key)"
-SUBSTVARS += -Vdist:BundleConflicts="$(call pinvererlmax,erlang-base), $(call pinvererlmax,erlang-base-hipe)"
+
+SUBSTVARS += -Vdist:GuamDepends="$(call pinvererlmin,erlang-base) | $(call pinvererlmin,erlang-base-hipe) | $(GBL), $(call pinvererlmax,erlang-base) | $(call pinvererlmax,erlang-base-hipe) | $(GBL), $(call pinver,erlang-eimap), $(call pinver,erlang-lager-syslog), $(call altbundle,erlang-asn1), $(call altbundle,erlang-inets), $(call altbundle,erlang-lager), $(call altbundle,erlang-public-key)"
+SUBSTVARS += -Vdist:GuamBundleDepends="$(call pinver,erlang-eimap), $(call pinver,erlang-lager-syslog)"
+
+EIMAP_DIR        := eimap-$(call currver,erlang-eimap)
+LAGER_SYSLOG_DIR := lager_syslog-$(call currver,erlang-lager-syslog)
 
 %:
 	dh $@ --with=systemd
@@ -102,6 +107,10 @@
 		$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
 	rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
 	ln -s .. $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
+	for dir in $(EIMAP_DIR) $(LAGER_SYSLOG_DIR); do \
+		rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
+		ln -s ../../$$dir $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
+	done
 
 override_dh_gencontrol:
 	dh_gencontrol -- $(SUBSTVARS)