| arraybolt3[m] | Simon Quigley (Developer): OK, I've hit a bit of a roadblock. I know that I'm merging in Experimental into Sid (correctly this time), however, I'm wondering - do I need to do a version number bump since things are going to be a bit different (mainly the changelog and any tweaks we need to apply)? Should this be libfm-qt 1.1.0-2? Or -1.1? Or...? | 03:44 |
|---|---|---|
| tsimonq2 | Yes version bump | 03:44 |
| tsimonq2 | Keep the old changelog entry | 03:44 |
| tsimonq2 | Your first changelog entry should be "Upload to Unstable." | 03:45 |
| tsimonq2 | And then thoroughly document your changes after that | 03:45 |
| tsimonq2 | Very throughly | 03:45 |
| arraybolt3[m] | OK, but wait - I thought the changelog from Experimental was part of the problem. | 03:45 |
| arraybolt3[m] | Andrew asked me to revert those changes and redo it correctly in Sid, right? | 03:45 |
| tsimonq2 | You need to grab only the changelog from Experimental and redo anything that involves merging from Ubuntu or isn't verbose enough | 03:46 |
| tsimonq2 | The Debian archive is very strict about keeping changelog entries and trying not to modify them | 03:46 |
| tsimonq2 | The Ubuntu archive, less so | 03:46 |
| arraybolt3[m] | So, is the "bad" part of the changelog going to stay? Or is it going to be replaced with better documentation? | 03:47 |
| tsimonq2 | I mean, if you wanted to get crafty, you could checkout sid and cherry-pick + amend each commit :P | 03:47 |
| tsimonq2 | arraybolt3[m]: It's going to stay | 03:47 |
| tsimonq2 | However, -2 will have that documentation | 03:48 |
| arraybolt3[m] | Oh, OK. So basically the changelog stays, then in Sid, I revert everything and redo it, this time with good documentation? | 03:48 |
| arraybolt3[m] | (Thus preserving everything?) | 03:48 |
| arraybolt3[m] | (Revert everything as in "git revert".) | 03:48 |
| arraybolt3[m] | (Actually, "git revert" might damage the changelog... but you get what I'm saying.) | 03:49 |
| tsimonq2 | Okay, I would suggest you do the following... | 03:51 |
| tsimonq2 | Checkout debian/sid and copy the changelog over from debian/experimental. Create a new changelog entry for Unstable but keep it as UNRELEASED. | 03:51 |
| tsimonq2 | Then, update the package for the new release again (using GBP) and individually cherry-pick commits over from experimental. When you do that, make the changelog entry and commit message verbose (see debcommit), and make sure changes are small and self-contained | 03:51 |
| tsimonq2 | Eventually you want an empty diff, minus the changelog of course, between the two | 03:52 |
| tsimonq2 | And to edit a newly cherry-picked commit, you're looking for either git rebase -i START_COMMIT (and then replace pick with edit on the commits), this is good for multiple, or with a single commit, git commit --amend | 03:53 |
| tsimonq2 | Does all of that make sense? | 03:53 |
| arraybolt3[m] | I got lost just before you sad "Does all of that make sense". LOL | 03:53 |
| arraybolt3[m] | The git-fu flew over me. | 03:53 |
| arraybolt3[m] | So, the problem I'm seeing with cherry-picking commits is that, each commit I made updated a whole file. The commits aren't exactly self-contained back there. Will the git-fu allow me to "split" the one commit into multiple logically separated commits? | 03:54 |
| arraybolt3[m] | Or is this a good reason to just pull stuff over manually? | 03:54 |
| tsimonq2 | man git-rebase && man git-commit | 03:54 |
| tsimonq2 | :P | 03:54 |
| tsimonq2 | arraybolt3[m]: Ooh, good one. Yes, kind of | 03:55 |
| tsimonq2 | You can git add only specific lines in a file | 03:55 |
| tsimonq2 | It's been a few years but you can git reset --soft HEAD^1 or similar, unstage the entire file, only add back the lines you want, and commit just that | 03:56 |
| arraybolt3[m] | Hmm. OK, I guess I'll try it just for the sake of learning Git, but what I was going to do was "git diff debian/sid debian/experimental > ~/diff.txt" and then merge in logical changes from that manually. | 03:57 |
| tsimonq2 | "Those are rookie numbers, you gotta bump that up" :P | 03:58 |
| arraybolt3[m] | I might should wait to do this until after I've had some sleep though - I'm exhausted, and so learning this much new stuff might lead to frustration (and possibly some "interesting" results!). I'll make notes of what to do so I can tackle it tomorrow. | 03:59 |
| tsimonq2 | Sounds good! Same plan here tbh | 03:59 |
| arraybolt3[m] | Idk, maybe I should try to do it tonight just so we can have something to laugh about in the morning? 🙃 | 04:00 |
| tsimonq2 | I gave up on $dayjob for the night... jQuery, HTML, and PHP split between at least 3 files to convert that output to a PDF... and I only want to make a change to the PDF output... frustrating | 04:00 |
| tsimonq2 | Up to you LMAO | 04:00 |
| tsimonq2 | Don't burn yourself out on it though | 04:00 |
| arraybolt3[m] | tsimonq2: Good grief. How did that even happen? | 04:04 |
| arraybolt3[m] | Anyway, thank you so much for helping me figure out what to do, and I look forward to tackling it again tomorrow! | 04:05 |
| tsimonq2 | <arraybolt3[m]> "Good grief. How did that even..." <- Sigh. I wish I could tell you... | 04:12 |
| tsimonq2 | Good morning | 16:31 |
| arraybolt3[m] | Simon Quigley (Developer): Good morning! | 17:41 |
| arraybolt3[m] | Simon Quigley (Developer): Are we dropping the symbols file in libfm-qt from Debian and maintaining it in Ubuntu? I just need to know if I should put "drop" or "reword" in the interactive rebase. | 18:10 |
| tsimonq2 | arraybolt3[m]: Nope | 18:13 |
| arraybolt3[m] | OK, reword it is. | 18:25 |
| arraybolt3[m] | Simon Quigley (Developer) Eickmeyer I just noticed a message on our Calamares SRU from Brian Murray - he asked about if there was going to be any changes that would "result in a system installed from 22.04 media being substantially different than a system installed from 22.04.1 media", such as configuration or package management changes. It dawned on me reading that, that this might be a good time to sneak in the LibreOffice | 18:34 |
| arraybolt3[m] | localization bug fix, so we can test it at the same time. | 18:34 |
| Eickmeyer[m] | arraybolt3: Nothing really "sneaks" into an SRU. | 18:34 |
| arraybolt3[m] | I know, but I mean, do it at the same time. | 18:35 |
| arraybolt3[m] | (Not like "try to do it with no one noticing".) | 18:35 |
| Eickmeyer[m] | It would show up in the .diff and they'd see it. | 18:35 |
| Eickmeyer[m] | The .diff is what gets looked at. | 18:35 |
| arraybolt3[m] | I guess I phrased it wrong. | 18:35 |
| arraybolt3[m] | I mean, if we're going to test Calamares 3.2.60 anyway, may as well test the LibreOffice localization bug fix at the same time, since the same test suite would be used on both AFAICT. | 18:35 |
| Eickmeyer[m] | Although, I agree, that needs to be fixed, but I believe that's a separate bug report, is it not? | 18:36 |
| arraybolt3[m] | Yes, but if we resolve it in two different SRUs, we're going to have to do The. Whole. Test. Suite. Twice. | 18:36 |
| arraybolt3[m] | Isn't there some way to avoid that? | 18:36 |
| arraybolt3[m] | Or am I missing something? | 18:36 |
| Eickmeyer[m] | Nah, we should definitely kill two birds with one stone. | 18:36 |
| arraybolt3[m] | But yeah, that's all I was saying. If there's any time to do this particular change, now would be a good time, so that we can only have to do ~18 installations once, rather than having to do ~36. | 18:37 |
| Eickmeyer[m] | I think I'd like to hear Simon Quigley (Developer) chime in. | 18:45 |
| tsimonq2 | https://lubuntu.me/jammy-backports-22-04-1/ | 21:04 |
| tsimonq2 | Publishes in 40 minutes | 21:04 |
| tsimonq2 | <Eickmeyer[m]> "I think I'd like to hear Simon..." <- +1 | 21:05 |
| * arraybolt3[m] scrambles to get a Jammy VM set up | 21:05 | |
| tsimonq2 | https://pastebin.ubuntu.com/p/wWZ9Kbd9nf/ | 21:06 |
| Eickmeyer[m] | And here I am just trying to get two Kubuntu VMs set-up with two different configurations for testing two different versions of Plasma.... sigh | 21:06 |
| Eickmeyer[m] | So Simon Quigley (Developer) I'm mostly concerned with our response to Brian. | 21:07 |
| arraybolt3[m] | Hey, with the ISO that has Backports enabled, if we're gonna spin our own ISO, why not also go ahead and include mixed-mode UEFI support by adding the 32-bit bootloader? | 21:07 |
| tsimonq2 | Dan Simmons: I have the Telegram, Twitter, and Reddit announcements scheduled all for that time, 4:45 PM (my time, for you it's 5:45) | 21:11 |
| kc2bez[m] | OK, sounds good. Thanks for doing that. | 21:12 |
| tsimonq2 | This command ran about 20 minutes ago:... (full message at https://libera.ems.host/_matrix/media/r0/download/libera.chat/f3466814ca8b3d60b1ac818848019baa745a7944) | 21:12 |
| tsimonq2 | It looks like everything is published. As Adam once said, if they publish the announcement as soon as the ISOs hit the server, you're kicking the server's butt. Let it get to all the CDNs and such... | 21:14 |
| Eickmeyer[m] | tsimonq2: It's really annoying when people watch the server and start telling people and announcing to the world prior to the official announcement. | 21:15 |
| tsimonq2 | Yeah. | 21:15 |
| tsimonq2 | So, I mean, you can probably install it now. We just haven't announced it yet. :P | 21:15 |
| lubot | [telegram] <Roberalz> @teward001 It seems that the lubuntuarab telegram channel is not linked to #lubuntu-arabic | 21:52 |
| lubot | [telegram] <tsimonq2> Forwarded from unknown: The Lubuntu Team is happy to announce that the Lubuntu Backports PPA is now available for general use. For more information and to learn how you can help us test, head over to our blog post: | 21:54 |
| lubot | [telegram] <tsimonq2> https://lubuntu.me/jammy-backports-22-04-1/ | 21:54 |
| kc2bez[m] | <lubot> "[telegram] <Roberalz> @teward001..." <- Lubot is in the IRC room from what I can tell. | 21:59 |
| lubot | [telegram] <Roberalz> The announcement was seen on all irc channels except the arabic one, yesterday someone spoke on the arabic irc and it was not seen on telegram (re @lubuntu_bot: (irc) <kc2bez[m]> <lubot> "[telegram] <Roberalz> @teward001..." <- Lubot is in the IRC room from what I can tell.) | 22:02 |
| arraybolt3[m] | Has anyone else noticed a bug where sometimes after you reboot a Lubuntu system for the first time, the wallpaper disappears? | 22:03 |
| arraybolt3[m] | And then when you put the wallpaper back, all the desktop icons disappear? | 22:03 |
| arraybolt3[m] | It only happens every once in a while, but when it happens, it's annoying. Just happened to me immediately after installing from the released LXQt PPA. | 22:04 |
| tsimonq2 | I have | 22:04 |
| tsimonq2 | Let's try to get that diagnosed | 22:04 |
| arraybolt3[m] | Also, the PPA includes the Lubuntu Manual shortcut, which is still a question mark. | 22:04 |
| * arraybolt3[m] is kicking myself for not having tested the pre-released PPA | 22:05 | |
| tsimonq2 | arraybolt3[m]: Correct. | 22:05 |
| kc2bez[m] | <arraybolt3[m]> "Has anyone else noticed a bug..." <- I think there was a bug report for that. | 23:15 |
| tsimonq2 | kc2bez[m]: Oh? | 23:16 |
| kc2bez[m] | Let me search a minute | 23:17 |
| kc2bez[m] | Not quite the same but similar. | 23:22 |
| kc2bez[m] | https://bugs.launchpad.net/bugs/1980137 | 23:22 |
| ubot93 | Launchpad bug 1980137 in pcmanfm-qt (Ubuntu) "Change in default wallpaper results in Lubuntu manual desktop shortcut deletion" [Undecided, Confirmed] | 23:22 |
| lubot | [telegram] <teward001> i'll poke the bot its possible something went weird | 23:51 |
| lubot | [telegram] <teward001> but *yawn* tomorrow | 23:51 |
| lubot | [telegram] <teward001> hard day at work was hard | 23:51 |
| kc2bez[m] | lubot: I concur with that one. | 23:52 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!