[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

Did you merge 2.0.3-11ubuntu1 too? -- Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable https://bugs.launchpad.net/bugs/318665 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list

[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

2.0.3-11ubuntu1 was a package containing only ubuntu changes and I manually did the merge as one of the debdiff's was empty while doing a merge in DaD Regards -- Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable https://bugs.launchpad.net/bugs/318665 You received this bug

[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

OOps changelog entry went missing... Assigning to myself ** Changed in: netatalk (Ubuntu) Assignee: (unassigned) = Bhavani Shankar (bhavi) Status: Confirmed = In Progress -- Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

It was due to version incompatibility between the debdiff I submitted and the debian version Attached is the modified diff and it applies bhav...@tuxlover:~/netatalk-2.0.4~beta2$ patch -p1 ../debian.debdiff patching file debian/control.in patching file debian/control patching file

[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

Patch does not apply here: dan...@bert:~/netatalk-2.0.4~beta2$ patch -p1 ../debian.debdiff patching file debian/control.in patching file debian/control Hunk #1 FAILED at 1. Hunk #2 FAILED at 15. 2 out of 2 hunks FAILED -- saving rejects to file debian/control.rej patching file debian/changelog

[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

Patch does not apply here: dan...@bert:~/netatalk-2.0.4~beta2$ patch -p1 ../debian.debdiff patching file debian/control.in patching file debian/control Hunk #1 FAILED at 1. Hunk #2 FAILED at 15. 2 out of 2 hunks FAILED -- saving rejects to file debian/control.rej patching file debian/changelog

[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

Unsubscribing u-u-s, please resubscribe when merge is ready. -- Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable https://bugs.launchpad.net/bugs/318665 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs

[Bug 318665] Re: Please merge netatalk_2.0.4~beta2-1(universe) from debian unstable

** Attachment added: Debian - ubuntu debdiff http://launchpadlibrarian.net/21350085/debian.debdiff ** CVE added: http://www.cve.mitre.org/cgi- bin/cvename.cgi?name=2008-5718 ** Changed in: netatalk (Ubuntu) Status: New = Confirmed -- Please merge netatalk_2.0.4~beta2-1(universe)