Merge lp:~yolanda.robla/ubuntu/trusty/couchdb/add_distribution into lp:ubuntu/trusty/couchdb

[Yolanda Robla]

Show distribution in welcome message

[Dave Cottlehuber (skunkwerks)]

Hi Yolanda,

Great idea -- luckily CouchDB already provides functionality to do this without needing an erlang patch;

You should use the dict `vendor` option and store this in the default.ini file. There are name and version files specifically for that.

# $SOURCE/etc/couchdb/default.ini.tpl.in
[vendor]
name = Ubuntu
version = Trusty 14.04

Obviously you have a better idea of what these fields should be than me.

You should get something like this back after installing CouchDB:

GET / HTTP/1.1
Accept: application/json
Accept-Encoding: gzip, deflate, compress
Content-Type: application/json; charset=utf-8
Host: localhost:5984
User-Agent: HTTPie/0.8.0-dev

HTTP/1.1 200 OK
Cache-Control: must-revalidate
Content-Length: 145
Content-Type: application/json
Date: Sat, 30 Nov 2013 21:14:03 GMT
Server: CouchDB/1.5.0 (Erlang OTP/R16B02)

{
    "couchdb": "Welcome",
    "version": "1.5.0"
    "uuid": "24ca0e5e74a4e40356e498dcfb0575b1",
    "vendor": {
        "name": "Ubuntu",
        "version": "Trusty-14.04"
    },
}

The UUID entry is unique per couchdb installation, its shown here for completeness but shouldn't be part of the ubuntu package.

A gentle reminder to all reviewers, Apache CouchDB would love to hear more from downstream / packaging teams. We're here to help you help us!

review: Needs Fixing

[Jason Gerard DeRose (jderose)]

Yolada,

I'm working on getting CouchDB 1.5.0 ready for Trusty:
https://code.launchpad.net/~jderose/ubuntu/trusty/couchdb/1.5.0/+merge/197291

And I want to incorporate the improvements you've made here. Could you explain why lsb-release, dh-autoreconf, autoconf-archive are now build dependencies, and why you're using "--with autoreconf" now?

I'm not doubting the correctness, just want to understand why it's being done, so please excuse my ignorance :)

[lp:~yolanda.robla/ubuntu/trusty/couchdb/add_distribution]

75. By Yolanda Robla on 2013-12-02

updated vendor to show Ubuntu distribution and release

[Yolanda Robla (yolanda.robla)]

Hi, thanks for the tip
I already considered that option but I wasn't sure to override the Vendor section. I've updated the patch to show these fields in template, patch looks more cleaner now.

[Iain Lane (laney)]

Hey Jason & Yolanda; I take it that this merge proposal will be incorporated into the 5.2.0 work linked above and therefore I think I'll obsolete this one as the work will get in via that route.

Thanks for your work here :-)

[Yolanda Robla (yolanda.robla)]

Hi Iain, Jason
It's ok for me if you incorporate my changes into another merge.

Jason, i added lsb-release as build dependency because that's used for patching the vendor section of the template, by this way we are able to pass the Ubuntu release and distribution into it.

As I patched the input template, now autoreconf is needed to update the final template. That's why I added dh-autoreconf and --with-autoreconf lines.

And autoconf-archive is used because autoreconf was failing if that dependency wasn't present, so I had to add it.

I hope it helps. Best
Yolanda

[Jason Gerard DeRose (jderose)]

Iain,
Yes, my proposed 1.5.0 branch incorporates an equivalent change.

Yolanda,
Thanks for the clarification. So the solution I came up with was to modify etc/couchdb/default.ini.tpl after ./configure is called:
http://bazaar.launchpad.net/~jderose/ubuntu/trusty/couchdb/1.5.0/view/head:/debian/rules

BTW, etc/couchdb/default.ini.tpl isn't in the source tarball, only exists after ./configure is called.

I still seems kinda hacky to me, but I think it's probably about the best we can do currently with the 1.5.0 release. I've been talking to upstream about making this easier. Personally, I think configure should automatically set these values when `lsb_release` is present.

[Dave Cottlehuber (skunkwerks)]

On 16. Dezember 2013 at 02:42:15, Jason Gerard DeRose (<email address hidden>) wrote:
>
> Iain,
> Yes, my proposed 1.5.0 branch incorporates an equivalent change.
>
> Yolanda,
> Thanks for the clarification. So the solution I came up with was
> to modify etc/couchdb/default.ini.tpl after ./configure
> is called:
> http://bazaar.launchpad.net/~jderose/ubuntu/trusty/couchdb/1.5.0/view/head:/debian/rules
>
> BTW, etc/couchdb/default.ini.tpl isn't in the source tarball,
> only exists after ./configure is called.

I moved this to before ./configure is run:

https://github.com/dch/couchdb-launchpad/blob/master/debian/rules#L7-L8

Which seems better to me as this approach will also work when we build
from git for dailies. What do you think?

> I still seems kinda hacky to me, but I think it's probably about
> the best we can do currently with the 1.5.0 release. I've been
> talking to upstream about making this easier. Personally, I
> think configure should automatically set these values when
> `lsb_release` is present.

My concern with that approach is that its 100% linux specific. We
support Windows, Free & OpenBSD, Solaris, SmartOS etc.

In https://github.com/dch/couchdb-launchpad/blob/master/debian/rules#L9 we should likely add —disable-launchd too.

I think I have a couple of other differences; I need to ship this by Thursday so I hope we can get these trusty & precise versions lined up perfectly!

A+
Dave

Unmerged revisions

75. By Yolanda Robla on 2013-12-02

updated vendor to show Ubuntu distribution and release

74. By Yolanda Robla on 2013-11-19

* debian/rules: added autoreconf
* debian/control: added lsb-release, dh-autoreconf, autoconf-archive as dep
* debian/patches/fix-distribution.patch: update to show Ubuntu as distribution

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-08-28 16:28:32 +0000
+++ .pc/applied-patches	2013-12-02 12:12:20 +0000
@@ -0,0 +1,1 @@
+fix-distribution.patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-28 16:28:32 +0000
+++ debian/changelog	2013-12-02 12:12:20 +0000
@@ -1,3 +1,11 @@
+couchdb (1.4.0-0ubuntu2) trusty; urgency=low
+
+  * debian/rules: added autoreconf
+  * debian/control: added lsb-release, dh-autoreconf, autoconf-archive as dep
+  * debian/patches/fix-distribution.patch: update to show Ubuntu as distribution
+
+ -- Yolanda Robla <[e-mail]>  Mon, 18 Nov 2013 09:53:34 +0000
+
 couchdb (1.4.0-0ubuntu1) saucy; urgency=low
 
   * New upstream release (LP: #1212481)

=== modified file 'debian/control'
--- debian/control	2013-08-28 16:28:32 +0000
+++ debian/control	2013-12-02 12:12:20 +0000
@@ -22,6 +22,9 @@
                texlive-latex-extra,
                texlive-fonts-recommended,
                texinfo,
+               lsb-release,
+               dh-autoreconf,
+               autoconf-archive
 Homepage: http://couchdb.apache.org/
 
 Package: couchdb-common

=== added file 'debian/patches/fix-distribution.patch'
--- debian/patches/fix-distribution.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-distribution.patch	2013-12-02 12:12:20 +0000
@@ -0,0 +1,38 @@
+Index: couchdb/etc/couchdb/default.ini.tpl.in
+===================================================================
+--- couchdb.orig/etc/couchdb/default.ini.tpl.in	2013-12-02 11:29:19.986386103 +0000
++++ couchdb/etc/couchdb/default.ini.tpl.in	2013-12-02 11:29:19.982386103 +0000
+@@ -2,8 +2,8 @@
+ 
+ ; Upgrading CouchDB will overwrite this file.
+ [vendor]
+-name = %package_author_name%
+-version = %version%
++name = %couchdb_so_distribution%
++version = %couchdb_so_version%
+ 
+ [couchdb]
+ database_dir = %localstatelibdir%
+
+Index: couchdb/etc/couchdb/Makefile.am
+===================================================================
+--- couchdb.orig/etc/couchdb/Makefile.am	2013-12-02 11:29:19.986386103 +0000
++++ couchdb/etc/couchdb/Makefile.am		2013-12-02 11:29:19.982386103 +0000
+@@ -37,6 +37,8 @@
+ 	    -e "s|%couchjs_command_name%|couchjs.exe|g" \
+ 	    -e "s|%package_author_name%|$(package_author_name)|g" \
+ 	    -e "s|%version%|$(version)|g" \
++	    -e "s|%couchdb_so_distribution%|Windows|g" \
++	    -e "s|%couchdb_so_version%|Windows|g" \
+ 	< $< > $@
+ else
+ default.ini: default.ini.tpl
+@@ -51,6 +53,8 @@
+ 	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
+ 	    -e "s|%package_author_name%|$(package_author_name)|g" \
+ 	    -e "s|%version%|$(version)|g" \
++	    -e "s|%couchdb_so_distribution%|$(shell lsb_release -si)|g" \
++	    -e "s|%couchdb_so_version%|$(shell lsb_release -sc)|g" \
+ 	< $< > $@
+ endif
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-08-28 16:28:32 +0000
+++ debian/patches/series	2013-12-02 12:12:20 +0000
@@ -0,0 +1,1 @@
+fix-distribution.patch

=== modified file 'debian/rules'
--- debian/rules	2013-08-28 16:28:32 +0000
+++ debian/rules	2013-12-02 12:12:20 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-strictness --disable-init

=== modified file 'etc/couchdb/Makefile.am'
--- etc/couchdb/Makefile.am	2013-08-28 16:28:32 +0000
+++ etc/couchdb/Makefile.am	2013-12-02 12:12:20 +0000
@@ -37,6 +37,8 @@
 	    -e "s|%couchjs_command_name%|couchjs.exe|g" \
 	    -e "s|%package_author_name%|$(package_author_name)|g" \
 	    -e "s|%version%|$(version)|g" \
+	    -e "s|%couchdb_so_distribution%|Windows|g" \
+	    -e "s|%couchdb_so_version%|Windows|g" \
 	< $< > $@
 else
 default.ini: default.ini.tpl
@@ -51,6 +53,8 @@
 	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
 	    -e "s|%package_author_name%|$(package_author_name)|g" \
 	    -e "s|%version%|$(version)|g" \
+	    -e "s|%couchdb_so_distribution%|$(shell lsb_release -si)|g" \
+	    -e "s|%couchdb_so_version%|$(shell lsb_release -sc)|g" \
 	< $< > $@
 endif
 

=== modified file 'etc/couchdb/default.ini.tpl.in'
--- etc/couchdb/default.ini.tpl.in	2013-08-28 16:28:32 +0000
+++ etc/couchdb/default.ini.tpl.in	2013-12-02 12:12:20 +0000
@@ -2,8 +2,8 @@
 
 ; Upgrading CouchDB will overwrite this file.
 [vendor]
-name = %package_author_name%
-version = %version%
+name = %couchdb_so_distribution%
+version = %couchdb_so_version%
 
 [couchdb]
 database_dir = %localstatelibdir%