On Mon, 2016-01-04 at 19:54 +0000, Adam D. Barratt wrote: > On Sun, 2016-01-03 at 15:05 +0100, Holger Levsen wrote: > > Hi, > > > > (this is maybe more to pkg-privacy-maintainers@ than to -release@, maybe > > not.) > > > > On Sonntag, 3. Januar 2016, Adam D. Barratt wrote: > > > Thanks. Please go ahead. > > > > so far I've only tested binary builds of these changes and when doing a > > source > > build now I realized that cherry-picking these patches of course changed > > the > > source and thus debuild -S failed like this: > > > > dpkg-source: error: aborting due to unexpected upstream changes, see > > /tmp/torbrowser-launcher_0.1.9-1+deb8u2.diff.1bVtM1 > > dpkg-source: info: you can integrate the local changes with dpkg-source -- > > commit > > That's somewhat expected for a "3.0 (quilt)" package if you've just > patched the source directly rather than adding separate quilt patches.
Whichever approach you decide to take to fixing this, please bear in mind that there are only a few days until the 8.3 window closes. Regards, Adam
