<br><br><div class="gmail_quote">On Tue, Dec 21, 2010 at 10:22 AM, Ondřej Surý <span dir="ltr"><<a href="mailto:ondrej@sury.org">ondrej@sury.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Anthony,<br>
<br>
thanks for quick fix. I have pulled your changes. I think you are free<br>
to commit fixes directly in our debian repository if you want.<br></blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><br>
I have pushed some more changes:<br>
<br></blockquote><div><br></div><div><meta http-equiv="content-type" content="text/html; charset=utf-8"><div><br class="Apple-interchange-newline">Not ok :-)</div><div><br></div><div><div>cp: cannot stat `debian/tmp/usr/lib/cyrus/bin/deliver': No such file or directory</div>
<div>dh_install: cp -a debian/tmp/usr/lib/cyrus/bin/deliver debian/cyrus-common-2.4//usr/lib/cyrus/bin/ returned exit code 1</div><div>make: *** [binary] Error 2</div><div>dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2</div>
</div><div><br></div><div> </div></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
ec9106b WS fixes in cyrus-common-2.4.postinst<br>
bdce33d Fix cyrus-makedirs by installing it as<br>
/usr/lib/cyrus/bin/makedirs and fix /usr/bin/cyrus accordingly<br>
d45f7f4 Remove master and deliver from /usr/sbin/cyrus tool<br>
4809052 Revert "Fix PID file name"<br>
a6277a6 Revert changes to master and deliver, keep them as cyrmaster<br>
and cyrdeliver.<br>
b8bca9d Add support for sourcing /etc/default/cyrus-imapd to get CONF value<br>
0888b46 WS fix in debian/cyrus<br>
<br>
I have reverted the changes to master and deliver binaries. They are<br>
called independently (master is a master process and deliver is called<br>
from MTA), so I don't think there is a need for unification inside the<br>
master-tool.<br>
<br>
Also Anthony, I have noticed that you use four spaces instead of TAB.<br>
Please try to keep the WS same with the rest of team, since it creates<br>
mess. Quick peak with some editor or viewer which has TAB width set to<br>
8 will reveal that.<br>
<br>
Thanks,<br>
Ondrej<br>
<div><div></div><div class="h5"><br>
On Tue, Dec 21, 2010 at 01:31, Anthony Prades <<a href="mailto:toony.debian@chezouam.net">toony.debian@chezouam.net</a>> wrote:<br>
> On 12/20/2010 10:34 PM, Thomas Cataldo wrote:<br>
>><br>
>><br>
>> On Mon, Dec 20, 2010 at 5:52 PM, Ondřej Surý <<a href="mailto:ondrej@sury.org">ondrej@sury.org</a><br>
>> <mailto:<a href="mailto:ondrej@sury.org">ondrej@sury.org</a>>> wrote:<br>
>><br>
>> Hi all,<br>
>><br>
>> I have pushed my repository to alioth which introduces two major<br>
>> changes:<br>
>><br>
>> - Introduction of versionless virtual packages (ie. cyrus-imapd<br>
>> depending on cyrus-imapd-2.4, etc.)<br>
>><br>
>> - New /usr/sbin/cyrus tool (which is just crude shell script right<br>
>> now) which "knows" all the cyrus commands located in<br>
>> /usr/lib/cyrus/bin/*<br>
>><br>
>> I have tried to preserve backwards compatibility (installing symlinks<br>
>> everywhere) with our old cyrus-imapd-2.2, but anyway this is a change<br>
>> which needs to be discussed with upstream. Jeroen, what do you think<br>
>> as a release manager? Is the /usr/sbin/cyrus a way which could<br>
>> possibly be adopted by upstream? (I was also thinking about calling it<br>
>> just 'cyr', but there is a name clash with console-cyrilic package<br>
>> :-(.)<br>
>><br>
>> I tried to follow the git path as much as possible (manpages are<br>
>> renamed to cyrus-{something}) and the script tries hard to find the<br>
>> relevant command (it automatically prepends cyr_{command} and<br>
>> ctl_{command} and knows the check = chk_cyrus). More tweaks can be<br>
>> added later (f.e. we can introduce cyrus control {subcommand} to call<br>
>> /usr/lib/cyrus/bin/ctl_{subcommand}).<br>
>><br>
>> Again I have finished this just before my end of worktime, so it just<br>
>> builds in the pbuilder. Brave hearts are welcomed to test the result<br>
>> using git-buildpackage. I do not guarantee anything, it may eat your<br>
>> system or your dog :).<br>
>><br>
>><br>
>> Found another thing broken in the rules file :<br>
>> for i in master reconstruct quota deliver ; do \<br>
>> ln -s $(TMPPKG)/usr/sbin/cyrus<br>
>> $(TMPPKG)/usr/sbin/cyr$$i ;\<br>
>> done<br>
>> for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \<br>
>> tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus arbitron \<br>
>> cyr_expire unexpunge sync_client sync_reset cyr_synclog \<br>
>> cyr_dbtool cyr_df cyrus-makedirs ; do \<br>
>> ln -s $(TMPPKG)/usr/sbin/cyrus $(TMPPKG)/usr/sbin/$$i ;\<br>
>> done<br>
>><br>
>> This will create broken symlinks with the build path hardcoded in the link<br>
>> :<br>
>><br>
>> # ls -l cyrdeliver<br>
>> lrwxrwxrwx 1 root root 82 2010-12-20 20:49 cyrdeliver -><br>
>><br>
>> /var/lib/hudson/jobs/cyrus-2.4-debian-officiel/workspace/debian/tmp/usr/sbin/cyrus<br>
>><br>
>> For example.<br>
>><br>
><br>
> Hi,<br>
><br>
> Here is a pull request, including your patch and some fixes:<br>
><br>
> The following changes since commit b49677b1be536d0b97b9f70ed1dee3a1d3511584:<br>
><br>
> Buildable snapshot build (2010-12-20 17:45:34 +0100)<br>
><br>
> are available in the git repository at:<br>
> git@github.com:toony/pkg-cyrus-imapd-2.4-toony.git debian-sid-toony<br>
><br>
> Anthony Prades (5):<br>
> Fix in packaging by Thomas Cataldo<br>
> Fix /usr/sbin/* symlinks creation Fix universal command interface<br>
> call<br>
> Add cyrus-makedirs support for 'lock' directory<br>
> Add creation of USERDENY database (flat) if doesn't exist<br>
> Fix PID file name Fix cyrus-imapd init script to new process and<br>
> pid file names<br>
><br>
> debian/cyrus | 4 +++-<br>
> debian/cyrus-common-2.4.cyrus-imapd.init | 2 +-<br>
> debian/cyrus-common-2.4.postinst | 26 ++++++++++++++++++++++++--<br>
> debian/cyrus-makedirs | 4 ++--<br>
> debian/rules | 6 +++---<br>
> 5 files changed, 33 insertions(+), 9 deletions(-)<br>
><br>
> Anthony<br>
><br>
>><br>
>><br>
>> _______________________________________________<br>
>> Pkg-Cyrus-imapd-Debian-devel mailing list<br>
>> <a href="mailto:Pkg-Cyrus-imapd-Debian-devel@lists.alioth.debian.org">Pkg-Cyrus-imapd-Debian-devel@lists.alioth.debian.org</a><br>
>><br>
>> <a href="http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel" target="_blank">http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel</a><br>
><br>
><br>
> _______________________________________________<br>
> Pkg-Cyrus-imapd-Debian-devel mailing list<br>
> <a href="mailto:Pkg-Cyrus-imapd-Debian-devel@lists.alioth.debian.org">Pkg-Cyrus-imapd-Debian-devel@lists.alioth.debian.org</a><br>
> <a href="http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel" target="_blank">http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel</a><br>
<br>
<br>
<br>
</div></div><font color="#888888">--<br>
Ondřej Surý <<a href="mailto:ondrej@sury.org">ondrej@sury.org</a>><br>
</font><div><div></div><div class="h5"><br>
_______________________________________________<br>
Pkg-Cyrus-imapd-Debian-devel mailing list<br>
<a href="mailto:Pkg-Cyrus-imapd-Debian-devel@lists.alioth.debian.org">Pkg-Cyrus-imapd-Debian-devel@lists.alioth.debian.org</a><br>
<a href="http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel" target="_blank">http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel</a></div></div></blockquote></div><br>