Re: Please remove pyrit from PAPT Salsa
On Sunday, February 10, 2019 06:04:17 PM Christian Kastner wrote: > Hi, > > pyrit has been handed over to pkg-security, where it will be better > taken care of, and the main repository is now pkg-security-team/pyrit. > > Could one of the owners of PAPT on Salsa please remove the repository > python-team/applications/pyrit? I've archived the project, which I think is the correct approach here. Scott K
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
Please remove pyrit from PAPT Salsa
Hi, pyrit has been handed over to pkg-security, where it will be better taken care of, and the main repository is now pkg-security-team/pyrit. Could one of the owners of PAPT on Salsa please remove the repository python-team/applications/pyrit? Regards, Christian
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: Unknown
