Re: gbp import-orig has defeated me [and 1 more messages]

2018-10-02 Thread Ian Jackson
Sean Whitton writes ("Re: gbp import-orig has defeated me [and 1 more messages]"): > On Tue 02 Oct 2018 at 12:59PM +0100, Ian Jackson wrote: > > If these files with cr line endings are a nuisance should probably > > complain to upstream. It is highly unusual to provide

Re: gbp import-orig has defeated me [and 1 more messages]

2018-10-02 Thread Sean Whitton
Hello, On Tue 02 Oct 2018 at 12:59PM +0100, Ian Jackson wrote: > I think you should not set any of these options. I disagree with the > discussion in that article surrounding the suggestion to use > core.autocrlf=input. Almost no-one should do this on Linux. > > In the Debian context, if the

Re: gbp import-orig has defeated me [and 1 more messages]

2018-10-02 Thread Ian Jackson
Shengjing Zhu writes ("Re: gbp import-orig has defeated me"): > I think you have configured your git to auto convert the line ending > when commit. > > In the pristine-tar tarball, > $ file googletest-release-1.8.1/googlemock/msvc/2005/gmock.sln > googletest-releas

Re: gbp import-orig has defeated me

2018-10-01 Thread Steve Robbins
On Monday, October 1, 2018 10:35:01 PM CDT Shengjing Zhu wrote: > I think you have configured your git to auto convert the line ending > when commit. > > In the pristine-tar tarball, > $ file googletest-release-1.8.1/googlemock/msvc/2005/gmock.sln >

Re: gbp import-orig has defeated me

2018-10-01 Thread Fritz Reichwald
Hi steve, > git init > gbp import-orig --pristine-tar ../googletest_1.8.1.orig.tar.gz > ... copy debian dir from the salsa repo & commit ... > gbp buildpackage have you added a new changelog entry after importing the new upstream tarball? e.g by executing 'dch -v 1.8.1-1' Regards Fritz

Re: gbp import-orig has defeated me

2018-10-01 Thread Shengjing Zhu
On Tue, Oct 2, 2018 at 10:51 AM Steve Robbins wrote: > > Hi, > > I would like to update the googletest salsa repo [1] with upstream 1.8.1. So > I downloaded the tarball and ran "gbp import-orig" on it. That appeared to > work, but "gbp buildpackage" fails with > > dpkg-source: error: aborting

gbp import-orig has defeated me

2018-10-01 Thread Steve Robbins
Hi, I would like to update the googletest salsa repo [1] with upstream 1.8.1. So I downloaded the tarball and ran "gbp import-orig" on it. That appeared to work, but "gbp buildpackage" fails with dpkg-source: error: aborting due to unexpected upstream changes ... from the diffs, my guess