Ahh. To build in Debian, you need to create a single orig.tar.gz. However, this can come from multiple upstream tarballs if needed. (Note that in my personal experience, gbp import-orig --uscan does not properly process multiple upstream tarballs. So, if you wanted to use gbp you would need to run uscan separately and then gpb import-orig ../orig.tar.xz.)
You can look at the options for MUT (Multiple Upstream Tarballs). https://manpages.debian.org/stretch/devscripts/uscan.1.en.html Basically, each tarball after the first one is assigned a component, which is a directory inside of the main tarball into which it is placed. You can see how I have done this for fonts-adobe-sourcesans3: https://salsa.debian.org/fonts-team/fonts-adobe-sourcesans3/-/blob/master/ debian/watch?ref_type=heads uscan will process all the tarballs and repackage them into a single orig.tar.xz (note that uscan prefers .xz instead of .gz because the compression is better, and because it has to repack it anyway, it goes with .xz). Just ask if you need any help figuring out how to apply this to your package. Soren On Monday, July 29, 2024 2:50:16 PM MST Julius Pfrommer wrote: > Soren, > > The upstream sources come with *two* tarballs. > The nodeset tarball (with XML files) is from [1]. > In the upstream open62541 project we use a git submodule for the nodeset. > For the Debian packaging we instead have a second tarball for the exact commit > of the git submodule [2]. > > - open62541_1.4.3.orig.tar.gz > - open62541_1.4.3.orig-nodeset.tar.gz > > Both tarballs have been pushed to mentors. > The manual build should work, provided you also give it the second > nodeset-tarball. > > The pristine-tar branch was created as follows: > > gbp pristine-tar commit --component=nodeset ../ open62541_1.4.3.orig.tar.gz > -v > > The verbose output is included down below the fold. > > Probably I did not redo the pristine-tar after the latest commit to main > (changing the Vcs-Git tag, no changes outside of /debian). Rerunning the gbp > pristine-tar command just now added more git-commits. They are pushed to > salsa on top of the pristine-tar branch. > > With this I can run > > gbp buildpackage --git-debian-branch=main > > on my box without an error. > > [1] https://github.com/OPCFoundation/UA-Nodeset > [2] > https://github.com/OPCFoundation/UA-Nodeset/tree/ d1bb6a22125bd7cd986272b1ee98 > a18a91d76fff > > -- > Regards, Julius > > gbp:debug: ['git', 'rev-parse', '--show-cdup'] > gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] > gbp:debug: ['git', 'rev-parse', '--git-dir'] > gbp:debug: ['git', 'ls-tree', '-z', 'upstream/1.4.3', '--'] > gbp:debug: ['git', 'mktree', '-z'] > gbp:debug: ['git', 'ls-tree', '-z', 'upstream/1.4.3', '--'] > gbp:debug: Creating pristine tar commit > '../open62541_1.4.3.orig-nodeset.tar.gz' from > 'f38a1be271027c8490bbce407be4f34c2397bf29' gbp:debug: pristine-tar [] > ['commit', '../open62541_1.4.3.orig-nodeset.tar.gz', > 'f38a1be271027c8490bbce407be4f34c2397bf29'] gbp:debug: pristine-tar [] > ['commit', '../open62541_1.4.3.orig.tar.gz', > '20bcbcfe79a001b805a52df0f3088b9868844ffc'] gbp:info: Successfully committed > pristine-tar data for version 1.4.3-1 of ../open62541_1.4.3.orig.tar.gz with > additional tarballs for open62541_1.4.3.orig-nodeset.tar.gz -- Soren Stoutner so...@debian.org
signature.asc
Description: This is a digitally signed message part.
