Merge ~gunnarhj/ubuntu/+source/glibc:ubuntu/devel into ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/devel

Proposed by Gunnar Hjalmarsson
Status: Merged
Merge reported by: Michael Hudson-Doyle
Merged at revision: a34dcfcfb1d439498653fd79b7c0e891ad3ff69c
Proposed branch: ~gunnarhj/ubuntu/+source/glibc:ubuntu/devel
Merge into: ~ubuntu-core-dev/ubuntu/+source/glibc:ubuntu/devel
Diff against target: 13 lines (+1/-1)
1 file modified
debian/local/usr_sbin/update-locale (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+397621@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

A merge request was previously submitted to Debian:

https://salsa.debian.org/glibc-team/glibc/-/merge_requests/1

Revision history for this message
Dan Bungert (dbungert) :
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Right, '\w+' is better than '.+'. Just changed the MR, but didn't rebase or anything, since the target branch is apparently not the right one any longer, and I don't know which repo/branch is used for development nowadays.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Thanks, this change makes sense (I do also think this is a pam bug that it causes such carnage though). I currently don't have a clearly defined approach to using git for glibc, it probably makes sense to start using this repo again.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

OK I've staged this change for the next updates to devel, impish, focal and even bionic (although I don't know of any plans to SRU glibc to bionic currently).

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches