Re: upstream release of unreleased package
On Fri, Feb 22, 2019 at 07:13:28PM +, llu...@autistici.org wrote: > Ok. These are the commands I would use: > > $ gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git > $ cd visualequation/ > (debian/master)]$ git revert HEAD > [debian/master 7cc491f] Revert "Adding patches" > 3 files changed, 524 deletions(-) > delete mode 100644 debian/patches/0001-Imported-Upstream-version-0.3.8.patch > delete mode 100644 > debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch > delete mode 100644 debian/patches/series > (debian/master)]$ git merge upstream/0.3.8 Merge made by the 'recursive' > strategy. > README.md| 12 -- > [...] > 10 files changed, 167 insertions(+), 51 deletions(-) > (debian/master)]$ dch -v 0.3.8-1 > (debian/master)]$ git add debian/changelog > (debian/master)]$ git commit -m "Updating debian/changelog to 0.3.8-1" > [debian/master b5496f5] Updating debian/changelog to 0.3.8-1 > 1 file changed, 3 insertions(+), 2 deletions(-) > (debian/master)]$ git push origin : --tags Looks fine to me. The last command won’t do anything though, since the upstream tag already exists, and you have not created a Debian release/tag yet. -- Dmitry Shachnev signature.asc Description: PGP signature
Re: upstream release of unreleased package
On 2019-02-22 14:29, Dmitry Shachnev wrote: The last commits in upstream and pristine-tar branches look fine, no need to revert them. Just revert the last commit in debian/master (as you did above), then merge upstream/0.3.8 tag into debian/master and update the changelog. It should be enough. Ok. These are the commands I would use: $ gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git $ cd visualequation/ (debian/master)]$ git revert HEAD [debian/master 7cc491f] Revert "Adding patches" 3 files changed, 524 deletions(-) delete mode 100644 debian/patches/0001-Imported-Upstream-version-0.3.8.patch delete mode 100644 debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch delete mode 100644 debian/patches/series (debian/master)]$ git merge upstream/0.3.8 Merge made by the 'recursive' strategy. README.md| 12 -- [...] 10 files changed, 167 insertions(+), 51 deletions(-) (debian/master)]$ dch -v 0.3.8-1 (debian/master)]$ git add debian/changelog (debian/master)]$ git commit -m "Updating debian/changelog to 0.3.8-1" [debian/master b5496f5] Updating debian/changelog to 0.3.8-1 1 file changed, 3 insertions(+), 2 deletions(-) (debian/master)]$ git push origin : --tags Best regards, Daniel
Re: upstream release of unreleased package
Hello, Now that my system is working properly I propose a solution for the repository. It is based in git-revert the three branches (debian/master, upstream and pristine-tar) and invoke gbp import-orig with option --upstream-tag=upstream/0.3.8-aux. I paste a log of my proposal. Do you think it is adequate/correct? $ gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git gbp:info: Cloning from 'g...@salsa.debian.org:python-team/applications/visualequation.git' $ cd visualequation/ (debian/master)]$ git revert HEAD [debian/master 99ea7ee] Revert "Adding patches" 3 files changed, 524 deletions(-) delete mode 100644 debian/patches/0001-Imported-Upstream-version-0.3.8.patch delete mode 100644 debian/patches/0002-modifying-d-changelog-for-new-upstream-release.patch delete mode 100644 debian/patches/series (debian/master)]$ git checkout upstream Switched to branch 'upstream' Your branch is up-to-date with 'origin/upstream'. (upstream)]$ git revert HEAD [upstream aadd65c] Revert "Imported Upstream version 0.3.8" 10 files changed, 51 insertions(+), 167 deletions(-) (upstream)]$ git checkout pristine-tar Branch pristine-tar set up to track remote branch pristine-tar from origin. Switched to a new branch 'pristine-tar' (pristine-tar)]$ git revert HEAD [pristine-tar 3bf5b9f] Revert "pristine-tar data for visualequation_0.3.8.orig.tar.gz" 2 files changed, 1 deletion(-) delete mode 100644 visualequation_0.3.8.orig.tar.gz.delta delete mode 100644 visualequation_0.3.8.orig.tar.gz.id (pristine-tar)]$ git checkout debian/master Switched to branch 'debian/master' Your branch is ahead of 'origin/debian/master' by 1 commit. (use "git push" to publish your local commits) (debian/master)]$ gbp pq import gbp:info: Trying to apply patches at '99ea7eef8d9506318d4bf53b98c2b7e1eac892a0' gbp:info: 0 patches listed in 'debian/patches/series' imported on 'patch-queue/debian/master' (patch-queue/debian/master)]$ git checkout debian/master Switched to branch 'debian/master' Your branch is ahead of 'origin/debian/master' by 1 commit. (use "git push" to publish your local commits) (debian/master)]$ gbp import-orig --pristine-tar --uscan --upstream-tag=upstream/0.3.8-aux 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 (debian/master)]$ gbp pq rebase gbp:info: Switching to 'patch-queue/debian/master' First, rewinding head to replay your work on top of it... Fast-forwarded patch-queue/debian/master to debian/master. (patch-queue/debian/master)]$ 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) gbp:info: No patches on 'patch-queue/debian/master' - nothing to do. (debian/master)]$ dch -v 0.3.8-1 (debian/master)]$ git add debian/changelog (debian/master)]$ git commit -m "Updating d/changelog to 0.3.8-1" Best regards, Daniel
Re: upstream release of unreleased package
Hi Dmitry, On 2019-02-21 21:54, Dmitry Shachnev wrote: And I cannot reproduce the failure that you are getting later. Does this mean you are using git-buildpackage older than 0.8.0? Yes, it was older. With 0.8.12.2 I success. Thanks a lot for solving the mystery, I will use version 0.8.12.2 from now on. Anyway, I think that here you should run import-orig from debian/master branch, not from patch-queue/debian/master (where the previous command left you). If you run ‘git checkout debian/master’ before ‘gbp import-orig’ this might work even with older git-buildpackage versions. OK. I will do that. Maybe it would be good to add that in the wiki. I recommend setting up your shell prompt to show the current branch, it will make it easier to understand what is going on. You can find some instructions how to do it in /usr/lib/git-core/git-sh-prompt. Perfect. Thanks for the tip. Regards, Daniel
Re: upstream release of unreleased package
Hi Daniel, On Thu, Feb 21, 2019 at 09:15:59PM +, llu...@autistici.org wrote: > 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 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 Here, the output of ‘gbp pq import’ is a bit different (note the ‘0’): 0 patches listed in 'debian/patches/series' imported on 'patch-queue/debian/master' And I cannot reproduce the failure that you are getting later. Does this mean you are using git-buildpackage older than 0.8.0? In 0.8.0, the output of ‘gbp pq import’ was changed, and in 0.8.2 bug #832016 was fixed, which may affect your workflow. Anyway, I think that here you should run import-orig from debian/master branch, not from patch-queue/debian/master (where the previous command left you). If you run ‘git checkout debian/master’ before ‘gbp import-orig’ this might work even with older git-buildpackage versions. I recommend setting up your shell prompt to show the current branch, it will make it easier to understand what is going on. You can find some instructions how to do it in /usr/lib/git-core/git-sh-prompt. -- Dmitry Shachnev signature.asc Description: PGP signature
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 g...@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 ..." 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
Re: upstream release of unreleased package
On 2019-02-17 08:22, Brian May wrote: "for a new upstream release of the unreleased" - has it been released upstream or not? Yes, it has been released. You can find it here https://github.com/daniel-molina/visualequation/releases/tag/0.3.8 uscan can access and download it. When I said that it is unreleased I meant that no previous versions were published in Debian (and UNRELEASED is written in the debian/changelog). Thanks for all the help, Daniel
Re: upstream release of unreleased package
Andrey Rahmatullin writes: > No, you should not add the new upstream version as a patch. Especially as > you already have the tarball imported. What is the repo missing is merging > upstream/0.3.8 into the master branch. If you imported the tarball with > gbp import-orig it would have happened automatically. That would probably explain why I had problems. I didn't check that the latest upstream branch correctly matched the source without patches, and generated the orig.tar.gz file based on the lastest upstream branch (which wasn't tagged correctly either). It is possible in this case no patches are required. Not sure I entirely understand the situation however. "for a new upstream release of the unreleased" - has it been released upstream or not? -- Brian May
Re: upstream release of unreleased package
On Thu, Feb 14, 2019 at 09:43:19PM +, llu...@autistici.org wrote: > I changed the strategy to git revert and now I am able to build the package > with the following commands: > > gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git > cd visualequation/ > uscan > git revert HEAD # "Revert last commit due to human error" > dch -v 0.3.8-1 > dpkg-source --commit > -> Enter the desired patch name: 0001-Imported-Upstream-version-0.3.8.patch > git add debian/changelog debian/patches/* > git commit -m "Fixing upstream version 0.3.8" > debuild -us -uc > > Do you find it correct/appropriate? No, you should not add the new upstream version as a patch. Especially as you already have the tarball imported. What is the repo missing is merging upstream/0.3.8 into the master branch. If you imported the tarball with gbp import-orig it would have happened automatically. -- WBR, wRAR signature.asc Description: PGP signature
Re: upstream release of unreleased package
I changed the strategy to git revert and now I am able to build the package with the following commands: Sorry, I did not notice that the patches were not applied. :( Help welcome. Daniel
Re: upstream release of unreleased package
On 2019-02-12 19:19, Andrey Rahmatullin wrote: I have no idea about gbp-pq but I guess resetting just master is not enough to fix that repo. Please also note that force pushes are bad and deleting tags in published repos doesn't really work so please don't do that, especially when the problem is mainly with the unpublished pq branch and some files in debian/patches that can be easily reverted. I changed the strategy to git revert and now I am able to build the package with the following commands: gbp clone g...@salsa.debian.org:python-team/applications/visualequation.git cd visualequation/ uscan git revert HEAD # "Revert last commit due to human error" dch -v 0.3.8-1 dpkg-source --commit -> Enter the desired patch name: 0001-Imported-Upstream-version-0.3.8.patch git add debian/changelog debian/patches/* git commit -m "Fixing upstream version 0.3.8" debuild -us -uc Do you find it correct/appropriate? Thanks in advance, Daniel
Re: upstream release of unreleased package
I have no idea about gbp-pq but I guess resetting just master is not enough to fix that repo. Please also note that force pushes are bad and deleting tags in published repos doesn't really work so please don't do that, especially when the problem is mainly with the unpublished pq branch and some files in debian/patches that can be easily reverted. -- WBR, wRAR signature.asc Description: PGP signature
Re: upstream release of unreleased package
On 10/2/19 21:37, Brian May wrote: 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 :-( Thanks for the information. Now I understand better the problem.
Re: upstream release of unreleased package
llu...@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 :-( -- Brian May
Re: upstream release of unreleased package
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 ..." 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 ...» 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 ..." 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
Re: upstream release of unreleased package
Both your patches look very wrong. How did you make them? The patch patching debian/changelog looks especially wrong. -- WBR, wRAR signature.asc Description: PGP signature
Re: upstream release of unreleased package
Il 2019-02-10 01:24 Brian May ha scritto: llu...@autistici.org writes: Then, I did git push. It was correct? What should I do next? The output (see below) suggest to create a merge request. Thanks in advance. Ignore that. That is just the git server providing helpful information that isn't really appropriate here. OK. Thanks for your answer. I would like to check that it can be packaged correctly (I think that is the next step), but I have no success with "debuild -us -uc". I also tried "gbp buildpackage --git-pristine-tar". Any hint? I paste the outputs below. Thanks, Daniel $ LANG=C debuild -us -uc dpkg-buildpackage -rfakeroot -D -us -uc dpkg-buildpackage: source package visualequation dpkg-buildpackage: source version 0.3.7-1 dpkg-buildpackage: source distribution UNRELEASED dpkg-buildpackage: source changed by Daniel Molina Garcia dpkg-source --before-build visualequation dpkg-buildpackage: host architecture amd64 dpkg-source: info: applying 0001-Imported-Upstream-version-0.3.8.patch dpkg-source: info: applying 0002-modifying-d-changelog-for-new-upstream-release.patch fakeroot debian/rules clean dh clean --with python3 --buildsystem=pybuild dh_testdir -O--buildsystem=pybuild debian/rules override_dh_auto_clean make[1]: Entering directory '/home/lluvia/debian/visualequation' rm -rf data/icons/ dh_auto_clean I: pybuild base:184: python3.5 setup.py clean running clean removing '/home/lluvia/debian/visualequation/.pybuild/pythonX.Y_3.5/build' (and everything under it) /usr/lib/python3.5/distutils/dist.py:261: UserWarning: Unknown distribution option: 'long_description_content_type' warnings.warn(msg) 'build/bdist.linux-x86_64' does not exist -- can't clean it 'build/scripts-3.5' does not exist -- can't clean it make[1]: Leaving directory '/home/lluvia/debian/visualequation' dh_clean -O--buildsystem=pybuild dpkg-source -b visualequation dpkg-source: info: using source format '3.0 (quilt)' 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.orig.NFdkmV/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 $ LANG=C gbp buildpackage --git-pristine-tar dpkg-buildpackage -rfakeroot -D -us -uc -i -I dpkg-buildpackage: source package visualequation dpkg-buildpackage: source version 0.3.7-1 dpkg-buildpackage: source distribution UNRELEASED dpkg-buildpackage: source changed by Daniel Molina Garcia dpkg-source -i -I --before-build visualequation dpkg-buildpackage: host architecture amd64 dpkg-source: info: applying 0001-Imported-Upstream-version-0.3.8.patch dpkg-source: info: applying 0002-modifying-d-changelog-for-new-upstream-release.patch fakeroot debian/rules clean dh clean --with python3 --buildsystem=pybuild dh_testdir -O--buildsystem=pybuild debian/rules override_dh_auto_clean make[1]: Entering directory '/home/lluvia/debian/visualequation' rm -rf data/icons/ dh_auto_clean I: pybuild base:184: python3.5 setup.py clean running clean removing '/home/lluvia/debian/visualequation/.pybuild/pythonX.Y_3.5/build' (and everything under it) /usr/lib/python3.5/distutils/dist.py:261: UserWarning:
Re: upstream release of unreleased package
llu...@autistici.org writes: > Then, I did git push. It was correct? What should I do next? The output > (see below) suggest to create a merge request. > Thanks in advance. Ignore that. That is just the git server providing helpful information that isn't really appropriate here. -- Brian May
upstream release of unreleased package
Dear all, I followed the steps indicated in https://wiki.debian.org/Python/GitPackaging for a new upstream release of the unreleased https://salsa.debian.org/python-team/applications/visualequation My intention is to check that this new version can be packaged correctly and then ask for sponsorship. Things that I did that were not explicitly written: * git add and git commit debian/changelog * git add and git commit debian/patches/* Then, I did git push. It was correct? What should I do next? The output (see below) suggest to create a merge request. Thanks in advance. Daniel $ 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
