[Android-tools-devel] android-tools git repo a bit messed up

[Hans-Christoph Steiner]

Ximin Luo:
> On 21/10/15 22:57, Ximin Luo wrote:
>> Instead of committing the new package directly on top of the "master" branch, there should have been:
>>
>> 1. an 'Imported Upstream version 5.1.1+git20150904' commit on the "upstream" branch, which should have then been merged into the "master" branch. 
>> 2. then further edits to the debian/* packaging files on top of this commit.
>>
> 
> Oh, I should add, don't forget (3) update the pristine-tar branch, which is done from the android-tools_5.1.1+git20150904.orig.tar.gz file that would be uploaded to Debian.
> 
> In fact one can do (1,2,3) all at once by running
> 
> $ gbp import-orig ../android-tools_5.1.1+git20150904.orig.tar.gz --git-pristine-tar
> 
> while on the master branch. Then the 5.1.1+git20150904-1 branch can simply be discarded.
> 
> X


Please go ahead and fix it, if you can. And welcome to the team :)

.hc