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

johnraff · 2024-10-10 09:59:00

I've split this discussion off the general Carbon themes topic because it's pretty techy and complicated and not directly related to how Carbon will be themed.

@hhh has made a .deb package of bunsen-themes-yaru (custom BL colours) along with the source tarballs and put them on GitHub here:
https://github.com/hhhorb/bunsen-themes-yaru
Posted:
https://forums.bunsenlabs.org/viewtopic … 55#p137255

hhh wrote:

I've reorganized things.

https://forums.bunsenlabs.org/viewtopic … 83#p138583

johnraff wrote:

The deb file that you provided in bunsen-themes-yaru installed OK in my Carbon VM but I'd like to put it in the regular BL repos. To do that I need a debian source directory with the files and a debian/ subdirectory that handles the debianization.

Now read on...

hhh wrote:

johnraff wrote:
any idea why the *orig.tar.gz tarball also contains a Debian subfolder, and the *debian.tar.xz has some of the themes included?
Packaging confusion on my part. Really, all the tutorials out there kind of suck. None of them walks you through adding/changing data files like the images and symlinks in an icon set, yet they'll get bogged down with walking you through three ways of doing the same thing. I've been supremely frustrated trying to grok the process.

@hhh
Yeh the more I look at the Yaru GTK themes stuff the more I understand your frustration. It's really really complicated.

But anyway, the source tarballs you made work perfectly. If I unpack them with 'dpkg-source -x bunsen-themes-yaru_24.04.3-1.1.dsc' I get a source directory. Yes it's full of stuff I don't quite grasp the purpose of, but if I run my pbuilder script there it comes up with a .deb file that's identical with the one you you provide!

OK there's no git history, but I propose for now to put a source directory made with dpkg-source into BL GitHub for a new package bunsen-themes-yaru, and ship the .deb package built from that in our apt repos. I'd like to leave your code just the way it is, except perhaps for giving the package a new version number starting with 13 like other Carbon packages. What do you think?

Last edited by johnraff (2024-10-19 01:32:53)

johnraff · 2024-10-11 08:13:46

While unpacking @hhh's tarballs with 'dpkg-source -x bunsen-themes-yaru_24.04.3-1.1.dsc' gave me a source directory which I could use to build a deb package, I was having problems getting Lintian (Debian's package checker) to run after the build. Something about applied or unapplied patches. I found that dpkg-source applies patches when extracting, so tried running it with the option '--skip-patches'. That seemed to help in some ways, but the package failed to build with many errors.

Next attempt was to forget about dpkg-source, and just extract the two tarballs bunsen-themes-yaru_24.04.3.orig.tar.gz and bunsen-themes-yaru_24.04.3-1.1.debian.tar.xz manually side by side. They both had debian subdirectories, but I used meld (very handy utility) to copy into the "orig" directory anything in the "debian" directory that it didn't already have.

That built OK, the .deb looks fine, and Lintian ran OK, although it had a few things to say - no problem, it's probably all fixable.

So I think this is a way forward...

micko01 · 2024-10-11 10:50:05

^Ok so I downloaded the source package and debian tarball form @hhh's github and extracted. Kind of a weird source package but I absolutely get it despite being unconventional. For some reason bark is missing but the patch adds it back in. Genius really that it works!

On the subject, I downloaded the release tarball from Ubuntu's github/yaru repo. They deprecated bark! Without warning, just completely dropped it in June. So I got the tarball from June, hacked the meson_options file to weed out all the gnome crud and icons and built Yaru-[dark,bark,sage] and it works fine. Note that I just used meson to build and installed to ~/.local/share, didn't build a deb.

hhh · 2024-10-12 17:19:34

I'm just checking in sporadically for the next few days. Gonna spend the night at a buddy's house and then deal with some hurricane aftermath stuff.

micko01 · 2024-10-14 11:18:43

I'm just tuning a source package for bunsen-yaru that may be a bit more future proof. More on that elsewhere/later.

johnraff · 2024-10-18 09:51:30

A spiffy polished-up repo that builds an identical copy of @hhh's package is now in the BL project on GitHub:
https://github.com/BunsenLabs/bunsen-yaru-gtk

It won't need much more doing to it before it's ready for general release via apt.

hhh · 2024-10-18 12:53:24

johnraff wrote:

It won't need much more doing to it before it's ready for general release via apt.

Let me create a light version of the Openbox and xfce4-notifyd themes for sage and bark before release. I should be able to do it over the weekend.

johnraff · 2024-10-19 01:34:51

^Thanks @hhh I was hoping you might pick up on that.

Meanwhile that gives me time to check if there's any "paperwork" to tidy up...

johnraff · 2024-10-19 05:43:25

a bit of housework

@hhh and @micko01, I could make PRs on GitHub, but for small things like these a simple "OK" or "just a moment..." from you guys might be easier. None of these is desperately important though:

master branch
1) Rename the branch from "master" to "main"? Not so much for PC reasons as because it's got 2 fewer letters. No big deal either way.
2) debian/changelog: "Fork from Ubuntu/yaru": add the Ubuntu url and the git commit number it was forked from.
3) debian/changelog: paste in the earlier entries from the Ubuntu changelog below ours by @hhh? So people can see the history (it's already in the git log).
4) debian/control: Source: add urls:

Homepage: https://github.com/bunsenlabs/bunsen-yaru-gtk
Vcs-Browser: https://github.com/bunsenlabs/bunsen-yaru-gtk
Vcs-Git: https://github.com/BunsenLabs/bunsen-yaru-gtk.git

5) debian/control: Package: Description: Rewrite this for BL? Drop the burrito bit, mention the actual bark/sage/dark/light/openbox/xfce4-notifyd themes we ship? Up to the maintainer, @hhh.
6) debian/copyright: remove commas after copyright years ( https://www.debian.org/doc/packaging-ma … ight-field )
7) debian/copyright:
Add '2024 hhh <hsumen@bunsenlabs.org>' under Files: * for his theming work, esp openbox and xfce4-notifyd.
Add '2024 Michael Amadio <01micko@gmail.com>' under Files: debian/* for his contribution to the debianization,
and under Files: * for his edits on the meson configs etc.
8) Add debian/docs to make sure README.md and debian/README.Debian get installed.
9) Outside my pay scale, but do we need debian/salsa-ci.yml? It would probably do no harm to keep it...

carbon branch
Except possibly for debian/changelog, merge across all the above tweaks.

These are all rather trivial changes - if you guys have no objections I'll put them in. No big deal if any are changed or left out.

micko01 · 2024-10-19 06:38:58

^
1)the master/main thing was bought in by github to be politically correct. I've no strong opinion either way but typing less letters reduces the chance of typos by 50%

2) The last commit upstream was Sept 11 - https://github.com/ubuntu/yaru/commit/c … 9db6cbf378
I thinks good enough to put the first seven chars of the commit cd72758

3) link to raw debian/changelog https://raw.githubusercontent.com/ubunt … /changelog

4)

Homepage: https://github.com/bunsenlabs/bunsen-yaru-gtk
Vcs-Browser: https://github.com/bunsenlabs/bunsen-yaru-gtk
Vcs-Git: https://github.com/BunsenLabs/bunsen-yaru-gtk.git

Appropriate IMO

5) s/burrito/enchilada/
Joking, drop it.
IMO, mention the openbox/xfce-notify stuff, but not my call.

6-7)

Add '2024 hhh <hsumen@bunsenlabs.org>' under Files: * for his theming work, esp openbox and xfce4-notifyd.
Add '2024 Michael Amadio <01micko@gmail.com>' under Files: debian/* for his contribution to the debianization

LGTM**

8)Add debian/docs to make sure README.md and debian/README.Debian get installed. - you want me to add it meson? Might be easier to just add debian/install ? I can write a meson routine if you like.

9)do we need debian/salsa-ci.yml? I thnk not - usually do building with a `C` program but not likely here as it's all script based (meson, python, shell). I'll double check on that though. EDIT: Just deleted that an rebuilt - no issue.

---

**Still need the LGPL-2.1 for the scss stuff, not LGPL-3.0 as I deleted all that.

Last edited by micko01 (2024-10-19 06:42:53)

micko01 · 2024-10-19 06:43:51

No need for debian/salsa-ci.yml

micko01 · 2024-10-19 07:28:26

This needs adding back into debian/copyright

Files: common/colorize-dummy-svg.py
       common/sass-utils.scss
       common/test-sass-utils.scss
       gnome-shell/gresources-xml-parser.py ### delete this line
       icons/src/generate-index-theme.py       ### delete this line
Copyright: 2020, Canonical Ltd.
           2022, Canonical Ltd.
License: LGPL-2.1+

and

License: LGPL-2.1+
 This program is free software; you can redistribute it and/or modify it
 under the terms and conditions of the GNU Lesser General Public License;
 either version 2.1 of the License, or (at your option) any later
 version.
 .
 This program is distributed in the hope it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
 more details.
 .
 You should have received a copy of the GNU Lesser General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 .
 On Debian systems, the full text of the GNU Lesser General Public
 License version 2.1 can be found in the file
 `/usr/share/common-licenses/LGPL-2.1'.

CCBY-SA4 only covers icons/* and sounds/* which are deleted anyway. EDIT: marked the gnome and icons lines above to be deleted.

Last edited by micko01 (2024-10-19 07:30:22)

micko01 · 2024-10-19 08:28:06

@johnraff - I took the liberty to adjust debian/copyright, commas in correct position and seems simpler, includes my addition of LGPL-2.1+. Probably don't need the "Files-Excluded: .github" line.

Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: bunsen-yaru-gtk
Source: https://github.com/BunsenLabs/bunsen-yaru-gtk
Files-Excluded: .github

Files: *
Copyright: 2017-2018 Canonical Ltd.
           2009-2015 Red Hat, Inc.
           2009 Intel Corporation
           2015 Руслан Ижбулатов <lrn1986@gmail.com>
           2024 hhh <hsumen@bunsenlabs.org>
License: GPL-3.0+

Files: common/colorize-dummy-svg.py
       common/sass-utils.scss
       common/test-sass-utils.scss
Copyright: 2020, 2022 Canonical Ltd.
License: LGPL-2.1+

Files: debian/*
Copyright: 2024 Michael Amadio <01micko@gmail.com>
License: GPL-3.0+

License: GPL-3.0+
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 .
 This package is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 .
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>
 .
 On Debian systems, the complete text of the GNU General
 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

License: LGPL-2.1+
 This program is free software; you can redistribute it and/or modify it
 under the terms and conditions of the GNU Lesser General Public License;
 either version 2.1 of the License, or (at your option) any later
 version.
 .
 This program is distributed in the hope it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
 more details.
 .
 You should have received a copy of the GNU Lesser General Public License
 along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 .
 On Debian systems, the full text of the GNU Lesser General Public
 License version 2.1 can be found in the file
 "/usr/share/common-licenses/LGPL-2.1".

EDIT: builds fine with exactly the same lintian errors/warnings I've been getting.

Last edited by micko01 (2024-10-19 09:02:46)

Sector11 · 2024-10-19 17:45:38

Now I'm curious how much "Ubuntu" is there in BL?

johnraff · 2024-10-20 05:06:17

micko01 wrote:

2) The last commit upstream was Sept 11 - https://github.com/ubuntu/yaru/commit/c … 9db6cbf378
I thinks good enough to put the first seven chars of the commit cd72758

Agreed. I've got a local clone of bunsen-yaru-gtk and the same commit can be found in 'git log', the last one before yours start:

commit cd727585c91606ef4908f8cae967729db6cbf378
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date:   Wed Sep 11 05:22:48 2024 +0200

3) link to raw debian/changelog https://raw.githubusercontent.com/ubunt … /changelog

Thanks.

5) s/burrito/enchilada/
Joking, drop it.
IMO, mention the openbox/xfce-notify stuff, but not my call.

Maybe @hhh will write something appropriate for us when the floodwater has receded from his house carpet.

8)Add debian/docs to make sure README.md and debian/README.Debian get installed. - you want me to add it meson? Might be easier to just add debian/install ? I can write a meson routine if you like.

I think it would be appropriate to install documentation via the debianization rather than the "upstream" code. Anyway it's just a case of writing this in debian/docs:

README.md
debian/README.Debian

---
Copyright changes look good, thanks, except for a couple of pesky commas again!
1) No comma between Red Hat and Inc.
2) No comma after a single copyright year entry: '2020, Canonical Ltd.' should be '2020 Canonical Ltd.'

Last edited by johnraff (2024-10-20 05:07:08)

johnraff · 2024-10-20 05:09:18

Sector11 wrote:

Now I'm curious how much "Ubuntu" is there in BL?

How long have you got?

EDIT:
Of course there's lots of Debian in Ubuntu...

In this particular case we're forking code from the Ubuntu Yaru themes, but the same themes are available - packaged differently - in the Debian repos too. Code is code. I don't think there's any evil essence of Ubuntu creeping into BL via these GTK themes.

Last edited by johnraff (2024-10-20 07:49:29)

johnraff · 2024-10-20 07:55:06

micko01 wrote:

@johnraff - I took the liberty to adjust debian/copyright, commas in correct position and seems simpler, includes my addition of LGPL-2.1+. Probably don't need the "Files-Excluded: .github" line.

Where did you make these changes? The file on GitHub hasn't changed.

If you want to go in and edit the files on GitHub, feel free - otherwise I'll do it tomorrow (out of time today).

micko01 · 2024-10-20 08:33:47

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

Sector11 · 2024-10-21 01:05:58

johnraff wrote:

I don't think there's any evil essence of Ubuntu creeping into BL via these GTK themes.

It was just a curious question, there is Ubu in Debian as well.

johnraff · 2024-10-21 05:06:11

^I think the only code we take directly from an Ubuntu package is this Yaru GTK theme, because Yaru has been chosen as the default theme for some Ubuntu release(s), although it isn't made by Canonical Inc.

A couple of packages (eg dillo, material-solarized-suruplusplus-icon-theme) are packaged by us from third-party sources, but the vast majority of BL code is straight Debian, plus some in-house BunsenLabs packages.

#1 2024-10-10 09:59:00

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

#2 2024-10-11 08:13:46

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

#3 2024-10-11 10:50:05

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

#4 2024-10-12 17:19:34

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

#5 2024-10-14 11:18:43

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

#6 2024-10-18 09:51:30

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

#7 2024-10-18 12:53:24

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

#8 2024-10-19 01:34:51

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

#9 2024-10-19 05:43:25

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

#10 2024-10-19 06:38:58

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

#11 2024-10-19 06:43:51

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

#12 2024-10-19 07:28:26

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

#13 2024-10-19 08:28:06

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

#14 2024-10-19 17:45:38

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

#15 2024-10-20 05:06:17

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

#16 2024-10-20 05:09:18

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

#17 2024-10-20 07:55:06

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

#18 2024-10-20 08:33:47

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

#19 2024-10-21 01:05:58

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

#20 2024-10-21 05:06:11

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

Board footer