Re: upstream release of unreleased package
Hello,
I continue trying to fix issue. In a clean directory, I tried to follow
all the steps from
https://wiki.debian.org/Python/GitPackaging
without git-pushing to see if I was able to understand better what I did
bad last time. I followed the sections "Creating new repositories" using
version 0.3.7 of the program and then "New Upstream Release" to update
to 0.3.8. After following all the steps, except updating
debian/changelog from 0.3.7-1 to 0.3.8-1, I was able to build package
for 0.3.7 (which is probably showing the error), and when I updated
debian/changelog I was not able to create the package for version 0.3.8.
I paste below a (reproducible) log of what I did. Maybe you can show me
what I did wrong this time so I am not able to build package for 0.3.8.
$ gbp clone
git@salsa.debian.org:python-team/applications/visualequation.git
$ uscan --download-version 0.3.7
uscan: Newest version of visualequation on remote site is 0.3.7,
specified download version is 0.3.7
$ tar -xvf visualequation_0.3.7.orig.tar.gz
[...]
$ cd visualequation-0.3.7/
$ git init
Initialized empty Git repository in
/home/lluvia/new_debian/visualequation-0.3.7/.git/
$ git checkout -b upstream
Switched to a new branch 'upstream'
$ git add .
$ git commit -m "import visualequation_0.3.7.orig.tar.gz"
[upstream (root-commit) ff4a9e9] import visualequation_0.3.7.orig.tar.gz
48 files changed, 7461 insertions(+)
create mode 100644 .gitignore
[...]
$ pristine-tar commit ../visualequation_0.3.7.orig.tar.gz upstream
pristine-tar: committed visualequation_0.3.7.orig.tar.gz.delta to branch
pristine-tar
$ git checkout -b debian/master
Switched to a new branch 'debian/master'
$ cp -r ../visualequation/debian/ .
$ rm -r debian/patches/
$ git add debian/*
$ debcommit
git commit -m 'Replicating initial release. Closes: #910998.
* Initial release. Closes: #910998.
* This is my first Debian package.'
[debian/master e7df833] Replicating initial release. Closes: #910998.
9 files changed, 78 insertions(+)
create mode 100644 debian/changelog
create mode 100644 debian/compat
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/gbp.conf
create mode 100755 debian/rules
create mode 100644 debian/source/format
create mode 100644 debian/visualequation.manpages
create mode 100644 debian/watch
$ gbp buildpackage --git-tag-only
gbp:info: Tagging 0.3.7-1 as debian/0.3.7-1
$ gbp pq import
gbp:info: Trying to apply patches at
'e7df8339db59a5e92f14523f3c704a989c5b2e74'
gbp:info: Patches listed in 'debian/patches/series' imported on
'patch-queue/debian/master'
$ gbp import-orig --pristine-tar --uscan
gbp:info: Launching uscan...
uscan: Newest version of visualequation on remote site is 0.3.8, local
version is 0.3.7
uscan: => Newer package available from
https://github.com/daniel-molina/visualequation/archive/0.3.8.tar.gz
gbp:info: using ../visualequation_0.3.8.orig.tar.gz
What is the upstream version? [0.3.8]
gbp:info: Importing '../visualequation_0.3.8.orig.tar.gz' to branch
'upstream'...
gbp:info: Source package is visualequation
gbp:info: Upstream version is 0.3.8
gbp:info: Merging to 'debian/master'
gbp:info: Successfully imported version 0.3.8 of
../visualequation_0.3.8.orig.tar.gz
$ gbp pq rebase
gbp:info: Switching to 'patch-queue/debian/master'
First, rewinding head to replay your work on top of it...
Applying: Imported Upstream version 0.3.8
$ gbp pq export
gbp:info: On 'patch-queue/debian/master', switching to 'debian/master'
gbp:info: Generating patches from git
(debian/master..patch-queue/debian/master)
On branch 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/series
nothing added to commit but untracked files present (use "git add" to
track)
$ debuild -us -uc # It builds 0.3.7 without problems
[...]
$ dch -v 0.3.8-1
dch warning: your current directory has been renamed to:
../visualequation-0.3.8
$ debuild -us -uc # It fails building 0.3.8
[...]
dpkg-source: info: building visualequation using existing
./visualequation_0.3.8.orig.tar.gz
patching file README.md
Reversed (or previously applied) patch detected! Skipping patch.
3 out of 3 hunks ignored
patching file data/USAGE.html
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored
patching file data/icons-def.ini
Reversed (or previously applied) patch detected! Skipping patch.
4 out of 4 hunks ignored
patching file visualequation/__main__.py
Reversed (or previously applied) patch detected! Skipping patch.
4 out of 4 hunks ignored
patching file visualequation/commons.py
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored
patching file visualequation/eq.py
Reversed (or previously applied) patch detected! Skipping patch.
2 out of 2 hunks ignored
patching file visualequation/eqsel.py
Reversed (or previously applied) patch detected! Skipping patch.
3 out of 3 hunks ignored
patching file visualequation/eqtools.py
Reversed (or previously applied) patch detected! Skipping patch.
6 out of 6 hunks ignored
patching file visualequation/symbols/delimiters.py
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored
patching file visualequation/symbols/functions.py
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk 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-0.3.8.orig._2fGew/debian/patches/0001-Imported-Upstream-version-0.3.8.patch
gave error exit status 1
dpkg-buildpackage: error: dpkg-source -b visualequation-0.3.8 gave error
exit status 2
debuild: fatal error at line 1376:
dpkg-buildpackage -rfakeroot -D -us -uc failed
Best regards,
Daniel
Reply to: