You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2020/04/28 19:22:16 UTC

[couchdb-pkg] branch master updated: Support Ubuntu 20.04; drop erlang-os-mon dep

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


The following commit(s) were added to refs/heads/master by this push:
     new b540542  Support Ubuntu 20.04; drop erlang-os-mon dep
b540542 is described below

commit b54054258a302bc2102e863a34272850fc23eb42
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Tue Apr 28 12:21:54 2020 -0700

    Support Ubuntu 20.04; drop erlang-os-mon dep
---
 Makefile          | 9 +++++++++
 debian/control.in | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ab84618..2f6d96d 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,15 @@ ubuntu-bionic: DIST=ubuntu-bionic
 ubuntu-bionic: bionic
 bionic: debian
 
+# Ubuntu 20.04 (Focal)
+ubuntu-focal: PLATFORM=focal
+ubuntu-focal: DIST=ubuntu-focal
+ubuntu-focal: SPIDERMONKEY=libmozjs-68-0
+ubuntu-focal: SPIDERMONKEY_DEV=libmozjs-68-dev
+ubuntu-focal: SM_VER=68
+ubuntu-focal: focal
+focal: debian
+
 
 # RPM default
 centos: PKGDIR=../rpmbuild/RPMS/$(PKGARCH)
diff --git a/debian/control.in b/debian/control.in
index 789a868..a5e6e71 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9),
                erlang-eunit | esl-erlang,
                erlang-inets | esl-erlang,
                erlang-xmerl | esl-erlang,
-               erlang-os-mon | esl-erlang,
                erlang-reltool | esl-erlang,
                erlang-syntax-tools | esl-erlang,
                git,