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: xRayUtilities Package
On Fri, Feb 22, 2019 at 02:15:43PM +, MARIE Alexandre wrote: > Sorry, my mistake, the name of the package is python-xrayutilities !* No such package in Debian either (and if it existed, my apt search command would return it). There is only an old RFP #723017. This is not related to the topic of debian-python@, though (but neither is discussing gbp). > The routine I had to upgrade this package was : > > - gbp clone https://salsa.debian.org/science-team/python-xrayutilities > > Then go into the folder that have been created : cd python-xrayutilities > > - gbp import-orig --uscan --pristine-tar It downloads xrayutilities-testdata-20171020.tar.gz instead of the actual upstream tarball, did you ignore that fact or did you not tell all the actual steps to reproduce your problem? > > - gbp dch -a > > Solve conflicts You are not supposed to have conflicts, especially at this point. You also didn't say what conflicts, where and how did you solve them. -- WBR, wRAR signature.asc Description: PGP signature
Request to join DPMT
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Hello Python module maintainers! I would like to join the DPMT. We use quite a bit of python modules at work on Debian based systems (desktops and servers). I have often packaged modules for internal use and would like to bring packages into Debian where it makes sense. Also it would make sense if I can help fixing issues which I/we discover. I currently have an RFS open for python-opentimestamps, which I will gladly change to be co-maintained by the team. (I am working on the opentimestamps-client, but this is blocked by some other issues) I have read https://salsa.debian.org/python-team/tools/python-modules/blob/master/policy .rst I am currently not a DD. My salsa-login is "hansto-guest". Looking forward to working with you! Best regards Hanno -BEGIN PGP SIGNATURE- iQFMBAEBCgA2FiEEzvT0u37dgZQfJDPwHBnhCWUuBKMFAlxwDX0YHGhhbm5vQGRp ZS1zdG9lY2tjaGVuLmRlAAoJEBwZ4QllLgSjL/oIAI29JUPQ/mbQtsaNqhU3UniO tpfcgxZJNwQsAVN7c88r+L17xeWFTsPF/RYbPJcImV1PI2idjYUa9W6+YIDycIZp EeaR8sCyG/V/3KWjo6W2DKJZz+HU/l4FfAcoW2LdK/wp7fcyufc6ITnDkUtjdRcy kkYYKePpAIEplUY9Hstc9MnRNVfyxRaXXPxDed2hRjrvbKG9DxCJel7qix8mz+9o gvRkXdX0XaYlcy+iQB/401mRzHE1G0EexcyvPsNKC3w472b6WgUZu/fTdEvDkWYV lP8DlCRGiiGYuI8ETbSmcS43uNM4bGIHtNwGlWU4epwIqGT/qJUUqlnQQhk12Bs= =jf6H -END PGP SIGNATURE-
RE:xRayUtilities Package
Sorry, my mistake, the name of the package is python-xrayutilities !* The routine I had to upgrade this package was : - gbp clone https://salsa.debian.org/science-team/python-xrayutilities Then go into the folder that have been created : cd python-xrayutilities - gbp import-orig --uscan --pristine-tar - gbp dch -a Solve conflicts Edit d/changelog Commit And run : - dgit sbuild : This command creates the error in the previous mail. Dgit then advice me to run : - git diff 6d8103f84ac364be0fb53f7ceb8748b0d5ee63da HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore' And this is the command that shows the additions and deletions that I pasted to you. I don't know if it's clearer, but I hope it is ! Thanks for your time, Alexandre Marie De : Andrey Rahmatullin [w...@debian.org] Envoyé : vendredi 22 février 2019 15:03 À : debian-python@lists.debian.org Objet : Re: xRayUtilities Package Telling us the commands you used to get to this stage would be helpful, I think. Right now it's only clear that the listed files are different in the upstream and in the master branches, but dgit already told you that. Also, what is the package name? "apt search xrayutilities" returns nothing for me. -- WBR, wRAR
Re: xRayUtilities Package
Telling us the commands you used to get to this stage would be helpful, I think. Right now it's only clear that the listed files are different in the upstream and in the master branches, but dgit already told you that. Also, what is the package name? "apt search xrayutilities" returns nothing for me. -- WBR, wRAR signature.asc Description: PGP signature
xRayUtilities Package
Hello, I'm trying to package xrayutilities new version (1.5.1) as the one in Debian is the 1.2.0. I cleaned the conflicts and edited d/changelog. Now when I run "dgit sbuild" I get this error message : dgit: error: --quilt=gbp specified, implying patches-unapplied git tree dgit: but git tree differs from orig in upstream files. dgit: For full diff showing the problem(s), type: dgit: git diff 6d8103f84ac364be0fb53f7ceb8748b0d5ee63da HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore' And when I run the git diff command, I get a message that I don't understand : diff --git a/CHANGES.txt b/CHANGES.txt index 9c905fa..693a199 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -154,14 +154,14 @@ v1.2.1, 2016-01-08 v1.2.0, 2015-08-03 * Radicon file support was removed (no test scripts available!) -* replace pytables by faster and more convenient h5py -* bug fixes/improvements in the file parsers (discovered by the unit tests!) -* new unittests for file parsers (spec, edf, xrdml, esg, nja, fio, cbf, tif) -* added different oxidation states of the chemical elements to the database -* huge speed improvements for the database access, especially when querying - multiple values at the same time -* add PseudoVoigtAsym option in xu.math.peakfit -* memory usage optimization in FastScanCCD +* replace pytables by faster and more convenient h5py bug +* fixes/improvements in the file parsers (discovered by the unit +* tests!) new unittests for file parsers (spec, edf, xrdml, esg, nja, +* fio, cbf, tif) added different oxidation states of the chemical +* elements to the database huge speed improvements for the database +* access, especially when querying multiple values at the same time +* add PseudoVoigtAsym option in xu.math.peakfit memory usage +* optimization in FastScanCCD v1.1.2, 2015-04-22 diff --git a/PKG-INFO b/PKG-INFO new file mode 100644 index 000..8e3faac --- /dev/null +++ b/PKG-INFO @@ -0,0 +1,196 @@ +Metadata-Version: 1.1 +Name: xrayutilities +Version: 1.5.1 +Summary: package for x-ray diffraction data evaluation +Home-page: http://xrayutilities.sourceforge.net +Author: Dominik Kriegner +Author-email: dominik.krieg...@gmail.com +License: GPLv2 +Description: += +xrayutilities += + +xrayutilities is a collection of scripts used to analyze x-ray diffraction +data. It consists of a Python package and several routines coded in C. It is +especially useful for the reciprocal space conversion of diffraction data +taken with linear and area detectors. + I don't see what I am missing here, thus I'm looking for your help ! Thanks you for reading. Cheers, Alexandre Marie
