[Merge] ~mkukri/ubuntu/+source/xserver-xorg-input-synaptics:merge into ubuntu/+source/xserver-xorg-input-synaptics:ubuntu/devel

[Mate Kukri]

I believe I understand how it works, the problem here is that I have naively rebased this atop the ubuntu/devel branch which being an import of the incorrect upload, of course does not include the files.

If you build my old version, it should include the files with the caveat of the warning being present about modification to upstream sources.

I do agree that moving them to a patch seems like a somewhat better solution and I'll fix this.

> > This proposal supersedes
> 
> It isn't always necessary to supersede, you can keep a MP around and force-
> push.  Some other reviewers prefer to list the target branch as "debian/sid"
> like you had the first time.
> 
> > Re-upload to fix FTBFS caused by missing files in `1.9.2-1ubuntu1`
> 
> If I build the source package from this branch, it looks pretty much the same
> as ubuntu1, just adding your changelog, so this proposal will fail to address
> the FTBFS.
> 
> $ debdiff xserver-xorg-input-synaptics_1.9.2-1ubuntu[12].dsc | diffstat
>  changelog |    6 ++++++
>  1 file changed, 6 insertions(+)
> 
> Please understand that the contents of this git repo kind of don't matter,
> except in what source package is produced from here.  That source package is
> what is uploaded, this is just a staging location to help produce that source
> package, and the needed changes are not yet in the source package.
> 
> > however the packaging is based on the upstream git repository, so it would
> imply extra diff removing the files and adding patches, and diverging from
> Debian for what appears to me not much benefit in this case
> 
> The files are missing because they aren't in the source package.  We have to
> represent them in a source-package compatible way, or this problem of missing
> files will continue to happen.  And as the package is FTBFS, there are
> functional changes in there, so yes we should be adding a patch or patches.
-- 
https://code.launchpad.net/~mkukri/ubuntu/+source/xserver-xorg-input-synaptics/+git/xserver-xorg-input-synaptics/+merge/456947
Your team Ubuntu Sponsors is requested to review the proposed merge of ~mkukri/ubuntu/+source/xserver-xorg-input-synaptics:merge into ubuntu/+source/xserver-xorg-input-synaptics:ubuntu/devel.