[couchdb-pkg] branch master updated: Fixes for Ubuntu 14.04 pkg builds

[wo...@apache.org]

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 ce76600  Fixes for Ubuntu 14.04 pkg builds
ce76600 is described below

commit ce76600f87930962eb502b5c9ae84999be0561f6
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Wed Jul 12 23:22:10 2017 -0400

    Fixes for Ubuntu 14.04 pkg builds
---
 Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f7845d1..4594d43 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,13 @@ precise-prep:
 	sed -i 's/ --with=systemd//' $(DISTDIR)/debian/rules
 
 # Ubuntu 14.04
-# Need to work around missing erlang-* pkgs for 1:18.3-1
-trusty: find-couch-dist copy-debian trusty-fix-control update-changelog dpkg lintian
+# Need to work around missing esl erlang-* pkgs for 1:18.3-1 :/
+trusty: find-couch-dist copy-debian trusty-prep update-changelog dpkg lintian
+
+# see changelog for ubuntu ufw package, this is safe
+trusty-prep:
+	sudo sed -i 's/conffile/conffile, postrm-does-not-call-updaterc.d-for-init.d-script/' /usr/share/lintian/profiles/couchdb/main.profile
+	sed -i '/erlang-*/d' $(DISTDIR)/debian/control
 
 # Ubuntu 16.04
 xenial: debian
@@ -64,9 +69,6 @@ copy-debian:
 	rm -rf $(DISTDIR)/debian
 	cp -R debian $(DISTDIR)
 
-trusty-fix-control:
-	sed -i '/erlang-*/d' $(DISTDIR)/debian/control
-
 update-changelog:
 	cd $(DISTDIR) && dch -d $(DEBCHANGELOG)
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].