[couchdb-pkg] branch master updated: Add support for repository building

[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 84372d1  Add support for repository building
84372d1 is described below

commit 84372d1426e05092cfac3266865aedc878a5655c
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Wed Jul 19 06:24:59 2017 +0000

    Add support for repository building
---
 .gitignore              |  3 +++
 Makefile                | 12 +++++-------
 repo/conf/distributions | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d85773..c4c095f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ rpm/BUILD
 rpm/BUILDROOT
 rpm/RPMS
 rpm/SRPMS
+repo/db
+repo/dists
+repo/pool
diff --git a/Makefile b/Makefile
index 98794b4..6c3d21f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
 # the License.
 
 COUCHDIR=../couchdb
-DEBCHANGELOG="Automatically generated package from upstreasm."
+DEBCHANGELOG="Automatically generated package from upstream."
 ERLANG_VERSION=18.3
 
 export DEBFULLNAME="CouchDB Developers"
@@ -60,18 +60,16 @@ build-couch:
 
 # ######################################
 find-couch-dist:
-	$(eval ORIGDISTDIR := $(shell cd $(COUCHDIR) && find . -type d -name apache-couchdb-\*))
-	$(eval NEWDIR := $(shell echo $(ORIGDISTDIR) | sed 's/.\/apache-couchdb/couchdb/'))
-	$(eval VERSION := $(shell echo $(ORIGDISTDIR) | sed 's/.\/apache-couchdb-//'))
-	mv $(COUCHDIR)/$(ORIGDISTDIR) $(COUCHDIR)/$(NEWDIR)-$(PLATFORM)
-	$(eval DISTDIR := $(shell readlink -f $(COUCHDIR)/$(NEWDIR)-$(PLATFORM)))
+	$(eval SHORTDISTDIR := $(shell cd $(COUCHDIR) && find . -type d -name apache-couchdb-\*))
+	$(eval VERSION := $(shell echo $(SHORTDISTDIR) | sed 's/.\/apache-couchdb-//'))
+	$(eval DISTDIR := $(shell readlink -f $(COUCHDIR)/$(SHORTDISTDIR)))
 
 copy-debian:
 	rm -rf $(DISTDIR)/debian
 	cp -R debian $(DISTDIR)
 
 update-changelog:
-	cd $(DISTDIR) && dch -d $(DEBCHANGELOG)
+	cd $(DISTDIR) && dch -v $(VERSION)~$(PLATFORM) $(DEBCHANGELOG)
 
 dpkg:
 	cd $(DISTDIR) && dpkg-buildpackage -b -us -uc
diff --git a/repo/conf/distributions b/repo/conf/distributions
new file mode 100644
index 0000000..e5880c6
--- /dev/null
+++ b/repo/conf/distributions
@@ -0,0 +1,19 @@
+Codename: jessie
+Components: main
+Architectures: amd64
+Description: Official CouchDB Debian jessie repository
+
+Codename: stretch
+Components: main
+Architectures: amd64
+Description: Official CouchDB Debian stretch repository
+
+Codename: precise
+Components: main
+Architectures: amd64
+Description: Official CouchDB Ubuntu 14.04 precise repository
+
+Codename: xenial
+Components: main
+Architectures: amd64
+Description: Official CouchDB Ubuntu 16.04 xenial repository

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