[02:41] robert_ancell: I ran info an issue merging manpages, bzr claims the branches have diverged [02:41] mfisch, merging which manpages? [02:41] robert_ancell: the manpages package [02:42] oh, that package is fun [02:43] bzr gave up halfway through the mege [02:43] I did spend some time cleaning up the bug list, resolved a bunch, incompleted a bunch more [02:44] I'm going to take debian and try to merge our stuff on top of it instead [03:01] robert_ancell: I'm going to propose that we drop the Ubuntu modifications, I'll email you and see what you think [03:01] it would make everyone's life easier not to hold these changes and they're mostly incorporated upstream [04:01] morn [06:00] cyphermox: hey, you didn't update your WI. Had to do it for you :/ [06:41] jibel: salut (quand tu seras là). No more magners :/ [06:46] didrocks, Hello, I noticed that :/ [06:47] didrocks, riding my kids to school, back in 10min [06:48] jibel: ttyl :) [06:48] magners still pong though) [06:51] morning [06:51] hey mlankhorst [06:51] oh excusez-moi, bonjour! [06:51] riri [06:53] héhé [07:04] didrocks, similar problem than last Monday [07:05] didrocks: at what point will unity land in saucy? [07:07] didrocks, there is no good option right now, if we keep it in this state there is a chance the machine will completely hang in the next few hours, if I restart it there is 99% chance to completely lose connectivity to the lab. [07:07] didrocks, I'll go for option 1 and wait for someone with a hammer in Lex around 10:00UTC [07:10] AAAA/win 21 [07:17] mlankhorst: at the same time than touch will be able to land in saucy [07:17] mlankhorst: which is now blocked on the phone fundation team [07:17] jibel: yeah [07:18] jibel: seems like it's our better chance [07:55] morning [07:56] hey Laney, hey desktopers [07:56] Laney, how are you? [07:57] morning laney [07:57] seb128: good thanks [07:57] you? [07:57] g'day mlankhorst [07:57] I'm good as well [07:58] Laney, since Sweetshark got libreoffice to build I was thinking of uploading the new poppler, mitya57 prepared the transition in a ppa so it should be an easy one to get through ... any objection? [08:01] seb128: no, not that I can think of [08:01] tkamppeter__: ^? === tkamppeter__ is now known as tkamppeter [08:12] Laney, seb128, go ahead with the Poppler update, nothing bad of it is known to me, and it solves the filled-form-saving bug. [08:18] The PPA was only to ensure that everything builds, please don't copy from there but reupload [08:19] mitya57: were patches required? [08:19] mitya57, you can't copy from a virtual ppa (missing archs) and I was not planning to do that [08:19] you can copy source only [08:19] one reason I've been using 'archive' version numbers in the evo-3.8 PPA [08:19] right [08:20] but yeah, you should intend to do that beforehand [08:20] Okular and inkscape need some unrelated to poppler fixes [08:20] (branches linked to the bug) [08:21] ok [08:21] I want to do empathy 3.8 first and then can start helping out on that if needed [08:22] Laney, it should be fine, I will start on it and let you know if I need help this afternoon [08:23] cool [08:24] Note that I haven't tested libreoffice with new poppler yet [09:54] seb128: looks like Riddell uploaded fixed okular, so only inkscape needs not rebuild-only upload [09:55] Riddell: btw, it ftbfs on armhf, looks like one more line should be removed from libokularcore2abi1.symbols [10:14] mitya57: ok thanks, I'm going to review all my kde merges today [10:15] Riddell, will you fix/reupload okular then? (just asking since we will need it to build to complete the poppler transition) [10:16] seb128: yeah I'll get onto it shortly [10:16] Riddell, thanks === alan_g is now known as alan_g|tea [10:20] chrisccoulson, hey, how much do you hate ppc today? ;-) [10:20] hey seb128 [10:20] how come? [10:20] i hate it as much as ever ;) [10:21] chrisccoulson, I saw that firefox is stucked in saucy-proposed because it failed to build on ppc [10:21] it's going to be stuck there forever then ;) [10:21] :-( [10:22] it sucks that we block migration because of ppc [10:22] right, I argued about that in the past === alan_g|tea is now known as alan_g [10:24] i wonder whether to just turn off the powerpc build entirely [10:26] I guess that wouldn't be the end of the world [10:26] the efforts spent to fix it don't seem worth the benefit [11:14] Laney: based on errors, saucy's currently top crasher is libproxy, where pxgsettings core dumps when run (without or any args, even e.g. --help) [11:14] have you tried poking it yet? [11:15] xnox, yes, the code is stupid and the patch trivial [11:15] I was hoping for upstream to reply [11:15] Laney, let's just drop that loop, it's cleaning on exit which is not required... [11:16] Laney, do you want me to upload that? [11:16] sure or I will later after my epic battle with empathy results in my victory [11:17] seb128, Laney: cool. [11:17] * xnox goes back to testing updated lvm2 [11:17] I've been submitting that crash every time I get it btw so I may be responsible for a lot of the instances [11:22] it's weird, I never saw it here [11:23] nobody else complained to me about it which is why I didn't fix it urgently [11:23] figuring it's config dependent [11:23] well I get the segfault if I run that command [11:23] I suspect you have proxy somewhat enabled that's why you see it [11:25] shouldn't do [11:25] Laney, xnox: fix uploaded [11:26] ty [11:26] Laney, gsettings list-recursively org.gnome.system.proxy [11:26] can you pastebin that? [11:27] seb128: http://paste.ubuntu.com/5716409/ [11:27] the localhost:8080 socks proxy is probably something I did [11:28] s/socks/http/ [11:28] Laney, seems similar to my config, maybe I'm just not using a program using proxy through gio here ;-) [11:28] Laney, anyway I verified the fix works with the pxgsettings command line [11:28] oh well [11:28] great [11:28] Laney, I'm using pidgin and not empathy, which might be it :p [11:31] hmm [11:31] does it make sense to keep having all the account-plugins-* packages now that you don't need a .so for each of them? [11:32] what do you need? [11:32] I'm not familiar with how uoa works [11:32] what changed? [11:32] maybe better to ask ken when he will be online [11:33] you just need one plugin afaict [11:33] rather than having /usr/lib/libaccount-plugin-1.0/providers/*.so for each service [11:35] I suppose to not have them all listed by default [11:37] Laney, is that a change in 3.8..? [11:38] yep [11:38] on my saucy system, account-plugin-jabber: /usr/lib/libaccount-plugin-1.0/providers/libjabber.so for example [11:38] oh [11:38] it was done by m ardy [11:39] * Laney tries a build without them but with the same package structure [11:40] Laney, http://bugzilla.gnome.org/691418 I see [11:40] Gnome bug 691418 in UOA "Use a shared plugin for all empathy providers" [Normal,Resolved: fixed] [11:40] yeah [11:43] Laney, does it still have the .service files? [11:43] e.g /usr/share/accounts/services/jabber-im.service [11:44] Laney, one thing to avoid would be to have all the "small/non usual providers" cluttering the accounts list, atm we only have the one installed listed in the control center [11:44] we probably want to avoid having 15 items in that list including stuff nobody use [11:46] seb128: yes, .service and .provider are still there [11:46] I'll keep the split for now [11:46] k [11:49] seb128: who owns "Networking & Telephony story" on your side? [11:49] cypher or stgraber? [11:50] asac, cyphermox [11:51] When upgrading the kernel, I get that error: cp: cannot stat '/module-files.d/libpango1.0-0.modules': No such file or directory [11:51] could be broken because of gnome3 ppa [11:51] anyone knows a workaround for that? [11:51] it happens when doing update-initramfs: Generating /boot/initrd.img-3.8.0-22-generic [11:54] xclaesse, is that saucy ? [11:54] seb128, raring [11:55] with some ppa like https://launchpad.net/~ubuntu-desktop/+archive/ppa and https://launchpad.net/~gnome3-team/+archive/gnome3 [11:56] xclaesse, dpkg -l | grep pango? [11:57] seb128, http://pastebin.com/MhSx4rHL [11:57] shrug [11:58] you got bitten by ricotz's ppa, check with him [11:58] he tends to have packages pretty much on the "edge" side [11:58] I would avoid that ppa if I was you [12:00] yeah, I probably shouldn't have added those ppa :( [12:01] xclaesse, try to ppa-purge it [12:01] all I wanted is EDS 3.8 for the UOA integration [12:01] or at least re-install pango from raring [12:11] xclaesse, if you have gnome3-stating ppa enabled you can wait for the plymouth update [12:17] seb128, hi :), thanks for pinging me, but you could try to avoid scaring people away [12:18] ricotz, hey, did I scare people away? [12:18] seb128, not sure, he doesnt answer ;) [12:18] ricotz, but that error seems to suggest you took the debian packaging change from pango which impact on initramfs and plymouth and pushed to a stable serie, that's probably something most users don't want to opt in for [12:20] seb128, yes, i am fine with that in the staging ppa [12:21] ricotz, I wouldn't want to opt in for a ppa which impact on my initramfs, userspace is fine, boot stuff a bit less ... but just my opinion [12:21] seb128, ok [12:22] didrocks: if anything, I pushed an updated python-evdev to the packaging branch of mine, you can take a look when you have a moment ;) [12:22] https://code.launchpad.net/~sil2100/python-evdev/debian [12:22] Now I disappear, so see you later guys! [12:41] cyphermox: can you please review (the fixed version of) https://code.launchpad.net/~abelloni/ubuntu-themes/3.8_fixes/+merge/161439 ? [13:11] hum [13:11] mitya57, you forgot packages in your poppler rdepends list, e.g xpdf is not in there and doesn't build with a simple rebuild :/ [13:13] seb128: oh it depends on libpoppler-private-dev which I didn't check [13:13] mitya57, shrug [13:13] let me look at the build log [13:13] mitya57, rdepends libpoppler18 is what I did [13:14] seb128: was it a local build? can you please paste the log somewhere? [13:15] mitya57, [13:15] -c -o build/GlobalParams.o build/GlobalParams.cc [13:15] build/GlobalParams.cc: In constructor ‘GlobalParams::GlobalParams(char*)’: [13:15] build/GlobalParams.cc:656:37: error: ‘getHomeDir’ was not declared in this scope [13:15] baseDir = appendToPath(getHomeDir(), ".xpdf"); [13:23] getHomeDir() was removed in http://cgit.freedesktop.org/poppler/poppler/commit/?id=44bf99a7b8 [13:24] mitya57, can you work on a build fix? [13:24] seb128: sure [13:24] mitya57, thanks [13:49] tsdgeos: is it safe to replace getHomeDir() with just getenv("HOME") in Ubuntu? (^) [13:50] mitya57: what do you need it for? [13:51] tsdgeos: xpdf uses it (see seb128's message above_ [13:51] ah [13:51] well, don't break xpdf then :D [13:51] xpdf != popplre [13:52] if i was xpdf author i'd complain to people packaging something they call xpdf but is not, but obviously i'm not the xpdf author :D [14:06] mitya57: looking... [14:06] mitya57, hum, gdcm fails to build as well, though I'm not sure if that's due to poppler (https://launchpad.net/ubuntu/saucy/+source/gdcm/2.2.3-1ubuntu1) === m_conley_away is now known as m_conley [14:06] mitya57: reverse-depends -b src:poppler for future reference [14:06] maybe without -b too to pick up indirect bds [14:07] seb128, do you know how to properly update the .po files in g-c-c? [14:07] attente, you mean? [14:07] attente, the po are not in g-c-c, we export translation from launchpad ... or do you mean the template? [14:08] seb128: this looks like gcc 4.8 [14:08] :-( [14:08] let me fix xpdf first, and then I'll maybe look [14:08] thanks [14:09] seb128, to add new msgid's to the po files extracted from the source code of the changes to the panel i've made [14:09] attente, in a nutshell: [14:09] - use _() around your strings [14:09] - lists the source in po/POTFILES.in [14:10] - you can generate a template to check if your strings are listed with "cd po: intltool-update --pot" [14:10] that gives you a .pot in po/ which lists all the strings marked for translation [14:10] - that template is generated at build time, imported in launchpad [14:11] - translators do their work [14:11] - we export the translations in language packs [14:11] [14:11] _() is only for c code, right? what does one do if the string is in a GtkBuilder ui file for example? [14:11] attente, so basically just do the first 3 steps, if your string is listed you are all set, the buildd magic will do the work for you [14:11] attente, translation=yes [14:12] seb128, awesome, thanks :) [14:12] ups [14:12] attente, translatable="yes" rather [14:12] attente, see e.g /usr/share/gnome-control-center/ui/gnome-region-panel.ui [14:12] Region and Language [14:12] same for labels, etc [14:13] heh, glade already puts those in automatically it seems [14:13] yes [14:13] speaking of translations, is it normal to have LP push back to trunk or a separate branch when setting a project up for translating? [14:13] Laney, it depends how the project is set up [14:13] some want direct commit [14:13] some prefer to manually merge the translation before doing a release [14:13] mitya57: approved. [14:14] I set it up for ubuntu-release-upgrader but going to another branch [14:14] seems like it would be easier to have it just go to trunk [14:14] yeah, lightdm seems to do that [14:14] maybe ask dpm, he probably knows better the details [14:14] hey [14:15] dpm, hey ;-) [14:15] the magic three letters [14:15] hello desktop folks :) [14:16] cyphermox: thanks! [14:16] Laney, seb128, I always recommend setting the exports branch to trunk. This makes it much easier, as then the full process is automated and no one has to go and manually merge the translations branch to trunk, which in my experience tends to be forgotten [14:17] dpm: that's what I just noticed [14:17] will do that, assuming I can find the option again [14:18] Laney, yeah the UI is a bit difficult to navigate, it also often takes me a while to find it. The thing to remember is that translation exports are set for a given series [14:18] yep, got it [14:18] cool [14:18] Laney, also, if translations are done in LP, the best setting for imports is "Templates only" [14:19] unless you want to do a one-off import of existing PO files that were done outside of LP [14:19] then you'd choose "Template and translations" [14:20] * dpm has a todo to document translations setup best practices [14:20] I had it on templates and translation files [14:45] seb128: I think the less ugly solution will be to have a cut down version of getHomeDir() inside GlobalParams.cc [14:46] seb128: I'm on a sid machine now, so can't test locally, so pushed to ppa [14:46] and to lp:~mitya57/ubuntu/saucy/xpdf/fix-for-poppler-0.22 [14:46] mitya57, copy works for me [14:46] mitya57, ok, I can try it here [14:58] mitya57, fails to build [14:58] build/XPDFViewer.cc: In member function ‘void XPDFViewer::initOpenDialog()’: [14:58] build/XPDFViewer.cc:2978:52: error: ‘makePathAbsolute’ was not declared in this scope [14:58] core->getDoc()->getFileName()->getCString())); [15:00] :( [15:05] I will now try to force including of xpdf's gfile.h instead of poppler's one, maybe that'll be easier === Ursinha is now known as Ursinha-afk [15:13] seb128: mitya57: yes basically we removed lots of stuff from the gfile and stuff that was unused [15:20] I'm out for some exercice, back in ~1h [15:31] tsdgeos: anything except makePathAbsolute and getHomeDir? [15:31] mitya57: not sure what you mean [15:33] tsdgeos: these are two functions you definitely removed, and both were used by Xpdf [15:33] yes [15:33] *by Ubuntu's Xpdf [15:34] xpdf should not be using poppler [15:34] tsdgeos: I think this is the only way to have it maintained, as upstream seems dead [15:34] mitya57: it's not dead, just veeeeeeeeeeery slow on releases [15:35] mitya57: anyway, if you are patching xpdf to use poppler, you may as well patch xpdf and add the functions poppler removed [15:36] tsdgeos: those functions are there, but debian/rules prepends "pkg-config --cflags poppler" to build args, so it tries to use Poppler's headers [15:48] * Laney watches kenvandine's epic fight with PS Jenkins bot [15:48] indeed [15:49] it says xvfb-run failed to start [15:49] that can't be because of laney's branch :) [15:50] you'd hope so :P [16:03] seb128: back? [16:07] bad /me. 43min != 1h [16:15] Laney, i'm at a loss... tests run fine in pbuilder but not in jenkins anymore... grrrr [16:15] Laney i guess i need to summon the jenkins masters :) [16:16] bah! [16:16] I assume it's going to affect more than just this project though [16:17] yeah... :/ [16:18] it's worked fine for months... [16:19] fginther, do you have any ideas why suddenly running tests that use xvfb-run in jenkins fails? [16:19] xvfb-run: error: Xvfb failed to start [16:19] is the error [16:21] fginther, it's autolanding for the friends stack that started to fail, which we did just change the ci_defaults from raring to saucy === Ursinha-afk is now known as Ursinha [16:25] kenvandine, hmmm, perhaps there's something broken in saucy? [16:26] kenvandine, we can try a few tests with raring and comparing the results [16:26] works in pbuilder [16:26] for saucy [16:26] i have no idea what to try next... [16:29] mitya57, back === greyback is now known as greyback|food [16:30] seb128: do you think we can do what tsdgeos says? [16:30] (drop all poppler-related patches and build without poppler) [16:31] kenvandine, do you run xvfb-run with -a? [16:31] otherwise I'll give you another patch that copies makePathAbsolute to XPDFViewer.cc [16:31] mitya57, what did he suggest? [16:31] mhr3, nope [16:32] well, don't break xpdf then :D [16:32] if i was xpdf author i'd complain to people packaging something they call xpdf but is not, but obviously i'm not the xpdf author :D [16:32] kenvandine, you should :) [16:32] mitya57, I would prefer to use copy those functions of that works [16:32] ok [16:32] mhr3, good point :) [16:32] kenvandine, I'll look into it, maybe there is something wrong on the host [16:32] but it has always worked [16:32] mitya57, or check with the security team, the reason we made xpdf use poppler was easier security maintenance since xpdf doesn't keep on top of their issues [16:33] mitya57, but for what I'm concerned we could stop maintaining xpdf or drop it from the archive [16:33] it was important 10 years ago but we got some better viewers since [16:34] kenvandine, we could be running into port resource issues. I'll take a look after lunch [16:34] fginther, thx [16:34] i'll give it a try with -a too [16:38] Sweetshark, grararr, libreoffice failed to build with [16:38] "Checking correctness of source dependencies... [16:38] After installing, the following source dependencies are still unsatisfied: [16:38] libhsqldb-java(inst 2.2.9+dfsg-3ubuntu1 >= conflicted 1.8.1~)" === alan_g is now known as alan_g|life [16:43] seb128: branch updated, please try to build this [16:43] (but +1 to dropping xpdf completely) [16:44] seb128: will look at gdcm tomorrow [16:44] mitya57, thanks, no hurry we will be blocked on libreoffice for a while it seems [16:44] cf what I just copied [16:44] err [16:44] well "while" [16:45] need Sweetshark to be back (today is an holiday for him) and then we will need at least a day for the builds [16:45] does it really Build-Conflict on a version which is implied by the Build-Depends? [16:45] mitya57, http://paste.ubuntu.com/5717337/ [16:45] I don't understand how that ever built if so [16:45] must be misreading [16:46] Laney, that's the diff of that upload: https://launchpadlibrarian.net/141103518/libreoffice_1%3A4.0.2-0ubuntu1_1%3A4.0.2-0ubuntu2.diff.gz [16:46] ah, no, 1.8.1 vs 1.8.0.10 [16:46] so as soon as that package was upgraded LO was broken [16:46] still ... [16:46] it built in a ppa [16:46] I don't get it [16:47] see https://launchpad.net/ubuntu/+source/hsqldb [16:47] seb128: so let's wait until tomorrow when I'll be at my saucy machine [16:47] mitya57, ok [16:47] Laney, shrug, I guess the ppa doesn't use proposed :/ [16:47] nor do I [16:47] apparently not, it's not the default [16:48] so we didn't see that before upload [16:48] "fun" [16:48] I wanted to check if xpdf is popular in Ubuntu and noticed that popcon.ubuntu.com is still not working :/ [16:48] "For safety, add a build-conflicts against libhsqldb-java (>> 1.8.1~)" [16:48] that's quite some safety [16:49] it's protecting you to have a chance to have libreoffice to ever build [16:49] :p [16:49] saving buildd time :P [16:54] Laney, http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=commitdiff;h=bf27df32a74473a045605a8e7b02b5586a6ebcd8 [16:54] yeah [16:54] it seems like that's a buggy conflicts and should just be dropped [16:55] I think I will drop the [16:55] ifneq (,$(filter hsqldb, $(SYSTEM_STUFF))) [16:56] perl -pi -e "s/(Build-Conflicts: .*)/\1,libhsqldb-java (>= $(HSQLDB_TOONEWVER)~),/" debian/control [16:56] endif [16:56] seb128: howdy [16:56] jbicha, hey [16:57] seb128: is there anything else I should do to coordinate handling bug 1185869 ? [16:57] Launchpad bug 1185869 in gnome-shell (Ubuntu) "Update gnome-shell to 3.8" [Undecided,New] https://launchpad.net/bugs/1185869 [16:58] does it work with the new eds? [16:59] seb128: Digging slightly it seems that the modified build-dep is because _rene_ uploaded a forked source package of the old version of hsqldb [16:59] Laney: yes as we've had gnome-shell 3.8 in the staging ppa with e-d-s 3.8 for a while [16:59] so it keeps using the old series [16:59] jbicha: are you going to update gsettings-desktop-schemas also? [16:59] seb128: heh, java guys doing updates in proposed, creating pain? welcome to my world. [16:59] we might want to upload that thing too [17:00] that's hsqldb1.8.0 source package [17:00] mitya57: yes, there's two schemas that were dropped that we're patching back in since we're still using them [17:01] where does the transition come from? [17:02] it might be safer to wait until after eds to avoid entangling things [17:02] jbicha, nothing special, can gsettings-desktop-schemas be uploaded first or does it break things? [17:02] jbicha: this will break metacity, please commit the patch from gnome #697801 then (at least upstream, and I'll then cherry-pick it) [17:02] Gnome bug 697801 in general "Alt+Tab doesn't work in Metacity with gsettings-desktop-schemas 3.8" [Normal,Unconfirmed] http://bugzilla.gnome.org/show_bug.cgi?id=697801 [17:03] Sweetshark, what do you recommend doing? just dropping the lines I pointed [17:03] (ther first one, second is not too necessary) [17:03] Laney, you seem to have a better grasp that me in that libreoffice issue ... what do you recommend doing [17:03] Debian has the schemas break gnome-shell << 3.7.90 because of http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701619 [17:03] Debian bug 701619 in gsettings-desktop-schemas "gsettings-desktop-schemas: Updating gnome-themes-standard to 3.7.90 broke switching windows in gnome-shell 3.6" [Normal,Fixed] [17:03] I think we have to take that hsqldb1.8.0 package [17:03] (sorry just back from exercice and catching up with backlog) [17:03] jbicha: I know, as I'm the reporter :) [17:03] but I can drop that change as we know that gnome-shell is broken anyway if we want to just update the schemas separately [17:04] seb128: mom, checking git blame for those lines. [17:04] Laney, will that fix the conflict? how so? [17:04] it will not, but if you look at the LO commit he updated the BD too to use a package from it [17:04] I assume because the new series doesn't work [17:04] jbicha, no, that's ok, I just like to have things landing in chunks when possible rather than all together [17:04] easier for testing and debugging [17:04] seb128: do you know why that hsqldb stuff is stuck so long in proposed? [17:05] let me go and ask jamespage if he'll do the update [17:05] seb128: because there might be extra fun in for us, if building lo against it doesnt run against the 1.8 in saucy (non-proposed) ... [17:05] it's a transition [17:06] Sweetshark, if I read http://people.canonical.com/~ubuntu-archive/proposed-migration/update_output.txt correctly, because libreoffice needs to transition to use the new one :p [17:06] skipped: hsqldb (538 <- 132) [17:06] got: 91+0: i-91 [17:06] * i386: jodconverter, libjodconverter-java, libreoffice, libreoffice-base, libreoffice-report-builder, libreoffice-report-builder-bin, libreoffice-subsequentcheckbase [17:06] mitya57: I can sponsor metacity for you [17:07] pinged jamespage in #ubuntu-devel [17:07] thanks [17:08] There's some chance I get MOTU permissions on Monday, so that won't be needed [17:08] could probably manage to do it myself tomorrow though if necessary [17:08] ah, no, it's in main, probably because compiz uses libmetacity [17:09] jbicha: so, "sponsor" it upstream please :) === psivaa is now known as psivaa_afk [17:14] jbicha: thanks (though you decided to commit the second one also for some reason) [17:14] mitya57: does it need to be reverted? [17:15] jbicha: no, but it's pointless for me [17:15] seb128: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git;a=commitdiff;h=6cc45869;hp=c7d7b35581a0d730a20684b02a28e5605ff99eea <- seemed to have been a better-be-safe-than-sorry commit, waaay back then. [17:15] anyway Florian requested it, so let's keep it === greyback|food is now known as greyback [17:16] Sweetshark, Laney, what's the issue if we just drop that conflicts? [17:16]