Manual merge. Resolved conflict in debian/control due to new build dependencies (libtcd-dev and tcd-utils). Package builds in a hardy pbuilder.
** Attachment added: "Debdiff to resolve merging conflict in xtide_2.9.3" http://launchpadlibrarian.net/10530295/xtide_2.9.3-3ubuntu1.debdiff -- Please merge xtide_2.9.3-3 from debian https://bugs.launchpad.net/bugs/164706 You received this bug notification because you are a member of Ubuntu Bugs, which is the bug contact for Ubuntu. -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
