Re: Looking for example package that uses multiple source tarballs

[Qianqian Fang]

On 6/26/20 12:00 PM, Pierre Gruet wrote:

As you guessed, the fact that you got the old version number 1.9.1 in
the name of the orig tarball is because "debian" is provided as the
third argument concerning the first tarball, as the above link explains:
it forces the use of the version number written in debian/changelog. You
may see, if you put the right number again in debian/changelog, that
running "uscan --force" will download the tarballs and give them the
right version number.

Yet, I guess this should not remain as is but I unfortunately do not
have the repacking skills to do more at that point.



the --force option worked like a charm!

the empty source package issue was eventually fixed by adjusting the 
repack script to deal with the oversionmangle.


one minor question: although uscan --force allowed me to download and 
build the MUT source package, when I tried "gbp import-orig --uscan" to 
create a git repo, it refused to download the packages again, and I was 
not able to find a place to tell uscan to use --force, is there a way to 
also import an MUT orig package to git?


thanks again

Qianqian

Re: Looking for example package that uses multiple source tarballs

[Pierre Gruet]

Hi Qianqian,

Le 26/06/2020 à 04:20, Qianqian Fang a écrit :
> 
> [...]
> 
> thanks Pierre for the comments and sample project, very helpful!
>

You are welcome!
> 
> [...]
> 
> I am not sure if it is related, but i have to change my debian/changelog
> version to a lower version number (1.9.1) in order to let uscan download
> the new release (1.9.5). however, both .tar.xz files are empty (except
> the debian/ folder)
> 
> |octave-iso2mesh_1.9.1-1.debian.tar.xz
> octave-iso2mesh_1.9.5+dfsg1-0ubuntu1.debian.tar.xz
> |
> 
> but the *octave-iso2mesh_1.9.1.orig.tar.gz* file is correctly repacked
> and contains all needed files.
> 
> I am wondering if anyone notice something wrong in repack or watch
> script? my repack file was slightly modified from
> https://wiki.debian.org/BenFinney/software/repack
>

As you guessed, the fact that you got the old version number 1.9.1 in
the name of the orig tarball is because "debian" is provided as the
third argument concerning the first tarball, as the above link explains:
it forces the use of the version number written in debian/changelog. You
may see, if you put the right number again in debian/changelog, that
running "uscan --force" will download the tarballs and give them the
right version number.

Yet, I guess this should not remain as is but I unfortunately do not
have the repacking skills to do more at that point.

> 
> another minor thing is the "|-0ubuntu1|" suffix. I am testing the
> packaging in a Ubuntu 18.04 box, is there a way to remove that?
> 
> my packaging files are committed at
> https://salsa.debian.org/pkg-octave-team/octave-iso2mesh/
> 
> 
> 
> much appreciated!
> 
> Qianqian
> 

All the best,
Pierre

Re: Looking for example package that uses multiple source tarballs

[Qianqian Fang]

On 6/25/20 4:09 PM, Pierre Gruet wrote:

I think you should provide some options ("opts=..."): for instance, a
component name should be provided for the two last parts. You can look
at the manpage of uscan, it provides some examples of watch files for
multiple upstream tarballs.
As you are doing some repack, I guess you will add some suffix to the
version number (like "+dfsg"), and to do so you should need to provide
the "oversionmangle=..." option for the first tarball. Examples are
shown in uscan's manpage.
I recently packaged libaparapi-java, which is not yet in Debian but
which you can get from its Salsa repository

https://salsa.debian.org/med-team/libaparapi-java

Running "uscan --verbose" will allow you to get three tarballs : a main
one and two components.


thanks Pierre for the comments and sample project, very helpful!

after reading your watch file and uscan's manual page more carefully, I 
was able to download all 3 components using the below watch file


https://salsa.debian.org/pkg-octave-team/octave-iso2mesh/-/blob/master/debian/watch

after running *uscan --verbose*, a bunch of files/folders were created 
in the above directory, see


|drwxrwxr-x  5 fangq fangq 4096 Jun 25 22:03 
octave-iso2mesh-1.9.5+dfsg1||
||-rw-rw-r--  1 fangq fangq  409 Jun 25 22:03 
octave-iso2mesh_1.9.5+dfsg1-0ubuntu1.dsc||
||-rw-rw-r--  1 fangq fangq 5500 Jun 25 22:03 
octave-iso2mesh_1.9.5+dfsg1-0ubuntu1.debian.tar.xz||
||lrwxrwxrwx  1 fangq fangq   20 Jun 25 22:03 
octave-iso2mesh_1.9.5+dfsg1.orig-meshfix.tar.gz -> meshfix-1.2.2.tar.gz||

