Skip to content

Merge grml-desktop into GRML_FULL#415

Merged
zeha merged 135 commits intomasterfrom
zeha/merge-grml-desktop
Aug 19, 2025
Merged

Merge grml-desktop into GRML_FULL#415
zeha merged 135 commits intomasterfrom
zeha/merge-grml-desktop

Conversation

@zeha
Copy link
Member

@zeha zeha commented Aug 17, 2025

Created using:

In grml-desktop:

$ git rm -r debian
$ mkdir -p config/files/GRML_FULL
$ git mv etc config/files/GRML_FULL

In grml-live:

$ git remote add grml-desktop ../grml-desktop
$ git fetch grml-desktop
$ git merge --allow-unrelated-histories grml-desktop

Issue: grml/grml#225

mika added 30 commits April 13, 2007 23:15
mika and others added 7 commits November 21, 2024 13:29
It's no longer file-in-etc-not-marked-as-conffile but
package-contains-file-in-etc-skel, update lintian overrides accordingly
Fixes lintian issues:

| W: grml-desktop: national-encoding [etc/skel/.Xmodmap.german]
| W: grml-desktop: national-encoding [etc/skel/.Xmodmap]
@zeha zeha requested a review from mika August 17, 2025 11:16
@zeha zeha self-assigned this Aug 17, 2025
@grml grml deleted a comment from github-actions bot Aug 17, 2025
Was merged into grml-live.
@zeha zeha force-pushed the zeha/merge-grml-desktop branch 2 times, most recently from ed8b28d to afab7fe Compare August 17, 2025 12:40
@grml grml deleted a comment from github-actions bot Aug 17, 2025
@zeha zeha force-pushed the zeha/merge-grml-desktop branch from afab7fe to 464d9e0 Compare August 17, 2025 12:51
@zeha
Copy link
Member Author

zeha commented Aug 17, 2025

@mika FYI only the last few commits need a review, the rest is wholesale from grml-desktop.

About distri in xinitrc: not sure who is supposed to set that var?

@github-actions
Copy link

github-actions bot commented Aug 17, 2025

Copy link
Member

@mika mika left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bringing this in attention to @crpb in terms of grml/grml-desktop#10 also

@zeha zeha force-pushed the zeha/merge-grml-desktop branch from 464d9e0 to 1493416 Compare August 18, 2025 14:34
@zeha zeha force-pushed the zeha/merge-grml-desktop branch from 1493416 to 5324bf4 Compare August 18, 2025 16:29
@github-actions
Copy link

🐳 Docker image for this PR is available:

docker pull ghcr.io/grml/grml-live:pr-415

@zeha zeha requested a review from mika August 18, 2025 22:44
@zeha zeha added this pull request to the merge queue Aug 19, 2025
Merged via the queue into master with commit 83683d3 Aug 19, 2025
37 checks passed
@mika mika deleted the zeha/merge-grml-desktop branch August 19, 2025 10:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants