I am just realizing that you should have used "gbp import-dsc" for populating your local repository. This is probably the reason why the wrong "debian/*" tages appear and no pristine-tar branches are created.
see my message sent a moment ago - the issue should have been
fixed now.
yes, I had created the repos using gdb import-dsc, but
did not enable prestine-tar in my gdb.conf. the "gdb import-dsc"
command does seem to create the debian/* tag by default, but I
just manually deleted those.
I called the "gbp pristine-tar commit /path/to/upstream.tar.gz"
command and added the prestine-tar branch.
Note that the upstream tarball I added is the "original" release tarball, which is different from my "zmat_0.9.8.orig.tar.gz" as the latter contains modifications (such as creating inst/ and moving .m to inst etc).
Please let me know if this could be a problem, I am happy to
re-create the pristine-tar using the .orig.tar.gz file if needed.
Qianqian
The correct gbp workflow for starting a package from scratch would be the following (using your zmat package as an example):
dget https://mentors.debian.net/debian/pool/main/z/zmat/zmat_0.9.8-1.dsc
mkdir zmat
cd zmat
git init
gbp import-orig --pristine-tar../zmat_0.9.8.orig.tar.gz
tar xfvJ ../zmat_0.9.8-1.debian.tar.xz
git add debian/
git ci -m "Add initial Debian files"
git remote add origin git@salsa.debian.org:pkg-octave-team/zmat.git
gbp push --all
I would strongly recommend that you put the following in your ~/.gbp.conf:
[DEFAULT]
pristine-tar = True
[import-orig]
merge-mode = merge
This avoids specifying the the --pristine-tar option for every command.
Best,
Rafael
* Rafael Laboissière <rafael@debian.org> [2020-06-19 08:42]:
* Qianqian Fang <fangqq@gmail.com> [2020-06-18 15:38]:
On 6/18/20 2:46 PM, Rafael Laboissière wrote:
I think it is fixed now.
Go ahead, please.
Done!
uploaded. please see
https://salsa.debian.org/pkg-octave-team/zmat
https://salsa.debian.org/pkg-octave-team/octave-jsonlab
https://salsa.debian.org/pkg-octave-team/octave-jnifti
The layout of the repositories do not seem right. This is what I get:
$ gbp clone git@salsa.debian.org:pkg-octave-team/zmat.git
gbp:info: Cloning from 'git@salsa.debian.org:pkg-octave-team/zmat.git'
$ cd zmat
$ git branch
* master
$ git tag
debian/0.9.8-1
upstream/0.9.8
$ gbp clone git@salsa.debian.org:pkg-octave-team/octave-jnifti.git
gbp:info: Cloning from 'git@salsa.debian.org:pkg-octave-team/octave-jsonlab.git'
$ cd octave-jsonlab
$ git branch
* master
upstream
$ git tag
debian/2.0-1
upstream/2.0
$ gbp clone git@salsa.debian.org:pkg-octave-team/octave-jnifti.git
gbp:info: Cloning from 'git@salsa.debian.org:pkg-octave-team/octave-jnifti.git'
$ cd octave-jnifti
$ git branch
* master
upstream
$ git tag
debian/0.6-1
upstream/0.6
Note that the "upstream" branch is lacking in the zmat repository. Also, the "pristine-tar" branch is lacking in all three repositories.
Finally, as I wrote in a previous message, the tags "debian/*" should not be present for now. They should appear only after the package has been uploaded and accepted in unstable.
Please, fixed the above issues, otherwise it will be impossible to use the repositories in a git-buildpackage normal workflow.
if you have time, please take a look and let me know if any changes you want me to make - I want to briefly mention two things:
1. the above 3 toolboxes have dependencies - octave-jsonlab requires zmat, and octave-jnifti requires the above two.
2. the only major warning I have right now is that the jnifti-demos subpackage in octave-jnifti contains only docs files, so lintian gives the below warning:
W: jnifti-demos: empty-binary-package
please let me know if this is something that should be fixed.
In the meantime, I will read the web pages on how to move forward from here.
Before looking into the packages, I will wait until you fix the layout problems I mentioned above.
In addition, I am also preparing another 4 new packages. Once they are ready, I will follow up with you on the repo settings if I need you to change permission.
Ok.
Rafael