Forgot to reply to all, sorry. Sincerely, kroq-gar78
---------- Forwarded message ---------- From: Aditya Vaidya <[email protected]> Date: Sat, Nov 3, 2012 at 1:41 AM Subject: Re: Help with a conflicts when merging honeyd from Debian. To: Oussama Bounaim <[email protected]> Hello, 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. Hope it helps! Sincerely, kroq-gar78 On Fri, Nov 2, 2012 at 3:09 AM, Oussama Bounaim <[email protected]> wrote: > Hi, > > I am a bit confused about conflicts that occurred when merging honeyd from > Debian in ltmain.sh. > > <<<<<<< TREE > # $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 > ======= > # $progname: (GNU libtool) 2.4 Debian-2.4-3 > >>>>>>> MERGE-SOURCE > # automake: $automake_version > # autoconf: $autoconf_version > # > # Report bugs to <[email protected]>. > # GNU libtool home page: <http://www.gnu.org/software/libtool/>. > # General help using GNU software: <http://www.gnu.org/gethelp/>. > > PROGRAM=libtool > PACKAGE=libtool > <<<<<<< TREE > VERSION="2.4 Debian-2.4-2ubuntu1" > ======= > VERSION="2.4 Debian-2.4-3" > >>>>>>> MERGE-SOURCE > > Which version of (GNU libtool) should I keep? > -- > *My Best Regards,* > * Oussama* > * > * > > > > -- > Ubuntu-motu mailing list > [email protected] > Modify settings or unsubscribe at: > https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu > >
-- Ubuntu-motu mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-motu
