Forgot to reply to all, sorry.<br clear="all"><br>Sincerely,<br>kroq-gar78<br>
<br><br><div class="gmail_quote">---------- Forwarded message ----------<br>From: <b class="gmail_sendername">Aditya Vaidya</b> <span dir="ltr"><<a href="mailto:kroq.gar78@gmail.com">kroq.gar78@gmail.com</a>></span><br>
Date: Sat, Nov 3, 2012 at 1:41 AM<br>Subject: Re: Help with a conflicts when merging honeyd from Debian.<br>To: Oussama Bounaim <<a href="mailto:o.bounaim@gmail.com">o.bounaim@gmail.com</a>><br><br><br>Hello,<div><br>
</div><div>I believe you would use the version "2.4-3ubuntu1" since there are probably Ubuntu changes you want to keep. Hence, the Ubuntu package would be different than the Debian one, and this would be the way to express it.</div>
<div><br></div><div>Hope it helps!</div><div class="gmail_extra"><br clear="all"><br>Sincerely,<br>kroq-gar78<br>
<br><br><div class="gmail_quote"><div><div class="h5">On Fri, Nov 2, 2012 at 3:09 AM, Oussama Bounaim <span dir="ltr"><<a href="mailto:o.bounaim@gmail.com" target="_blank">o.bounaim@gmail.com</a>></span> wrote:<br>
</div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
<div dir="ltr">Hi,<div><br></div><div>I am a bit confused about conflicts that occurred when merging honeyd from Debian in ltmain.sh.</div><div><br></div><div> <<<<<<< TREE<div># $progname:<span style="white-space:pre-wrap"> </span>(GNU libtool) 2.4 Debian-2.4-2ubuntu1</div>
<div>=======</div><div># $progname:<span style="white-space:pre-wrap"> </span>(GNU libtool) 2.4 Debian-2.4-3</div><div>>>>>>>> MERGE-SOURCE</div><div># automake:<span style="white-space:pre-wrap"> </span>$automake_version</div>
<div># autoconf:<span style="white-space:pre-wrap"> </span>$autoconf_version</div><div>#</div><div># Report bugs to <<a href="mailto:bug-libtool@gnu.org" target="_blank">bug-libtool@gnu.org</a>>.</div><div>
# GNU libtool home page: <<a href="http://www.gnu.org/software/libtool/" target="_blank">http://www.gnu.org/software/libtool/</a>>.</div>
<div># General help using GNU software: <<a href="http://www.gnu.org/gethelp/" target="_blank">http://www.gnu.org/gethelp/</a>>.</div><div><br></div><div>PROGRAM=libtool</div><div>PACKAGE=libtool</div><div><<<<<<< TREE</div>
<div>VERSION="2.4 Debian-2.4-2ubuntu1"</div><div>=======</div><div>VERSION="2.4 Debian-2.4-3"</div><div>>>>>>>> MERGE-SOURCE</div><div><br></div><div>Which version of (GNU libtool) should I keep?</div>
<span><font color="#888888">
-- <br><div dir="ltr"><div><span style="color:rgb(31,73,125)"><span style="line-height:18px"><font face="comic sans ms, sans-serif"><i>My Best Regards,</i></font></span></span></div>
<div><span style="color:rgb(31,73,125)"><span style="line-height:22px;font-weight:bold"><font face="comic sans ms, sans-serif"><i> Oussama</i></font></span></span></div><div>
<span style="color:rgb(31,73,125)"><i style="line-height:22px;font-weight:bold"><font face="trebuchet ms, sans-serif"><br></font></i></span></div><div><br></div></div><br>
</font></span></div></div>
<br></div></div><span class="HOEnZb"><font color="#888888">--<br>
Ubuntu-motu mailing list<br>
<a href="mailto:Ubuntu-motu@lists.ubuntu.com" target="_blank">Ubuntu-motu@lists.ubuntu.com</a><br>
Modify settings or unsubscribe at: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu" target="_blank">https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu</a><br>
<br></font></span></blockquote></div><br></div>
</div><br>