Hi Jörg,

Le 2025-01-20 08:03, Jörg Frings-Fürst a écrit :

Is it enough to change from 1.0.14-19 to 1.0.14-20+git[commit id]?

But that means I have to change the tar archive, which I don't like.

You have basically two options:

1. backport the changes you need into your current 1.0.14 by adding
patches. Then you can just keep incrementing the debian revision, no
need to mention a git commit id there, that should be in a patch header.

2. if the changes are extensive and you would rather repackage the whole
source tree from git, then 1.0.14+git[date . commit id]-1 is
appropriate.

Cheers,

--
Julien Plissonneau Duquène

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Hi J÷rg,

On Mon, Jan 20, 2025 at 09:38:24AM +0100, Julien Plissonneau DuquΦne wrote:

Le 2025-01-20 08:03, J÷rg Frings-Fⁿrst a Θcritá:

Is it enough to change from 1.0.14-19 to 1.0.14-20+git[commit id]?

[...]

2. if the changes are extensive and you would rather repackage the whole source tree from git, then 1.0.14+git[date . commit id]-1 is appropriate.

Since upstream is friendly and supportive of downstream (https://gitlab.com/sane-project/frontends/-/issues/33), would it be
worth considering asking the maintainers if it would be more appropriate
to number your git shapshot with 'pre-release versioning' backwards from
the next version? (I thought I saw a suggestion from him that it might
be time for a release soon but that might be backends and I can't find
it now! It might be that your enquiry prompts him to release anyway
to roll up fixes that have accumulated.)

If a new release is imminent then this style would be more
representative to users of what they were getting and then when you
update to their eventual release it would be a tidying up exercise with
a small delta (hopefully in time for trixie)! :-)

e.g. 1.0.15~git20241023.5c148771-1

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

On 2025-01-20 09:38 +0000, Andrew Bower wrote:

Hi J÷rg,

On Mon, Jan 20, 2025 at 09:38:24AM +0100, Julien Plissonneau DuquΦne wrote:

Le 2025-01-20 08:03, J÷rg Frings-Fⁿrst a Θcritá:

Is it enough to change from 1.0.14-19 to 1.0.14-20+git[commit id]?

[...]

2. if the changes are extensive and you would rather repackage the whole source tree from git, then 1.0.14+git[date . commit id]-1 is appropriate.

e.g. 1.0.15~git20241023.5c148771-1

Just to clarify the good advice above, the important thing to
understand is that ~ always sorts/orders _lower_ than everything and
other things sort as expected.

so if current version is 1.0.14 you can either put out
1.0.14+gitnnn (and move to 1.0.15 when it is released)
or
1.0.15~gitnnn (and move to 1.0.15 when it is released)

but if you put out 1.0.15+gitnnn you would never be able to release 1.0.15 proper without an epoch.

Obviously if you have debian -nn versions on the end this is much less
of an issue because if you ruled out -20 by having a -20+git you can
just put out -21. This was your original proposal, but I just thought
it worth clarifying how this works, because if you don't understand it
in advance you can find you messed yourself up on versions when you
didn't need to (and yes this happened to me many years ago and I have
been very careful since :-).

Wookey
--
Principal hats: Debian, Wookware
http://wookware.org/

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEER4nvI8Pe/wVWh5yq+4YyUahvnkcFAmeOW48ACgkQ+4YyUahv nkebIA//XnKZ0EyIFEdMJmT37CdSD02Ayuz3Bnt1bywCGCEFhDmcQSP1ITIXsdml HIpHNoC0U4f+s28z5XewsX9RYh6b7l3pcmNlCKQevJwZat20xMOqI+ha0zzeVzRG a0bFbpmER51zSuRCX3cyT7muOb1d44/TKoN2x2yPYnIIqECoKnVqQ2WvkLBN8LaG jXpszUscOlrtDqNVokDXmPsPLKDWToI4pBrvyLoj4MqC/rNjC4fGN6/8cEDKmi/+ 5YakRIIJ/N470kUQEJMEme9HeBPR/mmfSuPjilFJQAC5sI82gRmkA3WnVPpCLh5n JRceCbpuf1MSghwrftzP3fCy9IcN40nYzcVE8E7Md8huzgGR9BUO4vSBsa6vXALR EdUur5IPjTzfKi88E8s899N0APQ37eLoSWSW38CX+6GYwZyMY0ISKDsUisuKh1XM dYpTlOam3rJzCnWf2dfji+1UA0rlNNMv8GeQbOhBVGKcNV8OgpXm6NB2mYWDuiBK Pb3WfGdidl+U9ooovAPaYGoygQ4RIKhTIIY9/DB7fYcH60R8NyYjBr1atqVgm0KD ghBZ1Wg2sDFddt0oElv+9/UNSFJrVab7exHFbyFEs2PAmOa5xpZh/HMZ9SJeT3f1 roga1vkwYxdd9sDp8LzssysDep1yZIOOSYUbDE8djFr+xwm6yK4=
=XUip
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)