Il 2019-02-10 13:30 Andrey Rahmatullin ha scritto:
Both your patches look very wrong. How did you make them? The patch
patching debian/changelog looks especially wrong.
I used "dch -v 0.3.8-1" for the debian/changelog and added a line. Since
previous version 0.3.7-1 was unreleased it didn't create a new entry
and, instead, it modified the previous one. I thought it was reasonable.
I keep a log of the commands that I used (some outputs are not totally
in english, sorry). See below.
Thanks again,
Daniel
lluvia@technoethical:~/debian/visualequation$ dch -v 0.3.8-1
lluvia@technoethical:~/debian/visualequation$ gbp pq rebase
gbp:info: Switching to 'patch-queue/debian/master'
Cannot rebase: You have unstaged changes.
Please commit or stash them.
gbp:error: Couldn't run git rebase: it exited with 1
lluvia@technoethical:~/debian/visualequation$ git add debian/changelog
lluvia@technoethical:~/debian/visualequation$ gbp pq rebase
Cannot rebase: Your index contains uncommitted changes.
Please commit or stash them.
gbp:error: Couldn't run git rebase: it exited with 1
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(-)
lluvia@technoethical:~/debian/visualequation$ gbp pq rebaseFirst,
rewinding head to replay your work on top of it...
Applying: Imported Upstream version 0.3.8
Applying: modifying d/changelog for new upstream release
lluvia@technoethical:~/debian/visualequation$ LANG=EN gbp pq export
gbp:info: Generating patches from git
(debian/master..patch-queue/debian/master)
On branch debian/master
Your branch is up-to-date with 'origin/debian/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
debian/patches/0001-Imported-Upstream-version-0.3.8.patch
debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch
debian/patches/series
nothing added to commit but untracked files present (use "git add" to
track)
lluvia@technoethical:~/debian/visualequation$ git add -A
lluvia@technoethical:~/debian/visualequation$ git status
En la rama debian/master
Su rama está actualizada con «origin/debian/master».
Cambios para hacer commit:
(use «git reset HEAD <archivo>...» para sacar del stage)
nuevo archivo:
debian/patches/0001-Imported-Upstream-version-0.3.8.patch
nuevo archivo:
debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch
nuevo archivo: debian/patches/series
lluvia@technoethical:~/debian/visualequation$ LANG=EN gbp pq export
gbp:info: Generating patches from git
(debian/master..patch-queue/debian/master)
On branch debian/master
Your branch is up-to-date with 'origin/debian/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: debian/patches/0001-Imported-Upstream-version-0.3.8.patch
new file:
debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch
new file: debian/patches/series
lluvia@technoethical:~/debian/visualequation$ git commit -m "Adding
patches"[debian/master 8b678bd] Adding patches
3 files changed, 524 insertions(+)
create mode 100644
debian/patches/0001-Imported-Upstream-version-0.3.8.patch
create mode 100644
debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch
create mode 100644 debian/patches/series
lluvia@technoethical:~/debian/visualequation$ git push origin : --tags
Counting objects: 27, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (26/26), done.
Writing objects: 100% (27/27), 13.16 KiB | 0 bytes/s, done.
Total 27 (delta 16), reused 0 (delta 0)
remote:
remote: To create a merge request for pristine-tar, visit:
remote:
https://salsa.debian.org/python-team/applications/visualequation/merge_requests/new?merge_request%5Bsource_branch%5D=pristine-tar
remote:
remote: To create a merge request for upstream, visit:
remote:
https://salsa.debian.org/python-team/applications/visualequation/merge_requests/new?merge_request%5Bsource_branch%5D=upstream
remote:
To g...@salsa.debian.org:python-team/applications/visualequation.git
ca7f63e..8b678bd debian/master -> debian/master
718faf5..8687008 pristine-tar -> pristine-tar
17e6b53..f6d5e2e upstream -> upstream
* [new tag] upstream/0.3.8 -> upstream/0.3.8
