[01:01] I don't know if it was ever set up [01:02] Simon closed the issue to do so [01:37] -lugito:#lubuntu-devel- [T122: New Manual URL Design] wxl (Walter Lapchynski) commented on the task: https://phab.lubuntu.me/T122#2882 [01:40] -lugito:#lubuntu-devel- [T122: New Manual URL Design] teward (Thomas Ward) commented on the task: https://phab.lubuntu.me/T122#2883 [01:41] ... i need to learn how to silence that notice >.> [01:41] wxl wxl23 give me the valid links [01:41] i'll set up the redirects accordingly [01:41] don't give me the info, can't act on it :P [01:41] Uh I'm not sure what you're asking [01:45] wxl23: all i see on the ticket and in here is "this link 404s" [01:45] i need to know what you want it to POINT to to become a valid link :P [01:45] if it's just supposed to work as is [01:45] as in the files exist already [01:45] then i did nothing to break it :P [01:46] -lugito:#lubuntu-devel- [rMANUALdfc3a95ceaa9: Fix Wording] lynorian (Lyn Perrine) committed: https://phab.lubuntu.me/rMANUALdfc3a95ceaa9 [01:53] @wxl [ @lynorian @tsimonq2 it seems manual.l.m/lts is a 404. did we miss somethin …], We don't have an LTS manual published yet [01:53] LXDE is retro at this point and it's stupid to publish LTS before it's published to stable [02:14] agreed 20.04 stuff is in master https://manual.lubuntu.me/master/ [02:22] @HmollerCl https://phab.lubuntu.me/P55 Before I upload here is the lintian run on update notifier. [02:23] Standards-version should probably get a bump and it looks like the description needs a bit of a tweak. [03:31] -lugito:#lubuntu-devel- [rMANUAL31035d159e1e: Fix wording] lynorian (Lyn Perrine) committed: https://phab.lubuntu.me/rMANUAL31035d159e1e [03:33] -lugito:#lubuntu-devel- [rMANUAL2cd12fe15e3a: Add other way to quit screengrab] lynorian (Lyn Perrine) committed: https://phab.lubuntu.me/rMANUAL2cd12fe15e3a [03:43] -lugito:#lubuntu-devel- [rMANUAL4bfa2f2b8cd2: Add icon for ScreenGrab] lynorian (Lyn Perrine) committed: https://phab.lubuntu.me/rMANUAL4bfa2f2b8cd2 [03:52] -lugito:#lubuntu-devel- [rMANUAL372eda44270d: Add text to correct paragraph] lynorian (Lyn Perrine) committed: https://phab.lubuntu.me/rMANUAL372eda44270d [04:13] -lugito:#lubuntu-devel- [rMANUALd6147f7d4053: Update qpdfview version for 20.04] lynorian (Lyn Perrine) committed: https://phab.lubuntu.me/rMANUALd6147f7d4053 [05:42] testing my backup strategy; I just nuked a 8tb array with a `dd` (I didn't read the hostname); can I use bazaar to redownload my push/commits? (testcases still in review stage)? low-priority since O [05:42] I'll have to rebuild box first [06:36] One thing I noticed yesterday and confirmed today is: … If there is a swap partition already present on disk, the live usb uses it. But installer doesn't provide an option of erasing the whole disk unless you manually disable the swap partition. Only gives options of manual partitioning or replacing one. … Ideally it should al [06:36] ways give an option of erasing the disk and installing lubuntu. If swaps are present then they should be automatically turned off if that option is selected and then disk should be wiped. [06:36] ^ @guiverc can you confirm this? [06:39] Who else uses cala apart from us? I can check with their live usb too. If they have this issue or not. [06:47] @The_LoudSpeaker [One thing I noticed yesterday and confirmed today is: … If there is a swap partit …], This could be important for people coming from lubuntu 18.04 and doing a fresh install of 20.04 [06:52] The_LoudSpeaker, that's a known issue (and I've hit my head on it many many times), but most my installs are over prior qa-installs; so no swap (swap file) [07:07] Ack. Thanks! [07:35] The_LoudSpeaker, also I'll be slow on testing; I wrongly nuked my primary server drive array, i ran `dd` without realizing I wasn't on localhost (`ssh`); verified my /dev in a different term to avoid scrolling :( -- i'm distracted currently trying to fix my mess [07:43] @guiverc [ The_LoudSpeaker, also I'll be slow on testing; I wrongly nuked my prim …], Ouch! 😮 [07:45] * guiverc should have learned though; idiot me wiped a hdd only a couple of months ago; so I got my warning on somethign that didn't matter [08:25] @guiverc [ The_LoudSpeaker, also I'll be slow on testing; I wrongly nuked my prim …], Ow. [08:25] No worries. I got my test machine l back. Already testing focal on it. [09:57] @The_LoudSpeaker [One thing I noticed yesterday and confirmed today is: … If there is a swap partit …], https://github.com/calamares/calamares/issues/860 [10:01] https://github.com/calamares/calamares/issues/1258#issuecomment-570931429 … Wow! wxl: how did you I was telling that exact thing? [10:01] Are you spying on me? 🧐 [10:04] @kc2bez [https://github.com/calamares/calamares/issues/860], Nothing after 2018 on this. :/ [10:05] Nope, it works fine if you turn off all swap before you start the installation, you just have to remember to do that. [10:17] @kc2bez [Nope, it works fine if you turn off all swap before you start the installation, …], Ideally it should provide that option and unmount swaps automatically. [10:17] If that option is selected. [10:19] I agree. [10:23] There is a note in the manual page for it too https://manual.lubuntu.me/stable/1/1.3/installation.html [11:08] -lugito:#lubuntu-devel- [T139: Ensure applications in Snap packages show up in the lxqt-panel menu] gsilvapt (Gustavo Silva) commented on the task: https://phab.lubuntu.me/T139#2884 [11:09] @wxl are you sure the metadata change is enough to fix this issue? I didn't have time to test but if that's the case then I would like to close the bug report I opened on LP [14:09] -lugito:#lubuntu-devel- [T139: Ensure applications in Snap packages show up in the lxqt-panel menu] gsilvapt (Gustavo Silva) commented on the task: https://phab.lubuntu.me/T139#2886 [14:56] -lugito:#lubuntu-devel- [T139: Ensure applications in Snap packages show up in the lxqt-panel menu] The_LoudSpeaker (Raman Sarda) commented on the task: https://phab.lubuntu.me/T139#2887 [14:57] @lugito [ 3[ 13T139: Ensure applications in Snap packages show up in the lxqt-p …], @gsilvapt [14:58] Thanks, @The_LoudSpeaker. I'll try this when I have some time [16:26] @guiverc [ testing my backup strategy; I just nuked a 8tb array with a `dd` (I di …], Yep grab it from your account [16:31] @gsilvapt [@wxl are you sure the metadata change is enough to fix this issue? I didn't have …], Yes tested so that PR is what we need. Let me know if you need help testing [16:32] @The_LoudSpeaker [Ideally it should provide that option and unmount swaps automatically.], Maybe we should make a custom job that warns the user [19:29] @wxl: you around? [19:29] yep [19:30] soooo. I downloaded the conflicted package of lxqt-globalkeys which was stuch in MoM [19:31] fixed the errors. [19:31] built using debuild -S [19:31] and then dput ubuntu ../lxqt-globalkeys_0.13.1-1ubuntu1_source.changes [19:31] did I do it correctly? [19:32] or messed up? [19:32] how do I check? [19:33] I don't see anything new here: https://launchpad.net/ubuntu/+source/lxqt-globalkeys/ [19:34] anyone? [19:35] I would think you would get an email. [19:35] It should have rejected it. [19:35] current version is 0.14.1+git20190923-0ubuntu1 [19:36] You tried to upload 0.13.1 something which is lower in versioning. [19:36] oh yess [19:37] You should really push to phab first. [19:37] can't find lxqt-globalkeys_0.14.3.orig.tar.xz in upload [19:37] @kc2bez [ You should really push to phab first.], even for fixing packages that are stuck in MoM? [19:44] I would think yes, it needs to end up in there somehow. [19:50] any idea how? [19:51] @wxl: [20:00] well it needs to go to git [20:01] you can do that through arc but if you're sure of yourself, just git commit it [20:02] the source downloaded from MoM doesn't have .git in it [20:02] well then don't get the source from MoM XD [20:02] well. I have to fix what MoM can't soo.. [20:02] -\o/- [20:03] in other words, you do the whole merge yourself [20:03] more briefly please? [20:04] I am running `debuild -us -uc -tc` but it still says original source not included. [20:04] then you don't have the original source, obviously :) [20:06] I do have the 0.14.3.orig.tar in ../ [20:06] of course we could get around this whole git step if somehow we had something monitoring archive uploads and adding them to git. is that something we could do, @tsimonq2? [20:07] I think that day I did have correctly compiled source (with original one) but I don't remember how I did it. [20:16] do you have it untarred? [20:17] you need to do that before debuilding [20:19] same error [20:20] also, why would I untar it? I am not even working on the original source na? I am in 0.14.3-1ubuntu1 [20:20] not in 0.14.3 [20:20] i mean it is de*BUILD* [20:21] i don't think building the source package requires it, per se, but it might [20:21] I am running debuild inside this: https://merges.ubuntu.com/l/lxqt-globalkeys/lxqt-globalkeys_0.14.3-1ubuntu1.src.tar.gz [20:21] after fixing the conflicts [20:22] i've never bothered with mom personally so i'm not sure what to tell you [20:23] @tsimonq2 [20:23] you know something? [20:29] i think you have the wrong source [20:29] i think that's the problem [20:29] there's no .tar https://merges.ubuntu.com/l/lxqt-globalkeys/ [20:30] https://merges.ubuntu.com/l/lxqt-globalkeys/lxqt-globalkeys_0.14.3.orig.tar.xz [20:39] okay wxl: what would be the best way to get new upstream release of globalkeys? [20:39] I am done trying with MoM [20:40] The latest tar is on MoM report folder [20:41] yeah. I downloaded that. fixed the errors. now how do I upload it correctly? [20:41] @RikMills [20:42] build the source [20:43] ```This package has a Debian revision number but there does not seem to be … ````an appropriate original tar file or .orig directory in the parent directory; … (expected one of lxqt-globalkeys_0.14.3.orig.tar.gz, lxqt-globalkeys_0.14.3.orig.tar.bz2, … lxqt-globalkeys_0.14.3.orig.tar.lzma, lxqt-globalkeys_0.14.3.orig.tar.xz or [20:43] lxqt-globalkeys-0.14.3-1ubuntu1.orig) … continue anyway? (y/n)` [20:43] pressing y fails [20:44] In the lxqt-globalkeys-0.14.3-1ubuntu1 folder … ../merge-buildpackage -d [20:44] umm what? [20:45] you did grab-merge, yes? [20:45] nope [20:47] I just downloaded lxqt-globalkeys_0.14.3-1ubuntu1.src.tar.gz from mom, fixed errors, then downloaded https://merges.ubuntu.com/l/lxqt-globalkeys/lxqt-globalkeys_0.14.3.orig.tar.xz into ../ and ran debuild -S [20:47] @The_LoudSpeaker [I just downloaded lxqt-globalkeys_0.14.3-1ubuntu1.src.tar.gz from mom, fixed er …], this build without using original source. I get that mail of rejected. [20:48] -lugito:#lubuntu-devel- [rMANUALdedec11558e9: IMprove wording] lynorian (Lyn Perrine) committed: https://phab.lubuntu.me/rMANUALdedec11558e9 [20:48] https://wiki.ubuntu.com/UbuntuDevelopment/Merging [20:48] if you fetch the merge with grab-merge you get scripts to build the source when you are done! [20:48] ah yes this is documented [20:48] Generate a new merged source package using the merge-buildpackage script. [20:48] where have you been all this time @RikMills !! me and wxl here need lessons from you. [20:49] You will end up with something like this: https://launchpad.net/~rikmills/+archive/ubuntu/focal/+sourcepub/10912317/+listing-archive-extra [20:49] (I couldn't be bothered to fill in the changelog....) [20:49] @RikMills given how kubuntu normally does things, when do you find yourself using mom at all??? [20:50] @wxl [ @RikMills given how kubuntu normally does things, when do you find yoursel …], I don't for the Kubuntu stuff much, but use it sometimes for other MOTU type things [20:51] @wxl [ of course we could get around this whole git step if somehow we had someth …], It's a huge project [20:53] @tsimonq2 even an alert system would be nice, but stilll here's raman fixing a merge with mom and he'll be stuck trying to figure out how to get the changes in git [21:02] @The_LoudSpeaker barring some improvement, i guess once you get it all figured out you should make a document on how to deal with this kind of like we have https://phab.lubuntu.me/w/packaging/packaging_for_new_upstream_releases/ [21:02] "automatic merges for lubuntu" [21:09] sure. [21:15] https://phab.lubuntu.me/P56 [21:16] https://phab.lubuntu.me/P57 [21:16] ^^ @RikMills [21:16] make them pubhlic [21:17] should I do a `dpkg-source --commit` [21:17] @wxl [ make them pubhlic], one sec. [21:17] @The_LoudSpeaker [should I do a dpkg-source --commit], No [21:17] @RikMills [No], then? [21:18] @wxl [ make them pubhlic], done [21:18] @The_LoudSpeaker [then?], Is that file in your debian packaging or the upstream source tar? [21:18] upstream probably [21:18] how do I check? [21:19] Look in the upstream tarball [21:21] However, it won't be in there. If it was, you wouldn't be getting the error [21:21] It is not in 0.14.3.orig.tar [21:22] remove it then try again then. the error is saying it should not be there [21:23] successful\ [21:24] And fix the changelog! [21:25] https://github.com/lxqt/lxqt-globalkeys/blob/master/.translation-update [21:25] it's there [21:25] in other news, we have a new packageg coming it seems https://github.com/lxqt/lxqt-organizer [21:26] @wxl [ it's there], ow. I deleted [21:26] @The_LoudSpeaker [should I do a dpkg-source --commit], I should have done this [21:27] now I have to do again everything? [21:27] or can I add the file later from phab? I have the patch with info [21:28] @The_LoudSpeaker [I should have done this], No [21:29] oh yesh [21:29] correct no [21:29] that file should have been there since 0.14.0 [21:30] coz it is there in on github master but not in the 0.14.3 source that we have. one sec I need to confirm something [21:30] @wxl [ that file should have been there since 0.14.0], wait one min [21:30] https://github.com/lxqt/lxqt-globalkeys/tree/0.14.0 [21:30] and it's not here https://github.com/lxqt/lxqt-globalkeys/tree/0.13.0 [21:31] I don't see it in https://github.com/lxqt/lxqt-globalkeys/releases/download/0.14.3/lxqt-globalkeys-0.14.3.tar.xz [21:31] THAT is weird [21:32] @RikMills [And fix the changelog!], what exactly in changelog? release name? done. [21:32] @wxl [ THAT is weird], I feel like yelling "Abbey Saale" to upstream but I am too tired at the moment [21:32] it's certainly not there [21:32] @wxl [ THAT is weird], Not really. Not all repo .something files go in release tars [21:33] @The_LoudSpeaker [what exactly in changelog? release name? done.], @RikMills [21:33] @The_LoudSpeaker [@RikMills], What is your current changelog? [21:33] one sec [21:34] https://paste.ubuntu.com/p/ZxhjQjKnMs/ [21:36] ```lxqt-globalkeys (0.14.3-1ubuntu1) focal; urgency=low … * Merge from Debian unstable. Remaining changes: … - Change 1 … - Change 2 … - Change 3 … -- Raman Sarda Thu, 17 Oct 2019 03:44:41 +0000``` [21:36] should be like that ^^^ [21:37] where the changes are those between the debian version and the merged version that you are keeping [21:37] okay. [21:37] Will do. [21:38] while you are comparing the differences, you probably want to see if any of the remaining changes can be safely dropped [21:39] `[ Ubuntu Merge-o-Matic ] … * Merge from Debian unstable. Remaining changes: … - Modified lxqt-globalkeys.install to include ubuntu specific changes. … - new dependencies in control file. … - Translations from debian.` [21:40] ^ this okay? [21:40] @RikMills [while you are comparing the differences, you probably want to see if any of the …], I do have an extra patch file by wxl which is not required now. I will drop that. Tho I think I would like to do that from phab side. [21:41] @The_LoudSpeaker [I do have an extra patch file by wxl which is not required now. I will drop that …], it is not urgent as the patch is not in series file so can wait. [21:41] @The_LoudSpeaker [^ this okay?], You might want to explain in a bit more detail. The point is that someone else coming along later and having to merge again, has a good idea of what you kept and why. [21:42] we have a patch not in series???? wth. in any case you should fix that presently. [21:42] @The_LoudSpeaker [[ Ubuntu Merge-o-Matic ] … * Merge from Debian unstable. Remaining changes: … - …], oh yeah I need to remove mom's name. [21:42] yup [21:42] @wxl [ we have a patch not in series???? wth. in any case you should fix that pre …], your complete-config-file.patch [21:42] @RikMills [You might want to explain in a bit more detail. The point is that someone else c …], okay. [21:43] https://phab.lubuntu.me/source/lxqt-globalkeys/browse/ubuntu%252Ffocal/debian/patches/series [21:43] wtf! I willremove it [21:56] I made the changes, changed the author in debian changelog. ran debuild -S it still doesn't include original source. `dpkg-buildpackage: info: binary and diff upload (original source NOT included)` [21:56] @RikMills [21:57] oh wait. [21:58] what all do I suppl y with merge-buildpackage script? only key right? [22:00] perhaps. I don't supply anything as my gpg agent is running [22:03] yay! upload successful [22:03] and now you need to figure out how to get that patch into git and tag it XD [22:04] one sec. I will do that. [22:07] will cloning it from launchpad and then `git tag ubuntu/VERSION` work? [22:08] I don't think so no. [22:08] so how do I do it? [22:09] I do see a branch named ubuntu/focal there [22:10] I am not sure but you will need to change the origin. If you clone from launchpad your changes (by default) go to launchpad. [22:11] so only git push origin ubuntu/focal then? [22:11] no [22:11] then what? [22:11] you don't need to apply a tag to launchpad. [22:12] you need to push it to phab. [22:12] @kc2bez [you don't need to apply a tag to launchpad.], yeah I already see the tag there [22:12] @kc2bez [you need to push it to phab.], how is that done? [22:12] @wxl [ in other news, we have a new packageg coming it seems https://github.com/l …], njoice. [22:12] *noice [22:13] @wxl [ in other news, we have a new packageg coming it seems https://github.com/l …], that seems to be progressing nicely. [22:14] clone from phab; push to phab [22:14] @wxl [ clone from phab; push to phab], thoda details please? [22:14] you're overthinking it bub [22:14] well you said to tag it [22:15] last step [22:15] git clone https://phab.lubuntu.me/source/lxqt-globalkeys.git [22:15] [22:15] git push [22:15] what changes exactly? [22:15] the changes you uploaded [22:17] mean these? https://launchpadlibrarian.net/459429230/lxqt-globalkeys_0.14.1+git20190923-0ubuntu1_0.14.3-1ubuntu1.diff.gz [22:17] so i imagine somehow you'll have to turn your debdiff or whatever into a patch [22:17] yeah that was what I was thinking just now [22:17] @The_LoudSpeaker [mean these? https://launchpadlibrarian.net/459429230/lxqt-globalkeys_0.14.1+git2 …], I need to convert this. [22:18] right that's it [22:20] `git apply patch.diff` should do the trick, assuming you don't need to do any other mods [22:20] but then if I already have changes in launchpad, shouldn't phab pull them automatically? They are currently in proposed packet. which I assume will go slowly into release one. [22:20] no [22:20] you don't have changes in launchpad [22:20] you have changes in the release archive [22:20] NOT the same [22:20] changes made in phab go to release pocket directly na? it should also pull from there. [22:21] @wxl [ NOT the same], oh behenchooo [22:21] changes made in phab go nowhere until they're uploaded [22:21] whyyy!! [22:21] @wxl [ changes made in phab go nowhere until they're uploaded], yeah I meant after uploading only [22:21] because @tsimonq2 says to make it automatic would be a "big project" [22:23] @The_LoudSpeaker [whyyy!!], It allows for a review process before the upload. [22:23] Also sponsorship [22:23] @wxl [ because @tsimonq2 says to make it automatic would be a "big project"], you mean to say it is https://phab.lubuntu.me/macro/view/4/ [22:23] @kc2bez [It allows for a review process before the upload.], the whyy was for why phab doesn't pull automatically [22:24] i think it WOULD be good to have archive uploads sync to git [22:24] oppsite direction not so much XD [22:24] This^ [22:29] sorry i think you'll want `git apply -p1` while in the root (which should have the source untarred in it) [22:30] e.g. lxqt-globalkeys-0.14.3/debian/control would then make changes to debian/control [22:30] and lxqt-globalkeys-0.14.3/CHANGELOG would make changes to CHANGELOG [22:30] in case you're not familiar with `patch`, this follows the same behavior there [22:35] p1? [22:37] yep [22:39] @The_LoudSpeaker [mean these? https://launchpadlibrarian.net/459429230/lxqt-globalkeys_0.14.1+git2 …], the thing is, this is made from version 0.14.1+git20190923 to 0.14.3 but to apply any patch, I need to uscan —download-current -version and untar it. How do I get that for that +git version? uscan only takes from 0.14.3 o [22:39] r 2 or 1 na [22:39] the patch should change that too [22:40] yeah but he would need the tarball first [22:40] since it makes changes to the initial one [22:40] gotcha [22:40] @wxl [ yeah but he would need the tarball first], exjhactly [22:40] --download-version [22:41] or perhaps better --download-debversion [22:41] so I download and create one using github? [22:41] or maybe even --download-current-version [22:41] @wxl [ or maybe even --download-current-version], all of then don't work [22:41] ```ubuntu@focal-dev:~/globalkeys/lxqt-globalkeys$ uscan --download-current-version … uscan warn: In debian/watch no matching hrefs for version 0.14.1+git20190923 in watch line … https://github.com/lxqt/lxqt-globalkeys/releases .*/lxqt-globalkeys-([\d\.]+).tar.xz … ubuntu@focal-dev:~/globalkeys/lxqt-globalkeys$``` [22:41] you tried? [22:41] dude [22:41] --download-current-version [22:41] is not the same as [22:42] --download-version [22:42] @wxl> --download-version --download-version ], I had tried that didn't work last time. will try again now [22:43] if you change the version in the changelog then try current-version ? [22:43] @kc2bez [if you change the version in the changelog then try current-version ?], patch doesn't apply then [22:44] he means change it long enough to get the tarball [22:44] it's called "cheating" [22:44] right [22:44] I like to call it "out of the box" thinking :P [22:44] I got the tar ball of 0.14.3 by specifiing the version even now the patch doesn't apply [22:45] you don't want 0.14.3 [22:45] you want 0.14.1+git20190923 [22:45] so change it back now that you have the tar [22:47] @wxl [ you want 0.14.1+git20190923], ubuntu@focal-dev:~/globalkeys/lxqt-globalkeys$ uscan --download-version 0.14.1+git20190923 … uscan warn: In debian/watch no matching hrefs for version 0.14.1+git20190923 in watch line … https://github.com/lxqt/lxqt-globalkeys/releases .*/lxqt-globalkeys-([\d\.]+).tar.xz [22:47] use --download-debversion [22:48] same story [22:48] what are you trying to do? [22:49] to get the recently pushed changes into phab [22:49] these: https://launchpadlibrarian.net/459429230/lxqt-globalkeys_0.14.1+git20190923-0ubuntu1_0.14.3-1ubuntu1.diff.gz [22:49] he needs the old tarball at this point [22:49] well [22:49] another option is this [22:49] @wxl [ he needs the old tarball at this point], I think I should try to make one from github [22:49] why would you need the old tarball? [22:50] since the source changes don't matter to phab, just remove all the changes that don't involve debian [22:50] then apply that [22:51] then that is, I guess, simillar to what we do while updating on phab for new upstream releases [22:51] is it? [22:51] yep [22:51] tried that [22:51] didn't work [22:53] what is "that?" [22:53] what if, I shifted to a branch of 0.14.1-ubuntu-something on phab and then tried updating as if I was updating for new upstream release? [22:53] why not do what i said? [22:53] @wxl [ what is "that?"], updating from that git one as if I am updating for new upstream release. [22:54] ^ [22:54] i wouldn't suggest it [22:54] do what i said: modify the diff [22:55] also, someone remind me how we picked that git? I will directly go and pick from the commit of 0.14.3 release. will mark version as 0.14.3 instead of 0.14.3+gitsomething. will remove hassel from next time. [22:55] @wxl [ do what i said: modify the diff], will try now. [22:56] wait there are changes to cmakelists and translations if those are removed only one line in debian/lxqt-globalkeys.install remains [22:56] really I should do it? [22:57] uh [22:57] so you made no changes to d/changelog? [22:58] I mean between both versions only change to debian folder is that instal file. apart from changelog [22:58] i see changes to: [22:58] changelog [22:58] control [22:58] gbp.conf [22:58] patches/complete-config-file.patch [22:58] patches/series [22:59] i see no changes to the file you mentioned [22:59] oh yesh I noticed now. [23:00] but I did make changes to that install file while resolving conflicts [23:00] it's not in that diff [23:00] hence the first point under extra changes in changelog [23:02] i see the changelog entry [23:02] i DON'T see the change to the file [23:02] grep the file yourself and see [23:04] those were already on ubuntu side. not in debian one hence the failure in mom. I had kept the ubuntu one. [23:05] remember we changed the location of installation of upstream config fille? that was the change [23:08] i hear what you're saying [23:08] but it's not there [23:09] what you said works. But only changelog doesn't apply [23:09] I will remove changelog also from diff and write it by hand [23:11] https://paste.ubuntu.com/p/sWrJCg2pJh/ [23:13] inspect the diff in comparison to the changelog and see if you can figure it out [23:13] I tried. [23:13] i'm at work so i can't do it for you but that's what needs to happen [23:14] points to 247th line but that line seems fine in debian/changelog. Infact, it shouldn't touch it. [23:14] might be some whitespace or something [23:15] @@ -247,3 +313,4 @@ [23:15] * Use lower-case for description. [23:15] why are there OLD changes to the changelog??????? [23:15] same question!! [23:15] ^ is that normal with mom, @RikMills ? [23:16] @wxl [ * Use lower-case for description.], that line is laready there currently. should I just remove it from diff? [23:19] woop! I am removing it. will add later if required. it is taking too long for this small thing. I have class at 8am. [23:20] what should be the version number tho? [23:20] 1ubuntu1 is already used na? [23:21] wxl: old? [23:22] also I don't think I need those changes about translations now in changelog. not there in diff. [23:22] @RikMills [wxl: old?], ? [23:22] @RikMills changes to the *past* history in the changelog [23:22] https://launchpadlibrarian.net/459429230/lxqt-globalkeys_0.14.1+git20190923-0ubuntu1_0.14.3-1ubuntu1.diff.gz [23:23] 0.14.3-1ubuntu1 is the one I put in that archive one. so I put 2 here? [23:23] e.g [23:23] @@ -39,6 +98,13 @@ [23:23] [23:23] -- Simon Quigley Sat, 26 Jan 2019 00:15:52 -0600 [23:23] [23:23] +lxqt-globalkeys (0.13.0-1) unstable; urgency=medium [23:23] + [23:23] + * Cherry-picking new upstream version 0.13.0. [23:23] + * Bumped build dependency liblxqt0-dev to >= 0.13.0~ [23:23] + [23:23] + -- Alf Gaida Thu, 24 May 2018 21:23:58 +0200 [23:23] + [23:24] so i'm a bit weirded out by that [23:24] @wxl [ + * Cherry-picking new upstream version 0.13.0.], we could have done this now. couldn't we? [23:24] however if you want to fix the "problem" if you look carefully at the plus signs you should see the issue: [23:24] @@ -247,3 +313,4 @@ [23:24] * Use lower-case for description. [23:24] [23:24] -- Andrew Lee (李健秋) Sun, 16 Aug 2015 02:18:03 +0800 [23:24] + [23:24] yeah this is the issue and I don't understand why!! [23:24] also i think there's a bit of whitespace after that . [23:25] wxl: changelog gets merged as well. so it shows both history. that is what merging means [23:25] the last + adds an empty line [23:25] @RikMills okie dokie. it's just scary :) [23:25] @wxl [ the last + adds an empty line], I removed that in the start, it says curropt patch. doesn't apply [23:25] tell meee the version number!!! [23:26] * The_LoudSpeaker needs a coffee now [23:26] we're merging 0.14.3-1 no? [23:27] and removing all the patches, right? [23:27] if so, 0.14.3-1 [23:27] yeah [23:27] @wxl [ if so, 0.14.3-1], okay [23:27] remember 1ubuntu2 means 1 debian patch and 2 ubuntu patches [23:36] still not applying [23:36] ubuntu@focal-dev:~/globalkeys/lxqt-globalkeys$ git apply ~/lxqt-globalkeys_0.14.3-1.diff --ignore-whitespace … error: patch failed: debian/control:11 … error: debian/control: patch does not apply … error: debian/gbp.conf: already exists in working directory … error: debian/patches/complete-config-file.patch: No such file or d [23:36] irectory … error: patch failed: debian/patches/series:1 … error: debian/patches/series: patch does not apply [23:37] * The_LoudSpeaker heads to his bed now [23:38] tomorrow let us cherry pic the upstream commit of 0.14.3? okay?