Request 2296 (accepted)

Overview

Request 2296 (accepted)

Resubmit 0.9.4, now fixed

Created by sicherha almost 7 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit guam

Submit package home:sicherha:branches:Kolab:16 / guam to package Kolab:Winterfell / guam

debian.changelog Changed

debian.control Changed

@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Christoph Erhardt <kolab@sicherha.de>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-eimap (>= 0.3.0), erlang-lager, erlang-lager-syslog, psa | bash, erlang-rebar3 (>= 3.3.2)
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-eimap (>= 0.3.0), erlang-goldrush (>= 0.2.0), erlang-lager, erlang-lager-syslog, psa | bash, erlang-rebar3 (>= 3.3.2)
 Homepage: https://kolab.org/about/guam
 
 Package: guam
@@ -14,9 +14,21 @@
  Guam is a smart, unjustly outcast Reverse IMAP Proxy that lives at
  the perimeter of your IMAP environment.
 
+Package: guam-libs
+Architecture: any
+Section: mail
+Depends: ${misc:Depends}, ${dist:GuamLibDepends}
+Conflicts: guam-bundled-libs
+Description: Dependency meta-package for Guam
+ This package pulls in all the library dependencies required to run Guam.
+ Debian backports users who have a backported Erlang version may need to install
+ guam-bundled-libs instead.
+
 Package: guam-bundled-libs
 Architecture: any
 Section: mail
 Depends: ${misc:Depends}, ${dist:GuamBundleDepends}
+Conflicts: guam-libs
 Description: Bundled runtime environment for Guam
- This is a support package for backports users.
+ This is a support package for Debian backports users who have a backported
+ Erlang version. All others should preferably use guam-libs.

debian.rules Changed

@@ -2,19 +2,22 @@
 
 include /usr/share/dpkg/pkg-info.mk
 
-DESTDIR = $(CURDIR)/debian/guam
+DESTDIR   = $(CURDIR)/debian/guam
+LIBDIR    = $(CURDIR)/debian/guam-libs
 BUNDLEDIR = $(CURDIR)/debian/guam-bundled-libs
 
 # The versions of all dependencies are hardcoded by relx (which honestly sucks).
 # The following magic tries to ensure that the Debian package's dependencies are
-# pinned to the versions present on the build machine. If the dependencies
-# cannot be satisfied on the end user's machine - for instance because a
-# different Erlang version was installed from backports - we make the package
-# manager pull in an extra package "guam-bundled-libs" that contains all the
-# 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.
-GBL := guam-bundled-libs (= $(DEB_VERSION))
+# pinned to the versions present on the build machine.
+# Usually, we pull in the package "guam-libs", which declares all the regular
+# dependencies and creates an appropriate "lib" symlink.
+# However, if the dependencies cannot be satisfied on the end user's machine -
+# for instance because a  different Erlang version was installed from backports
+# - we make the package manager pull in an extra package "guam-bundled-libs"
+# that contains all the dependencies in the exact versions expected by relx.
+#
+# For maintainers, the bottom line is this: please revision-bump this package
+# every time one of its dependencies gets version-bumped.
 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)))
@@ -22,14 +25,16 @@
 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 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)"
 
+# We ship these packages ourselves, so they don't need bundling
+KOLAB_PROVIDED_DEPS := $(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)
 
+SUBSTVARS += -Vdist:GuamDepends="guam-libs (= $(DEB_VERSION)) | guam-bundled-libs (= $(DEB_VERSION))"
+SUBSTVARS += -Vdist:GuamLibDepends="$(call pinvererlmin,erlang-base) | $(call pinvererlmin,erlang-base-hipe), $(call pinvererlmax,erlang-base) | $(call pinvererlmax,erlang-base-hipe), $(KOLAB_PROVIDED_DEPS), $(call pinver,erlang-asn1), $(call pinver,erlang-goldrush), $(call pinver,erlang-inets), $(call pinver,erlang-lager), $(call pinver,erlang-public-key)"
+SUBSTVARS += -Vdist:GuamBundleDepends="$(KOLAB_PROVIDED_DEPS)"
+
 %:
 	dh $@ --with=systemd
 
@@ -99,6 +104,10 @@
 	ln -s ../lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam \
 		$(DESTDIR)/usr/lib/erlang/bin/kolab_guam
 
+	# Symlink for system-installed libraries
+	mkdir -p $(LIBDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
+	ln -s ../../lib $(LIBDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib
+
 	# Bundled runtime system and libraries
 	mkdir -p $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
 	cp -a _build/default/rel/guam/erts-* \

guam.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2296 0

Request History

sicherha created request almost 7 years ago

Resubmit 0.9.4, now fixed

sicherha accepted request almost 7 years ago