Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

johnraff · 2024-10-21 05:40:05

johnraff wrote:

micko01 wrote:
@johnraff - I took the liberty to adjust debian/copyright...
Where did you make these changes?

micko01 wrote:

^yesterday's post - didn't commit anything https://forums.bunsenlabs.org/viewtopic … 15#p139115

You mean... you "took the liberty" of editing some files on your own computer??
I guess we could overlook that on this occasion...

Seriously, you could have just committed that directly to the carbon branch - in the unlikely event of a problem, git commits can easily (well... depending on how far back in the history) be reverted.

Anyway, in this case we seem to be in agreement, except needing a brief package description from @hhh for debian/control, so I could just go in and commit everything except that.

But, I have a suggestion for future work flows, in cases where there are a lot of small changes to go in at once and a dev wants confirmation that it's OK. A fork and Pull Request is the official GitHub way ("Merge Request" on Debian Salsa) but in a case like this where only 3 devs are involved, all of whom already have write access to the repo, how about:

Dev A forks a new branch eg "main-tmp" and makes all the changes there.
Devs B and C check over the changes and if all are OK, on main branch 'git merge main-tmp' will fetch them all in.
If anyone raises an issue, tweaks can be done on main-tmp before merging.
Then 'git -d main-tmp' to remove it.

(Or operating on 'carbon' instead of 'main' if changes are carbon-specific.)

Maybe a little bit simpler than a PR?

Anyway I'll try it right now and we can see how it works out...

Last edited by johnraff (2024-10-21 08:22:13)

johnraff · 2024-10-21 06:28:56

johnraff wrote:

a couple of pesky commas again!
1) No comma between Red Hat and Inc.

I was wrong about this. Red Hat, Inc. is correct according to their web site.

micko01 · 2024-10-21 07:02:42

^ Ok, I just did PR on carbon branch, removed all commas except that one and for punctuation in licences

Also removed LGPL3 and CC-BYSA4 as we don't use them.

johnraff · 2024-10-21 08:21:24

^No need for a PR - sorry about your, work (I guess our efforts overlapped) but see my suggestion https://forums.bunsenlabs.org/viewtopic … 45#p139145
and two temporary branches:
https://github.com/BunsenLabs/bunsen-ya … e/main-tmp
https://github.com/BunsenLabs/bunsen-ya … carbon-tmp

main-tmp and carbon-tmp are identical except for the version number in changelog in fact.

I think they've got all the things we discussed above (but please check), plus:

I split README.md adding README.upstream.md with the Ubuntu info and some BL stuff in README.md.
@hhh's email needed fixing for lintian not to regard the build as an NMU.

Plenty of scope for improvement - please have a look and if you want to add/change anything, just edit those tmp branches directly.

As it is, the carbon-tmp branch built without any lintian messages at all.

We have to wait for @hhh's light version of the Openbox and xfce4-notifyd themes for sage and bark, and a couple of well-chosen words for debian/control's Description field, but once that's done, might be ready to release?

Last edited by johnraff (2024-10-21 08:24:43)

johnraff · 2024-10-21 08:37:36

But we still need to remove those two unnecessary licence files you noticed.

If I merge your PR as-is into carbon, it might complicate the merging back of carbon-tmp, which edits a couple of other files slightly. Could you just delete those two licence files directly from {main,carbon}-tmp?
Then take a look at the other diffs (in the commit) and if OK we can merge those branches back into their parents (+ any additions you have).

Last edited by johnraff (2024-10-21 08:40:14)

micko01 · 2024-10-21 09:08:20

I closed my PR, you have the debian/copyright almost identical anyway.

All the other diffs in carbon-tmp LGTM, and since it's only the version different in main-tmp then there's no problem.

I'd merge them back to parents as is, and just delete those redundant licenses in the carbon and main branches. Or do it before, doesn't matter really.

I suppose I'm just used to the labwc workflow where even @malm creates his own fork on his personal account and offers up a PR. He then waits for 'LGTM' before he even self merges, unless it's really trivial like a typo or something. Oh, and he always uses 'squash and merge' (you can see it in the 'merge' button as a drop down for doing PRs) just to reduce clutter in the the git history.

Great job!

edited for typos

Last edited by micko01 (2024-10-21 09:16:09)

johnraff · 2024-10-21 09:30:42

Yes deleting those two files could happen before or after merge-back no problem.

Looking at it now, my experimental workflow was perhaps only slightly simpler than doing a PR.
In terms of what I'm used to, I tend to do everything on my local machine and push up to GitHub when it's done. Just prefer to work on a terminal rather than a web interface. Hard to say exactly which is less work...

Good idea about doing a squash when merging the tmp branches back.

GitHub does offer a couple of non-standard functions like pull requests, issues... but I prefer to stay with standard git as much as possible. Safer not to rely on the proprietary stuff too much.

Anyway, I still have a few minutes free so I'll do those squash merges now, and delete the tmp branches to clean things up.

johnraff · 2024-10-21 09:34:10

micko01 wrote:

Also removed LGPL3 and CC-BYSA4 as we don't use them.

In fact, I don't think we need any of the licence files because the info is in debian/copyright, but OTOH maybe best to minimize our modifying of the upstream code. None of that will go in the .deb file anyway.

johnraff · 2024-10-21 09:57:53

Anyway, maybe done.
https://github.com/BunsenLabs/bunsen-ya … ree/carbon
https://github.com/BunsenLabs/bunsen-yaru-gtk/tree/main

Just those light ob & notify themes and the Description left.

#21 2024-10-21 05:40:05

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#22 2024-10-21 06:28:56

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#23 2024-10-21 07:02:42

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#24 2024-10-21 08:21:24

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#25 2024-10-21 08:37:36

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#26 2024-10-21 09:08:20

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#27 2024-10-21 09:30:42

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#28 2024-10-21 09:34:10

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

#29 2024-10-21 09:57:53

Re: Packaging bunsen-themes-yaru (now bunsen-yaru-gtk)

Board footer