||-rw-rw-r--  1 fangq fangq  2092675 Jun 25 22:03 meshfix-1.2.2.tar.gz||
||-rw-rw-r--  1 fangq fangq  135 Jun 25 22:03 
octave-iso2mesh_1.9.5+dfsg1.orig.tar.gz||
||-rw-rw-r--  1 fangq fangq 5500 Jun 25 22:03 
octave-iso2mesh_1.9.1-1.debian.tar.xz||
||lrwxrwxrwx  1 fangq fangq   15 Jun 25 22:03 
octave-iso2mesh_1.9.5+dfsg1.orig-cork.tar.gz -> cork-0.9.tar.gz||

||-rw-rw-r--  1 fangq fangq   292728 Jun 25 22:03 cork-0.9.tar.gz||
||-rw-rw-r--  1 fangq fangq   941881 Jun 25 22:03 
octave-iso2mesh_1.9.1.orig.tar.gz||

||-rw-rw-r--  1 fangq fangq 28793215 Jun 25 22:03 iso2mesh-1.9.5.tar.gz|

the final merged source folder, however, only contains the source codes 
of the two components, but not from the main package, see


*|$~/space/git/Temp/pkg$ ls -lt octave-iso2mesh-1.9.5+dfsg1|*|
||total 12||
||drwxrwxr-x 4 fangq fangq 4096 Jun 25 22:03 debian||
||drwxrwxr-x 7 fangq fangq 4096 Jun 20 12:44 meshfix||
||drwxrwxr-x 5 fangq fangq 4096 Oct  1  2019 cork|

I am not sure if it is related, but i have to change my debian/changelog 
version to a lower version number (1.9.1) in order to let uscan download 
the new release (1.9.5). however, both .tar.xz files are empty (except 
the debian/ folder)


|octave-iso2mesh_1.9.1-1.debian.tar.xz
octave-iso2mesh_1.9.5+dfsg1-0ubuntu1.debian.tar.xz
|

but the *octave-iso2mesh_1.9.1.orig.tar.gz* file is correctly repacked 
and contains all needed files.


I am wondering if anyone notice something wrong in repack or watch 
script? my repack file was slightly modified from 
https://wiki.debian.org/BenFinney/software/repack


another minor thing is the "|-0ubuntu1|" suffix. I am testing the 
packaging in a Ubuntu 18.04 box, is there a way to remove that?


my packaging files are committed at 
https://salsa.debian.org/pkg-octave-team/octave-iso2mesh/ 
 



much appreciated!

Qianqian

Re: Looking for example package that uses multiple source tarballs

[Pierre Gruet]

Hi Qianqian,


Le 25/06/2020 à 21:02, Qianqian Fang a écrit :
> hi everyone,
> 
> I am working on packaging a matlab/octave toolbox that involves multiple
> source tarballs
> 
> https://salsa.debian.org/pkg-octave-team/octave-iso2mesh
> 
> [...]
> 
> I notice that debian/watch file supports multiple source components, so
> I wrote the below watch file:
> 
> |
> |
> 
> |version=3||
> ||
> ||opts="dversionmangle=s/\+dfsg\.\d+$//,filenamemangle=s/\S+\/v?(\S+)\.tar\.gz/iso2mesh-$1\.tar\.gz/"
> \||
> ||    https://github.com/fangq/iso2mesh/tags .*/v?(\d\S+)\.tar\.gz \||
> ||    debian debian/repack||
> ||
> ||https://github.com/fangq/cork/releases
> .*/v(\d[\d\.]*)\.(?:tar.gz|tar.bz2|tar.xz)||
> ||https://github.com/fangq/meshfix/releases
> .*/v(\d[\d\.]*)\.(?:tar.gz|tar.bz2|tar.xz)|
> 

I think you should provide some options ("opts=..."): for instance, a
component name should be provided for the two last parts. You can look
at the manpage of uscan, it provides some examples of watch files for
multiple upstream tarballs.
As you are doing some repack, I guess you will add some suffix to the
version number (like "+dfsg"), and to do so you should need to provide
the "oversionmangle=..." option for the first tarball. Examples are
shown in uscan's manpage.

> 
> but when I ran*uscan --verbose*, it only downloaded/repacked the main
> source file, but refused to download the components
> 
> [...]
> 
> 
> I am wondering if you know any sample package that uses repack/uscan to
> combine multiple source packages? The uscan manpage mentioned about MUT,
> but I could not find a working example.
>

I recently packaged libaparapi-java, which is not yet in Debian but
which you can get from its Salsa repository

https://salsa.debian.org/med-team/libaparapi-java

Running "uscan --verbose" will allow you to get three tarballs : a main
one and two components.

> 
> thanks, let me know if you have any suggestions.
> 
> Qianqian
> 
> 

Regards,
Pierre