Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From: lluvia@autistici.org
Newsgroups: linux.debian.maint.python
Subject: Re: upstream release of unreleased package
Date: Tue, 12 Feb 2019 20:10:02 +0100
Message-ID: <xqLBo-7To-13@gated-at.bofh.it>
References: <xpLWO-2Vv-3@gated-at.bofh.it> <xpMga-31X-9@gated-at.bofh.it> <xpXlf-1Ew-5@gated-at.bofh.it> <xpXuW-1HN-21@gated-at.bofh.it> <xpYhj-2eV-1@gated-at.bofh.it> <xq43o-5N6-17@gated-at.bofh.it>
Old-Return-Path: <lluvia@autistici.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII; format=flowed
Content-Transfer-Encoding: 7bit
User-Agent: Roundcube Webmail
Approved: robomod@news.nic.it
Lines: 66
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
Xref: csiph.com linux.debian.maint.python:11318

On 2019-02-10 20:37, Brian May wrote:
> lluvia@autistici.org writes:
> 
>> lluvia@technoethical:~/debian/visualequation$ git commit -m "modifying
>> d/changelog for new upstream release"
>> [patch-queue/debian/master 70ae5b1] modifying d/changelog for new
>> upstream release
>>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> This is your first error. Changes to debian/* files belong to the
> debian/master branch, not the patch-queue/debian/master branch.
> 
> So you should be finalise the changes to the patch-queue first, then 
> run
> something like "gbp pq export" which will switch back the the
> debian/master branch, then you can make changes to the debian/* files.
> 
> Sorry, I don't have time to try to explain how to fix this right now 
> :-(

Hello,

Since I do not see more answers I am trying to fix it by myself. I am 
trying the following sequence of commands that I think that solves that 
first error. Can you tell me what is wrong now or if I am doing 
something not adequate?

gbp clone 
git@salsa.debian.org:python-team/applications/visualequation.git
cd visualequation
git reset --hard HEAD~1
git tag --delete upstream/0.3.8
gbp pq import
gbp import-orig --pristine-tar --uscan
gbp pq rebase
gbp pq export
dch -v 0.3.8-1
git add debian/changelog
git add debian/patches/*
git commit -m "Adding d/changelog and patches"
debuild -us -uc

However, the building of the package with last command is not working. 
Getting output like:

[...]
patching file README.md
Reversed (or previously applied) patch detected!  Skipping patch.
3 out of 3 hunks ignored
[...]
dpkg-source: info: the patch has fuzz which is not allowed, or is 
malformed
dpkg-source: info: if patch '0001-Imported-Upstream-version-0.3.8.patch' 
is correctly applied by quilt, use 'quilt refresh' to update it
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B 
.pc/0001-Imported-Upstream-version-0.3.8.patch/ --reject-file=- < 
visualequation.orig.ZbaP4z/debian/patches/0001-Imported-Upstream-version-0.3.8.patch 
gave error exit status 1
dpkg-buildpackage: error: dpkg-source -b visualequation gave error exit 
status 2
debuild: fatal error at line 1376:
dpkg-buildpackage -rfakeroot -D -us -uc failed

Thanks again,

Daniel