[Pkg-sssd-devel] sssd 2.9.5-5 MIGRATED to testing

[Timo Aaltonen]

Andreas Hasenack kirjoitti 31.12.2024 klo 21.36:
> Hm, what's the salsa workflow? I see salsa/upstream, which looks like
> needs updating, and then that gets merged into salsa/master and that's
> where the work then happens, is that it?

Pretty much, although for major new releases the branches usually aren't 
fast-forwardable, so I do

git co upstream
git reset --hard 2.10.1
git co -b m
git merge -s ours 2.9.5
git merge master
git branch -M master

that's how at least mesa is handled on the pkg-xorg side, and avoids 
merging unrelated histories that clutter up git log.

I had 2.10.0-beta2 prepared locally, so I've updated that and pushed 
what I have to let you work on it from there. I don't have an 
environment to test on..

Or we'll just shove it to sid as-is.


> For example, for debian's 2.9.5-1:
> 
> commit 467ae4d6b1de69f983384e589b1f34457fb7ea31 (tag: debian/2.9.5-1)
> Author: Timo Aaltonen <tjaalton at debian.org>
> Date:   Mon May 20 16:36:56 2024 +0300
> 
>      releasing package sssd version 2.9.5-1
> 
> commit 77c58af0094288510f9e05eb06d49fff6797ad09
> Author: Timo Aaltonen <tjaalton at debian.org>
> Date:   Mon May 20 14:42:20 2024 +0300
> 
>      bump version, drop patches
> 
> commit b8ca3926dd59880751523c06f204f284df951a73
> Merge: 1602052c0 595c4c6d2
> Author: Timo Aaltonen <tjaalton at debian.org>
> Date:   Mon May 20 14:40:35 2024 +0300
> 
>      Merge branch 'upstream'
> 
> commit 595c4c6d2bcee3f88818813585eccda80546e0ab (tag: 2.9.5, salsa/upstream)
> Author: Pavel Březina <pbrezina at redhat.com>
> Date:   Thu May 16 13:26:29 2024 +0200
> 
>      Release sssd-2.9.5
> 
> 
> 
> 
> 
> On Sun, Dec 29, 2024 at 3:07 PM Andreas Hasenack
> <andreas.hasenack at canonical.com> wrote:
>>
>> I can give it a try this week
>>
>> On Sun, 29 Dec 2024, 07:59 Simon Josefsson, <simon at josefsson.org> wrote:
>>>
>>> Yay!
>>>
>>> Does anyone of you want to work on preparing an sssd 2.10.1 update on
>>> salsa?  I'm happy to sponsor uploads if needed, but don't have cycles to
>>> look into 2.10.1 right now.
>>>
>>> /Simon
>>>
>>> Debian testing watch <noreply at release.debian.org> writes:
>>>
>>>> FYI: The status of the sssd source package
>>>> in Debian's testing distribution has changed.
>>>>
>>>>    Previous version: (not in testing)
>>>>    Current version:  2.9.5-5
> 
> _______________________________________________
> Pkg-sssd-devel mailing list
> Pkg-sssd-devel at alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-sssd-devel

-- 
t