Bug#881750: [git-buildpackage/master] import_orig: drop debian/ again in --merge-mode=replace

[Guido Günther]

tag 881750 pending
thanks

Date:   Thu Nov 16 08:38:02 2017 +0100
Author: Guido Günther <a...@sigxcpu.org>
Commit ID: 9a2c5e669ef6ed23a96bbd7cc9028cacb4da37ad
Commit URL: 
https://git.sigxcpu.org/cgit/git-buildpackage//commit/?id=9a2c5e669ef6ed23a96bbd7cc9028cacb4da37ad
Patch URL: 
https://git.sigxcpu.org/cgit/git-buildpackage//patch/?id=9a2c5e669ef6ed23a96bbd7cc9028cacb4da37ad

    import_orig: drop debian/ again in --merge-mode=replace

    Another fallout of the Python3 conversion

    Closes: #881750
    Thanks: Víctor Cuadrado Juan for providing a nice reproducer