Hi Praveen, On Tue, Jun 04, 2013 at 08:09:10PM +0530, Praveen A wrote: > 2013/6/4 Antonio Terceiro <terceiro@debian.org>: > > You have to merge pristine and upstream as well before pushing. > > Hi Antonio, > > Please check if the repo is in a good state. I have manually merged > all branches. If you think its okay, you can upload the new version. > > If not I can try to replay my changes on top of 0.6.0 (before > conflict) and import 0.6.4 orig and add Christian's changes on top. It was almost OK - the only issue was that you merged pristine-tar into master, so dpkg-source was complaining about about unrepresentable changes to source. pristine-tar is completely separated from master, what I meant was merging origin/pristine-tar into your local pristine-tar, and origin/upstream into your local origin. I have just uploaded 0.6.4-1 Cheers -- Antonio Terceiro <terceiro@debian.org>
Attachment:
signature.asc
Description: Digital signature