Instead of a Debian merge, how about the debdiff from Ubuntu's 1.5.1 to
1.6.0?
** Patch added: debdiff: ubuntu 1.5.1 to 1.6.0
https://bugs.launchpad.net/ubuntu/+source/lightdm-gtk-greeter/+bug/1197774/+attachment/3726500/+files/lightdm-gtk-greeter_1.5.1-0ubuntu1_to_1.6.0-0ubuntu1.diff
--
Please let me know if there is anything else you need.
** Changed in: lightdm-gtk-greeter (Ubuntu)
Assignee: Sean Davis (smd-seandavis) = (unassigned)
** Changed in: lightdm-gtk-greeter (Ubuntu)
Status: In Progress = Confirmed
--
You received this bug notification because you are a
Attaching debdiff from ubuntu 1.5.1 to ubuntu 1.6.0
** Patch added: debdiff from ubuntu 1.5.1 to ubuntu 1.6.0
https://bugs.launchpad.net/ubuntu/+source/lightdm-gtk-greeter/+bug/1197774/+attachment/3724308/+files/ubuntu1.5.1_to_saucy1.6.0.diff
--
You received this bug notification because
Attaching debdiff from debian-unstable 1.6.0 to ubuntu-saucy 1.6.0
** Patch added: debdiff from debian-unstable 1.6.0 to ubuntu-saucy 1.6.0
https://bugs.launchpad.net/ubuntu/+source/lightdm-gtk-greeter/+bug/1197774/+attachment/3724307/+files/debian1.6.0_to_saucy1.6.0.diff
--
You received
The attachment debdiff from debian-unstable 1.6.0 to ubuntu-saucy
1.6.0 seems to be a debdiff. The ubuntu-sponsors team has been
subscribed to the bug report so that they can review and hopefully
sponsor the debdiff. If the attachment isn't a patch, please remove the
patch flag from the
Oops, forgot a few things. You seem to be reverting some of the changes that
Debian made that we're fine with:
debian/rules diff
debian/watch diff
You should review the diff to see if it's something that's fine for us
to carry as the larger the diff, the more review we have for each merge.
Thanks for working on this. That diff seems way too big though. If you
don't want Debian patches applied, just comment them out in
debian/patches/series after you run quilt pop -a. Then run quilt push -a
to reapply the ones that are left. It also looks like autoreconf was
run as well. You
