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

[Dave Cottlehuber]

On 16. Dezember 2013 at 02:42:15, Jason Gerard DeRose (jderose at novacut.com) 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



-- 
https://code.launchpad.net/~yolanda.robla/ubuntu/trusty/couchdb/add_distribution/+merge/195788
Your team Ubuntu branches is requested to review the proposed merge of lp:~yolanda.robla/ubuntu/trusty/couchdb/add_distribution into lp:ubuntu/couchdb.