Kolab Groupware OBS

Changes of Revision 12

debian.rules Changed

@@ -14,11 +14,17 @@
 # dependencies in the exact versions expected by relx.
 # For maintainers, this means: please revision-bump this package every time one
 # of its dependencies gets version-bumped.
-currver   = $(shell dpkg-query -f '$${Version}' -W $(1) | sed 's/[+-].*$$//')
-pinver    = $(1) (= $(call currver,$(1)))
-pinvererl = $(1) (= $(call currver,erlang))
-altbundle = $(call pinver,$(1)) | guam-bundled-libs (= $(DEB_VERSION_UPSTREAM))
-SUBSTVARS += -Vdist:GuamDepends="$(call pinvererl,erlang-base) | $(call pinvererl,erlang-base-hipe) | guam-bundled-libs (= $(DEB_VERSION_UPSTREAM)), $(call altbundle,erlang-asn1), $(call altbundle,erlang-eimap), $(call altbundle,erlang-goldrush), $(call altbundle,erlang-inets), $(call altbundle,erlang-lager), $(call altbundle,erlang-lager-syslog), $(call altbundle,erlang-public-key)"
+GBL := guam-bundled-libs (= $(DEB_VERSION_UPSTREAM))
+currver = $(shell dpkg-query -f '$${Version}' -W $(1) | sed 's/[+-].*$$//')
+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))
+pinvererl = $(call pinvererlmin,$(1)), $(call pinvererlmax,$(1))
+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-goldrush), $(call altbundle,erlang-inets), $(call altbundle,erlang-lager), $(call altbundle,erlang-lager-syslog), $(call altbundle,erlang-public-key)"
 SUBSTVARS += -Vdist:BundleConflicts="$(call pinvererl,erlang-base), $(call pinvererl,erlang-base-hipe), $(call pinver,erlang-asn1), $(call pinver,erlang-eimap), $(call pinver,erlang-goldrush), $(call pinver,erlang-inets), $(call pinver,erlang-lager), $(call pinver,erlang-lager-syslog), $(call pinver, erlang-public-key)"
 
 %: