[couchdb-pkg] branch master updated (3baa585 -> 34bfa2f)

[wo...@apache.org]

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

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


 discard 3baa585  Support use of fake libmozjs185 pkg in automated pkg builds
     new 34bfa2f  Support use of fake libmozjs185 pkg in automated pkg builds

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3baa585)
            \
             N -- N -- N   refs/heads/master (34bfa2f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[couchdb-pkg] 01/01: Support use of fake libmozjs185 pkg in automated 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

commit 34bfa2f8c30a7f5f48a8d34c08d3659fc9bb38eb
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Thu Jul 20 16:43:59 2017 -0400

    Support use of fake libmozjs185 pkg in automated pkg builds
---
 Makefile       | 5 +++--
 debian/control | 1 +
 debian/rules   | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c2a9c40..554925a 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ xenial: debian
 # RPM default
 centos: find-couch-dist link-couch-dist build-rpm
 
-centos6: make-rpmbuild install-js185 centos
+centos6: make-rpmbuild centos
 
 centos7: make-rpmbuild centos rm-js185-rpms
 
@@ -93,7 +93,8 @@ make-rpmbuild:
 
 # If we don't change $HOME it'll force building in ~/rpmbuild. Boo.
 build-rpm:
-	cd ../rpmbuild && export HOME=$(readlink -f ..) && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)'
+	$(eval HOME := $(shell readlink -f ..))
+	export HOME=$(HOME) && cd ../rpmbuild && rpmbuild --verbose -bb SPECS/couchdb.spec --define "erlang_version $(ERLANG_VERSION)" --define '_version $(VERSION)'
 
 # ######################################
 make-js185:
diff --git a/debian/control b/debian/control
index c7a7d3a..b026f38 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Depends: adduser,
          curl,
          debconf,
          init-system-helpers,
+         libmozjs185-1.0,
          procps,
          python,
          python-requests,
diff --git a/debian/rules b/debian/rules
index 825eff6..140be1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,3 +35,7 @@ override_dh_auto_install:
 
 get-orig-source:
 	uscan --noconf --download-current-version --destdir=. --rename
+
+# this allows us to use a fake/equivs libmozjs185-1.0 in automated testing
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

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