Proposed Cyrus 2.3.13 branch (could be: "Re: [SVN] r768")

[Duncan Gibb]

debian at incase.de wrote:

> Author: duncan
> Date: Mon Feb  9 12:41:06 2009
> New Revision: 767

> Author: duncan
> Date: Mon Feb  9 12:53:01 2009
> New Revision: 769

Between those there was, of course, an r768 - the email about which was
probably too big for the list relay.  I committed an update to the CMU
2.3.13 release, plus a few changes to the 'debian' directory which make
it build conveniently.

The practical upshot of this is that anyone should now be able to:

  svn export
https://mail.incase.de/svn/cyrus22/branches/cyrus23/cyrus-imapd-2.3-2.3.13/
  cd cyrus-imapd-2.3-2.3.13
  dpkg-buildpackage -b

and get a set of binary packages for their release and architecture.


There are a few changes other than the upstream ones:

1) I believe the choice of Berkeley DB version should be made at build
time, rather than svn commit time.  To this end, I have changed
debian/control so Cyrus build-depends on libdb4.4-dev | libdb4.5-dev |
libdb4.6-dev and put the following mess into debian/rules

  export BDB_VERSION ?= $(shell dpkg-query -l 'libdb4.[2-6]-dev' | grep
^ii | sed -e 's|.*\s\libdb\(4\.[0-9]\)-dev\s.*|\1|')

https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.13/debian/rules?r1=769&r2=767

This works, but is not particularly clean - or even consistent.  Better
ideas are welcome.


2) I allow epochs in the package name (we use them internally)

https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.13/debian/cyrus-common-2.3.cyrus2.3.init?r1=767&r2=768


3) I took out the huge and incomprehensible 99-update-autoconf.dpatch in
favour of having debian/rules run autoconf and autoheader at build time.


Any feedback on the above is welcome.  I have a number of other patches
I would like to add, which I will post here for discussion as soon as I
have time.


Cheers


Duncan

-- 
Duncan Gibb, Technical Director
Sirius Corporation plc - The Open Source Experts
http://www.siriusit.co.uk/ || +44 870 608 0063