[Bug 377158] Re: Please merge atlas 3.6.0-24 (universe) from Debian unstable (main)

[Scott Howard]

I figured out why the debdiff appeared to be reversed, although it
wasn't.

The Debian maintainer switched from no patch system to dpatch. When you
do a debdiff of such a change, the changes that existed in .diff.gz
outside of debian/ appear as "Reverted" in the debdiff since we are
"reverting" the changes outside of debian/ back to be what it is in
.orig.tar.gz.  This will make the patch appear reversed for part of it
(it is removing the Debian maintainer changes that are now being applied
with dpatch), and the debdiff will not be able to be applied to the
source directory. To apply the patch, we would need to remove at
"Reverted" stanzas and files from the debdiff. However, that is not
necessary since the diff I have above (ubuntu_merge_atlas.diff) has
already done that.  Just applying the .diff will work (see the merge and
ppa above).

-- 
Please merge atlas 3.6.0-24 (universe) from Debian unstable (main)
https://bugs.launchpad.net/bugs/377158
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs