| wxl | vm/bios/unencrypted w/ manual partition is a go | 00:05 |
|---|---|---|
| lubot | <kc2bez> I can check some metal installs in a bit | 00:06 |
| wxl | danke | 00:06 |
| wxl | vm/bios/unencrypted with a manual gpt partition (i know, getting weird) worked fine | 00:17 |
| wxl | i'm fairly confident we should be good | 00:17 |
| wxl | at least from a vm perspective | 00:17 |
| lubot | <UniversalSuperBox> So, pick the daily ISO and install it basically? | 00:18 |
| lubot | <UniversalSuperBox> If you link me to the ISO I'll install it on my potato | 00:19 |
| wxl | pick the iso, download the diff of the fix, patch it, install it | 00:19 |
| lubot | <UniversalSuperBox> Gonna take a hot minute to download | 00:20 |
| wxl | https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1829805/comments/17 | 00:20 |
| ubot93 | Ubottu bug 1829805 in initramfs-tools (Ubuntu) "Lubuntu Eoan Daily Image fails to boot after install on KVM" [Undecided, Confirmed] | 00:20 |
| wxl | http://cdimage.ubuntu.com/lubuntu/daily-live/current/eoan-desktop-amd64.iso | 00:21 |
| lubot | <UniversalSuperBox> Alright. The Potato is a Corebooted laptop. So EFI only, but should get you some of the way there. | 00:21 |
| kc2bez | That is good. My potato is only BIOS. | 00:22 |
| kc2bez | Unencrypted BIOS on my laptop is good. | 00:33 |
| wxl | that's a good start | 00:33 |
| lubot | <UniversalSuperBox> May I offer unsolicited feedback on this boot experience? | 00:56 |
| kc2bez | I don't think constructive feedback is ever turned away. | 01:01 |
| lubot | <UniversalSuperBox> The panel objects seem a little... dark | 01:01 |
| kc2bez | LUKS BIOS is a go wxl. | 01:01 |
| lubot | <UniversalSuperBox> I'm going to act like I didn't spend half a minute finding the network indicator 😅 | 01:02 |
| kc2bez | I think there is a fix in the works. | 01:02 |
| lubot | <UniversalSuperBox> "Oh maybe they don't have it up yet, I can find it in the launcher I bet" | 01:02 |
| lubot | <UniversalSuperBox> Wait, "Filling up filesystems"? | 01:02 |
| lubot | <UniversalSuperBox> It's not really going to write 320GB, is it | 01:02 |
| kc2bez | no | 01:03 |
| lubot | <UniversalSuperBox> Okay, that's good | 01:03 |
| lubot | <UniversalSuperBox> That is a feature in some installers | 01:03 |
| wxl[m] | Like writing zeroes? | 01:03 |
| lubot | <UniversalSuperBox> Yes, or random data | 01:04 |
| wxl[m] | Makes sense | 01:04 |
| wxl[m] | I'll modify the config to check for your ip and if it matches do that | 01:04 |
| kc2bez | I'm at 4.6G installed | 01:05 |
| lubot | <UniversalSuperBox> It doesn't make much sense on SSDs though lol | 01:05 |
| lubot | <UniversalSuperBox> reboot now | 01:08 |
| lubot | <UniversalSuperBox> And booted | 01:08 |
| lubot | <UniversalSuperBox> Good work, hackers | 01:09 |
| kc2bez | @UniversalSuperBox your EFI install, was it encrypted or no? | 01:11 |
| lubot | <UniversalSuperBox> Yes, encrypted | 01:11 |
| kc2bez | cool | 01:11 |
| lubot | <UniversalSuperBox> For some reason the screensaver appeared in like 10 seconds in the live session | 01:20 |
| lubot | <UniversalSuperBox> And then once dismissed didn't come back | 01:20 |
| lubot | <UniversalSuperBox> ¯\_(ツ)_/¯ | 01:20 |
| kc2bez | weird | 01:20 |
| wxl | @UniversalSuperBox ghost in the potato | 02:15 |
| wxl | btw thx for the help | 02:15 |
| wxl | @tsimonq2: do you know what repo has the *current* usb-creator in it? everything i can find is 0.3.5 | 02:22 |
| lubot | <tsimonq2> @wxl [<wxl> @tsimonq2: do you know what repo has the *current* usb-creator in it? ever …], Noooo clue | 02:22 |
| wxl | sigh | 02:24 |
| wxl | @tsimonq2: in other news it seems that TJ-'s fixed worked, so i guess i'll add a changelog, add it, and upload it, unless you have any reason to be cautious | 02:25 |
| lubot | <tsimonq2> Nope, go for it | 02:25 |
| lubot | <tsimonq2> Spin off an image after it migrates | 02:25 |
| kc2bez | wxl: Is this what you are looking for? https://launchpad.net/ubuntu/eoan/+package/usb-creator-kde | 02:43 |
| wxl | kc2bez: i'm looking for the repo, though, not the package | 02:43 |
| lubot | <tsimonq2> Is it a native package? | 02:44 |
| wxl | yeah | 02:44 |
| wxl | i can find repos but not the one that contains the latest version | 02:44 |
| wxl | @tsimonq2: you don't have the capacity to approve that upload do you? | 02:49 |
| lubot | <tsimonq2> @wxl [<wxl> @tsimonq2: you don't have the capacity to approve that upload do you?], Not at the moment | 02:50 |
| lubot | <tsimonq2> Plus, you need practice | 02:50 |
| lubot | <tsimonq2> :P | 02:50 |
| wxl | practice begging people? XD | 02:50 |
| lubot | <tsimonq2> XD | 02:50 |
| wxl | cuz afaik i can't approve it XD | 02:51 |
| lubot | <tsimonq2> wait wat? | 02:51 |
| lubot | <tsimonq2> Approve what now? | 02:51 |
| wxl | it's in proposed of course.... | 02:51 |
| lubot | <tsimonq2> Which? | 02:51 |
| wxl | https://launchpad.net/ubuntu/+source/calamares-settings-ubuntu/1:19.10.2 | 02:52 |
| lubot | <tsimonq2> So what's this business about approving? :p | 02:52 |
| wxl | well | 02:52 |
| wxl | you wanted me to spin a new iso, which i assume you mean you want that package in release....... | 02:53 |
| lubot | <tsimonq2> I can't manually approve that | 02:53 |
| wxl | it's entirely automated eh? | 02:54 |
| lubot | <tsimonq2> It's Britney, bitch | 02:54 |
| lubot | <tsimonq2> XDDDDDDD | 02:55 |
| wxl | !language | 02:55 |
| ubot93 | Please avoid any language that may be considered offensive, including acronyms and obfuscation of such - also see https://wiki.ubuntu.com/IRC/Guidelines || The main channels are English only, for other languages, see https://wiki.ubuntu.com/IRC/ChannelList | 02:55 |
| kc2bez | wxl: it looks like usb-creator 0.3.6 is in proposed too | 02:55 |
| lubot | <tsimonq2> That's what Britney is named after | 02:55 |
| lubot | <tsimonq2> Britney Spears | 02:55 |
| wxl | kc2bez: right. so it should be in SOME repo XD | 02:55 |
| kc2bez | right | 02:55 |
| wxl | @tsimonq2: that's… amazing | 02:55 |
| wxl | @tsimonq2: did i remember correctly you have britney runnning at home? | 02:58 |
| lubot | <tsimonq2> Not at home, but it runs on our servers via Jenkins | 02:58 |
| lubot | <tsimonq2> That's why we have two stable and two unstable PPAs | 02:58 |
| lubot | <tsimonq2> One is a proposed pocket | 02:58 |
| wxl | ah | 02:59 |
| lubot | <tsimonq2> The other is the release pocket | 02:59 |
| wxl | hm excuses just re-ran and i don't see it in there | 03:00 |
| wxl | there's no way it slipped through that quick is there?? | 03:00 |
| lubot | <tsimonq2> Was the source actually published in proposed when Britney started? | 03:01 |
| lubot | <tsimonq2> Britney takes a good five or ten mins | 03:01 |
| wxl | that's what i mean.. it just re-ran | 03:01 |
| lubot | <tsimonq2> Hmmmm | 03:02 |
| wxl | UTC is Thu Jun 20 03:02:19 UTC 2019 | 03:02 |
| lubot | <tsimonq2> !patience | 03:02 |
| lubot | <tsimonq2> XD | 03:02 |
| wxl | Generated: 2019.06.20 02:50:15 +0000 | 03:02 |
| wxl | it published 18 minutes ago | 03:02 |
| wxl | ok the fix is in release | 03:33 |
| wxl | let me get a new iso going | 03:33 |
| lubot | <tsimonq2> And published? | 03:34 |
| lubot | <tsimonq2> You're sure it's published? | 03:34 |
| wxl | Published 31 seconds ago | 03:34 |
| lubot | <tsimonq2> Ok | 03:37 |
| guiverc2 | the ISO you're talking about is the daily? (with TJ's work?) iso.qa says re-building still | 03:48 |
| wxl | yep yep yep | 03:50 |
| guiverc2 | thanks wxl, i paused me daily testing & will do with new... | 04:04 |
| wxl | guiverc2: np. thanks for the help! | 04:05 |
| lubot | <tsimonq2> Good work! | 04:08 |
| wxl | Status When complete Architecture Archive | 04:36 |
| wxl | [BUILDING] Currently building 10 minutes ago (estimated) buildlog (141.5 KiB) amd64 Primary Archive for Ubuntu | 04:36 |
| wxl | when complete: 10 minutes ago X''''''D | 04:36 |
| wxl | ok it's built and is being uploaded | 04:41 |
| wxl | there it is guiverc2 | 04:48 |
| guiverc2 | :) | 04:49 |
| wxl | and success! | 05:02 |
| TJ- | Where can I find info on what tools are used to generate the ISO images, specifically the casper/initrd image. I'm finding that unmkinitramfs is failing to extract files from that file "cpio: premature end of archive" - this is the 19.10 desktop ISO I'm working on | 06:53 |
| TJ- | ahhh, never mind, it's xnox messing with initramfs-tools! Bug #1832108 | 07:12 |
| ubot93 | Bug 1832108 in initramfs-tools (Ubuntu Cosmic) "unmkinitramfs fails with lz4 compressed initrds" [Undecided, In Progress] https://launchpad.net/bugs/1832108 | 07:12 |
| lubot | Aza was added by: Aza | 08:00 |
| lubot | <Aza> After updating the error. the system suggests me to execute the following command: sudo apt --fix-broken install after doing … dpkg-deb: error: insert subprocess was killed by signal (Channel break) … There were errors while processing the following packages: … /var/cache/apt/archives/libpython3.7-stdlib_3.7.3-2~18.04.1_amd64.deb … E: | 08:01 |
| lubot | Sub-process /usr/bin/dpkg returned an error code (1) … help solve the problem please! | 08:01 |
| kc2bez | @Aza that is probably a better question for the support channel. This is the development channel. | 08:48 |
| kc2bez | !support | 08:48 |
| ubot93 | For Lubuntu support, please join the #lubuntu channel on IRC or https://telegram.lubuntu.me/support for Telegram. | 08:48 |
| lubot | <Aza> sorry, thanks | 08:50 |
| kc2bez | No problem | 08:50 |
| lubot | <HMollerCl> @acheronuk there are problems again with falkon | 13:19 |
| lubot | <HMollerCl> https://paste.ubuntu.com/p/vchQ67Mj8j/ | 13:20 |
| lubot | <acheronuk> @HMollerCl [@acheronuk there are problems again with falkon], They reverted the ABI changes in ICU, so qtwebengine will need another rebuild, like before | 13:23 |
| lubot | <lynorian> standup today? | 21:11 |
| wxl | oh yeah i forgot about that | 21:11 |
| lubot | <tsimonq2> I worked on that kernel panic bug | 21:11 |
| lubot | <tsimonq2> That's it for me | 21:11 |
| wxl | let's do it | 21:11 |
| wxl | !standup | 21:11 |
| ubot93 | standup is @tsimonq2 @lynorian @HMollerCl @aptghetto @teward001 @SamuelBanya @kc2bez wxl[m] guiverc it's 2100 UTC Thursday which means it's time for the Lubuntu Development standup meeting. Please announce yourself for roll call! Afterwards, in order of announcement, post your items and be sure to mention when you're done. | 21:11 |
| wxl | we'll otherwise ignore tsimonq2 :) | 21:12 |
| lubot | <HMollerCl> Hi | 21:12 |
| lynorian | \o | 21:12 |
| wxl | anyone else? | 21:13 |
| wxl | ok let's get going then. you're up @HMollerCl | 21:14 |
| lubot | <HMollerCl> ok | 21:14 |
| lubot | <HMollerCl> fake .desktop for nm-applet already landed (default-settings) | 21:14 |
| lubot | <HMollerCl> it's in xdg-lubuntu | 21:14 |
| lubot | <HMollerCl> seed gave me an error whe using upgrade script in meta, I was adding network-manager-gnome | 21:15 |
| wxl | did you not see my explanation of how to fix that? | 21:15 |
| lubot | <HMollerCl> removing disco I suppose | 21:15 |
| wxl | well replacing it with eoan | 21:15 |
| lubot | <HMollerCl> yeah, | 21:15 |
| wxl | there's two instances in the update.cfg file | 21:15 |
| wxl | feel free to commit those all in one revision and i'll land it for you | 21:16 |
| lubot | <HMollerCl> ow, will looka at that either, I need to be in a non blocked ssh computer yo see that. | 21:16 |
| wxl | i hear you | 21:16 |
| lubot | <HMollerCl> i will see if I can see it tonight | 21:17 |
| wxl | meanwhile, you can publicly chastise tsimonq2 for not doing his job right on that one. no ssh needed XD | 21:17 |
| lubot | <HMollerCl> jejeje | 21:17 |
| lubot | <HMollerCl> when that's ready I can modify nm-tray to use nm-connection-edit instead of nmtui | 21:17 |
| wxl | i can get that landed for you quick and easy | 21:18 |
| lubot | <HMollerCl> I could make contact with ubuconlan, but they haven't told me if my presentation is aproved | 21:18 |
| lubot | <HMollerCl> UbuConLa* | 21:18 |
| wxl | they probably won't until the call for papers ends | 21:19 |
| lubot | <HMollerCl> yea, I think so. | 21:19 |
| lynorian | and then take a while after looking at them | 21:19 |
| wxl | ^^ that, too | 21:19 |
| wxl | anything else? | 21:19 |
| lubot | <HMollerCl> yes, I suppose, but I', in cotact with thme now | 21:19 |
| lubot | <HMollerCl> and I haven't had time to look at moving nm-tray that's in debian sid to ubuntu. | 21:19 |
| wxl | oh the merge right | 21:20 |
| lubot | <HMollerCl> AAAA and I need to bother simon on making lubuntu-upgrade-notification added to repo | 21:20 |
| wxl | if you get some free time, perhaps we can try to put our heads together on that one | 21:20 |
| wxl | meaning we need to get a repo in phab? | 21:20 |
| lubot | <HMollerCl> thanks! | 21:20 |
| wxl | i'm not experienced in merges but i think i can work my way through it and i could use the experience | 21:21 |
| lubot | <HMollerCl> I was also hoping that nm-tray publish a new release with the dark icons fixed, so we don't have to patch it. | 21:21 |
| wxl | did you issue an upstream pull request? | 21:21 |
| lubot | <HMollerCl> no, how did I do that? | 21:22 |
| lubot | <HMollerCl> agaida is building for debian. | 21:22 |
| wxl | we'll talk about that after the meeting | 21:23 |
| lubot | <HMollerCl> ok, thanks | 21:23 |
| lubot | <HMollerCl> that will be on my side then | 21:23 |
| lubot | <HMollerCl> EOF | 21:23 |
| wxl | great work, thanks! | 21:23 |
| wxl | lyn you're up | 21:23 |
| lynorian | I have done lots of work on the manual | 21:23 |
| lynorian | Added modifier tab in qpdfview with screenshot | 21:23 |
| lynorian | open in file manager from qtransmission | 21:23 |
| lynorian | More screenshots for each desktop prefrences | 21:23 |
| lynorian | Added more screenshots to users-groups | 21:23 |
| lynorian | More styling on software sources | 21:23 |
| lynorian | remove more hardcoded 18.10 stuff | 21:23 |
| lynorian | Rewording blurbs on status columns. | 21:23 |
| lynorian | Work on color picker, spacer, and sensors | 21:23 |
| lynorian | filed bug 1833118 on featherpad | 21:24 |
| ubot93 | Bug 1833118 in featherpad (Ubuntu) "featherpad does not syntax highlight with printer dialog open" [Undecided, New] https://launchpad.net/bugs/1833118 | 21:24 |
| lynorian | detailed print from featherpad | 21:24 |
| lynorian | new way to get new tabs | 21:24 |
| * lynorian added /me to quassel | 21:24 | |
| lynorian | screenshots in pcmanfm-qt | 21:24 |
| lynorian | Rework of qlipper | 21:24 |
| lynorian | add notes on volume output to pavucontrol-qt | 21:24 |
| lynorian | Work on manually changing time | 21:24 |
| * wxl :) | 21:24 | |
| wxl | *ironic tone* is that all? | 21:25 |
| lynorian | I condensed multiple commits and used a note in noblenote to make it more consise | 21:25 |
| lubot | <HMollerCl> that featherpad bug, should be made on github? | 21:25 |
| lynorian | many small changes | 21:25 |
| lynorian | I think it might | 21:26 |
| lubot | <HMollerCl> I mean, do they look launchpad? | 21:26 |
| lynorian | not sure | 21:26 |
| wxl | @HMollerCl yes i plan on triaging but haven't got to it yet | 21:26 |
| lynorian | I mean the initramfs way more important | 21:26 |
| wxl | in general i would assume that no upstream ever looks at launchpad. the only exception is agaida and even then he rarely supplies anything constructive XD | 21:26 |
| lynorian | ^ | 21:27 |
| wxl | thanks for the paste, lyn. that'll help grease the wheels on these meetings. anything else to add? | 21:27 |
| lynorian | nope | 21:28 |
| wxl | thanks again for all the great work. i can't say enough how much i appreciate what you're doing | 21:28 |
| wxl | 1s | 21:31 |
| kc2bez | Oh Snoopy it is Thursday | 21:34 |
| * kc2bez sighs | 21:34 | |
| wxl[m] | Flexing sponsorship muscles | 21:34 |
| kc2bez | sorry I am late | 21:34 |
| wxl[m] | * COMMITS * Accepted network-manager-gnome to seed https://phab.lubuntu.me/rSEEDaf3d2c7f3ea1c1375b29ec81e806fb3bf6596170 * Sponsored change to make nm-applet not autostart which took some faffing around with missing translations https://launchpad.net/ubuntu/+source/lubuntu-default-settings/19.10.2 * Sponsored new upstream release of calamares https://launchpad.net/ubuntu/+source/calamares/3.2.7-0ubuntu1 * Sponsored TJ's fix for the kernel | 21:34 |
| wxl[m] | panic https://launchpad.net/ubuntu/+source/calamares-settings-ubuntu/1:19.10.2 | 21:34 |
| wxl[m] | * OTHER UPSTREAM * Submitted pull request to fix screengrab instructions https://github.com/lxqt/screengrab/pull/162 * Since KDE pushed back, submitted bug re: DND between ark and pcmanfm-qt https://github.com/lxqt/pcmanfm-qt/issues/977 * Filed an issue about several issues with the snap to border function in screengrab https://github.com/lxqt/screengrab/issues/163 * MISCELLANEOUS * Retooted about updated Lubuntu emoji | 21:35 |
| wxl[m] | https://git.tyil.nl/tyil/emoji-os/commit/656657a054b9abdee5f7352adeddb32c5d3c0dbb | 21:35 |
| ubot93 | Pull 162 in lxqt/screengrab "Improve Screen Area instructions" [Merged] | 21:35 |
| ubot93 | Issue 977 in lxqt/pcmanfm-qt "DND not working with ark" [Open] | 21:35 |
| ubot93 | Issue 163 in lxqt/screengrab "snap to border functionality needs several improvements" [Open] | 21:35 |
| wxl[m] | That's it for me | 21:35 |
| wxl[m] | Bbl | 21:35 |
| lubot | <SamuelBanya> Still looking for an easier Python or JS task. Waiting on that Ubuntu dev for the iso tester answer. | 21:41 |
| * lynorian needs to get groceries | 21:42 | |
| lubot | <HMollerCl> wxl: so, how should I du that upstream pull request for new release? | 21:53 |
| wxl[m] | @HMollerCl upstream is on GitHub. Have you ever done pull requests there, meaning you start off forking the project? | 22:50 |
| lubot | <HMollerCl> I've forked but never done anything with the code | 22:51 |
| lubot | <HMollerCl> more like, doing my personal copy to test | 22:51 |
| lubot | <HMollerCl> https://github.com/palinek/nm-tray | 22:52 |
| lubot | <HMollerCl> but I know that agaida has done the building in debian | 22:52 |
| lubot | <HMollerCl> last release was 12oct2018, and prior that 9jul and 5 jul. | 22:53 |
| wxl[m] | So yeah fork it and make your changes and push it to your copy. Let me know when that is done and we'll take the next step | 22:56 |
| TJ- | Anything less taxing I can tackle? :p | 23:11 |
| wxl | TJ-: we've got all sorts of little things https://phab.lubuntu.me/T41 | 23:21 |
| wxl | @tsimonq2: ok, here's a question for you. so in eoan we went from libfm-qt 0.14.1-0ubuntu2 to -8ubuntu1. that last change included a change we want to SRU into disco, which is at -0ubuntu2. my guess is i probably don't want to pull in all of the changes between those two. in fact, the change happened in -6. so what version number do i give my change? -6ubuntu0??? | 23:31 |
| TJ- | wxl: would the additional changes from -6 to -8 make a lot of difference? I wonder if it'd make sense to have the same version in both to simplify support/maintenance? | 23:34 |
| wxl | TJ-: in light of it being an SRU (though thankfully not an LTS) i'm a little concerned about the size of the diff https://launchpadlibrarian.net/425152824/libfm-qt_0.14.1-0ubuntu2_0.14.1-8ubuntu1.diff.gz | 23:36 |
| TJ- | wxl: the diff from -6 to -8 looks to be mainly packaging | 23:38 |
| TJ- | wxl: I've not seen it but the sound of the Glib recursion error sounds like something I'd want | 23:39 |
| wxl | ok well i guess i'll give it a go and see if i get yelled at XD | 23:39 |
| teward | wow TJ- | 23:40 |
| teward | tackling Lubuntu tasks now lol? | 23:40 |
| teward | xD | 23:40 |
| TJ- | you could git-diff the -6 to -8 | 23:40 |
| TJ- | teward: not quite, jsut some light relief from difficult stuff :) | 23:40 |
| wxl | we've got someone from server and now someone from kernel.. we're moving on up XD | 23:40 |
| teward | heh indeed | 23:40 |
| teward | wxl: and Ubuntu Studio gained a 'helper' in the process xD | 23:40 |
| wxl | right | 23:40 |
| lubot | <HMollerCl> @wxl[m] [<wxl[m]> So yeah fork it and make your changes and push it to your copy. Let me …], but then we will package my copy? | 23:42 |
| wxl | @HMollerCl we'll make a pull request. if palinek (or some other maintainer) accepts it, it will inevitably get packaged. we don't necessarily have to go through agaida | 23:42 |
| lubot | <HMollerCl> but palinek already fixed the icon issue. I don't need to touch the code. | 23:43 |
| wxl | oh | 23:43 |
| lubot | <HMollerCl> The thing is that he hasn't made a released | 23:44 |
| wxl | we could always grab the patch | 23:44 |
| lubot | <HMollerCl> so,that fix isn't in debian | 23:44 |
| wxl | but i guess we've already fixed it | 23:44 |
| wxl | it will come down eventually | 23:44 |
| lubot | <HMollerCl> no, we have not. | 23:44 |
| wxl | we didn't? isn't that what i sponsored for you? | 23:44 |
| wxl | if not, let's grab the patch! | 23:45 |
| lubot | <HMollerCl> nope, that is for using nm-connectior-editor instead of nmtui | 23:45 |
| lubot | <HMollerCl> but, for the patch, we need to move to nm-tray 0.4.2 which is in sid but not in ubuntu | 23:45 |
| teward | that'd probably require coordination with the rest of the variant teams no? | 23:46 |
| wxl | are you sure it doesn't work with the version we have? | 23:46 |
| teward | AIUI nm-tray is part of a few things | 23:46 |
| wxl | other nm stuff, yes. nm-tray no | 23:46 |
| lubot | <HMollerCl> @wxl [<wxl> are you sure it doesn't work with the version we have?], no, I'm not sure, but isn't it better to solve that first? | 23:47 |
| wxl | it depends on when the release is going to come. if it doesn't come before our release, that obviously doesn't work well for us | 23:47 |
| lubot | <HMollerCl> https://merges.ubuntu.com/n/nm-tray/REPORT | 23:47 |
| wxl | oh i bet those are easily resolved | 23:48 |
| lubot | <HMollerCl> I think it's better to move to 0.4.2 first, it appears to be easy to resolve but I haven't had time to look it well | 23:49 |
| lubot | <HMollerCl> This is what @tsimonq2 told me, but I haven't spend much time on it: | 23:54 |
| lubot | <HMollerCl> Current version in Ubuntu is 1.2.3-1ubuntu1. Grab both that and 1.2.3-1 from Debian, and do debdiff 1.2.3-1.dsc 1.2.3-1ubuntu1.dsc … Grab the latest Debian version, let's say 1.2.3-2. Apply the diff you created in the previous step to the Debian packaging. Create a changelog entry, do a source build, and check the diff again. Does t | 23:54 |
| lubot | he diff look similar? | 23:54 |
| wxl | i know. he loves entirely vague instructions | 23:55 |
| wxl | you might want to grab https://merges.ubuntu.com/n/nm-tray/nm-tray_0.4.2-1ubuntu1.src.tar.gz | 23:55 |
| wxl | in that, for example, look at CMakeLists.txt. you'll see immediately a line with <<<<<<< | 23:56 |
| wxl | that's saying the next line is related to that one (it's .1-0ubuntu1) | 23:57 |
| wxl | then there's a ======= | 23:57 |
| wxl | then after the next line there's a >>>>>>> which is the end of the differences | 23:58 |
| wxl | so that line after the ======= is related to the >>>>>> bit (.2-1 in debian) | 23:58 |
| wxl | so in this case it's related to the NM_TRAY_VERSION | 23:58 |
| wxl | obviously that's not going to merge well because they're not the same. we basically need to pick one | 23:59 |
| wxl | these are the "diff3 conflict markers" which the report mentions | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!