[06:09] Good morning all [06:25] Hi jibel [06:30] good morning [06:38] Hi duflu jpnurmi [06:39] Morning jpnurmi [06:40] hi jibel and duflu [06:59] good morning desktoppers [07:13] salut oSoMoN [07:14] hi oSoMoN [07:14] salut jibel, hey jpnurmi [07:21] Morning oSoMoN [07:21] hey duflu [08:04] \o [08:05] Hi laney [08:07] Hello :) I know it's a *bit* late in the cycle, but any chance to get LP: #1912168 looked at before the freeze? :-) [08:07] Launchpad bug 1912168 in ppp (Ubuntu) "Merge ppp 2.4.9" [Low, Triaged] https://launchpad.net/bugs/1912168 [08:09] It would appear you have a few hours to feature freeze, maybe [08:09] Oh hi sil2100 ;) [08:11] well my bit is already done, now I need to get someone with proper upload rights to look at it. And since it seems to be a Desktop package (???) I figured I'd ask around here :) [08:13] schopin: i'll look for ye [08:14] hey duflu [08:16] laney: thanks :) much appreciated! [08:23] Hello o/ [08:29] hey sil2100 [08:41] ah reviewing merges [08:41] what fun it is [08:43] laney: you want a diff against the debian version? [08:44] schopin: as a reviewer you basically need the three way diff, but since you uploaded to a PPA I could make it [08:44] myself [08:46] schopin: debdiffing across upstreams is a bit ... complicated [08:46] schopin: so for future, if you want to debdiff merges, debdiffing against debian is probably best (especially if its a new upstream version) [08:47] It's like: what did we have before, what does the new thing drop compared to that, is that all good? [08:47] schopin: Then people can grab the debian package, extract it, apply the patch and do the 3-way diff [08:47] git-ubuntu would probably be nicest but it's not really widely adopted yet [08:47] In other merges I provided both diffs. Dunno why I stopped doing that :/ [08:47] laney: So yeah what I do is debdiff old-debian old-ubuntu > a.diff && debdiff new-debian new-ubuntu > b.diff && diff a.diff b.diff | less [08:48] HAHA you do not diff two diffs [08:48] laney: I'm not sure how to use git-ubuntu for such cases, though. [08:48] that is mad [08:48] laney: I diff two diffs, yes [08:48] laney: I find it more readable than interdiff [08:48] I just put them side by side and read them [08:48] Despite interdiff being for diffing diffs [08:48] interdiff didn't work for me either [08:48] schopin: I think you can create Launchpad merge proposals using it [08:48] I've reviewed a few of those, but not actually made one myself [08:49] it's more standardised in the server team, others not so much yet [08:49] but lets the reviewer come up with all these views they want, so it's nice in that sense [08:49] With git-ubuntu you create a merge proposal against the debian branch which is a bit icky [08:49] technical limitations :D [08:49] I'll take that [08:50] proper procedure with rebasing and splitting out individual changes is hard :D [08:50] what I don't get is that the git-ubuntu history is produced by importing the packages, right? So what happens if we push to the repo? [08:50] schopin: anyway, on this: two comments: merge-o-matic (dpkg-mergechangelogs) creates a blank line at the end of the merged changelog, you need to remove that [08:50] second, you correctly dropped the patch from the series but it's still in the source [08:50] I'll fix up both of those and upload [08:50] cheers! [08:50] thanks! [08:51] I don't *think* you can push to the actual repo [08:51] I generated the pkg and uploaded it normally, then the importer picked it up [08:52] maybe you can [09:01] So the merge proposal ends up being manually closed? [09:02] schopin: maybe do your next one this way and we can experiment :p [09:03] sure :D [09:07] schopin: actually wait, I just realised - we stopped producing udebs at all, so we can probably drop that bit too [09:08] shall I make that change? [09:09] I'm not entirely clear about the udeb business but I saw no-change uploads to drop those so I figured it was a build-time thing. [09:09] laney: be my guest. [09:11] I'm guessing it would be worth it to upstream to Debian a patch to use build profiles to disable the udeb? [09:11] schopin: https://bugs.launchpad.net/launchpad-buildd/+bug/1884836 bit of info there [09:11] Launchpad bug 1884836 in ubiquity (Ubuntu) "Hirsute+ should stop building and publishing udebs" [Undecided, New] [09:12] https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-package-type <- adding that would be good [09:13] I don't know if Dimitri ever tried to upstream any of that [09:14] In some of my merge/sync work I saw some !noudeb patches merged in Debian so I'm guessing there's at least some support for it there. [09:15] the profile exists in general, right - so you can key on that in the rules file to avoid building stuff which won't be shipped [09:16] or you can keep building it and then just not actually produce the .udeb, looks like that's what happens here [09:18] god colordiff is so useful [09:19] * laney isn't a diff reading wizard like juliank, need tools like that [09:20] I don't know what colordiff is, but I know that gitdelta has really helped me when reading git diffs. [09:23] +1 [09:23] it's just a colouriser which you can pipe diffs into e.g. from debdiff, like `git diff` has out of the box [09:23] felt like praising it :> [09:26] laney: So I use alias diff='git diff --no-index --no-prefix' [09:26] git-diff surprisingly can diff stuff outside git repos [09:27] that is surprising! [09:36] TIL [10:16] laney, schopin: you cannot push to the git-ubuntu repo. However there's a plan to allow everyone to provide their "rich history" back to git-ubuntu at upload time. That actually landed earlier this week, but I have yet to test it and announce. [10:16] That's to "preserve your rich history". Apart from that, git-ubuntu should be completely useable for Ubuntu package merges for packages in main. [10:16] rbasak: Great [10:17] rbasak: as long as you're here and speaking of git-ubuntu, could you have a look at the notmuch imports ? They seem to be stuck on focal. [10:18] (not the right channel, but this is a crime of opportunity) [10:19] I can see they're behind. Looking into why. [11:49] oh a delta in glib2.0, how delightful [11:51] laney: Seb's answer to my simple version question became 'big news'. [11:51] https://www.phoronix.com/scan.php?page=news_item&px=Ubuntu-21.10-With-GNOME-40 [11:52] that's working in the open! [11:52] yeah.. [11:53] hmm, what else can we get in the news ... [11:54] :) [12:20] schopin: so the reason notmuch wasn't updating is that someone imported it manually without adding it to the whitelist to keep it up to date. [12:20] I'll sort that for you now [12:20] (as of last week the whitelist is defunct and the importer will keep anything already imported up-to-date automatically) [12:51] rbasak: OK, thank you for looking into it :) [15:24] hi, do I need to file a FFe for libreoffice 7.2.0 while it won't be ready today? [16:01] probably! [16:04] laney, I have successful PPA build which autopkgtests passed, execept for arm [16:04] so uploading this one now, would safe from that work ;) [16:05] only if you consider the feature freeze to be a bureaucratic thing to be worked around [16:05] I'd rather you thought of the best thing for Ubuntu [16:05] yeah, I have a running build with an arm fix which hopefully resolves the issues [16:06] I will file a FFe [16:30] https://bugs.launchpad.net/ubuntu/+source/libreoffice/+bug/1940556 [16:30] Launchpad bug 1940556 in libreoffice (Ubuntu Impish) "FFe: libreofice 7.2.0 for impish" [High, In Progress] [17:28] gnome-shell-extension-desktop-icons-ng pristine-tar 44c6da2 Gunnar Hjalmarsson gnome-shell-extension-desktop-icons-ng_20.orig.tar.gz.delta gnome-shell-extension-desktop-icons-ng_20.orig.tar.gz.id * pristine-tar data for gnome-shell-extension-desktop-icons-ng_20.orig.tar.gz * https://deb.li/NMWh [17:28] gnome-shell-extension-desktop-icons-ng upstream/latest 1c695a1 Gunnar Hjalmarsson * pushed 66 commits (first 5 follow) * https://deb.li/i3D8c [17:28] gnome-shell-extension-desktop-icons-ng upstream/latest 11d61ca Sergio Costas po/es.po * Merge branch 'update_spanish' into 'master' * https://deb.li/2MEx [17:29] gnome-shell-extension-desktop-icons-ng upstream/latest 183075b Sergio Costas desktopIconsUtil.js * Fix default location in network mounts * https://deb.li/3HD0E [17:29] gnome-shell-extension-desktop-icons-ng upstream/latest 76fb89e Sergio Costas desktopIconsUtil.js * Merge branch 'fix_mount_default_location' into 'master' * https://deb.li/Vxel [17:29] gnome-shell-extension-desktop-icons-ng upstream/latest 2ceaf21 Sundeep Mediratta desktopManager.js * https://deb.li/3NJ2I [17:29] Fix spurious selection rectangle [17:29] Set selection rectangle to null on button relase [17:29] gnome-shell-extension-desktop-icons-ng upstream/latest dbfd928 Sergio Costas desktopManager.js * Merge branch 'fix-spurious-selection-rectangle' into 'master' * https://deb.li/32JZF [17:29] gnome-shell-extension-desktop-icons-ng tags c1681c8 Gunnar Hjalmarsson upstream/20 * Upstream version 20 * https://deb.li/3zMiR [18:37] gnome-shell-extension-desktop-icons-ng ubuntu/master 3bfa09c Gunnar Hjalmarsson * pushed 79 commits (first 5 follow) * https://deb.li/3ZJhe [18:37] gnome-shell-extension-desktop-icons-ng ubuntu/master 7de8e1c Sergio Costas README.md * Added extra dependencies * https://deb.li/AZiI [18:37] gnome-shell-extension-desktop-icons-ng ubuntu/master f983c5d Daniel van Vugt metadata.json * metadata.json: Declare gnome-shell 41 as supported * https://deb.li/308cA [18:37] gnome-shell-extension-desktop-icons-ng ubuntu/master 8bc59b7 Sergio Costas metadata.json * Merge branch 'support-41' into 'master' * https://deb.li/d80R [18:37] gnome-shell-extension-desktop-icons-ng ubuntu/master c3afe69 Sergio Costas README.md fileItem.js * Remove clutter dependency * https://deb.li/3YxCv [18:37] gnome-shell-extension-desktop-icons-ng ubuntu/master 33d81a6 Sergio Costas README.md fileItem.js * Merge branch 'remove_clutter_dependency' into 'master' * https://deb.li/3pM2z [22:57] eog signed tags 2417ab0 Jeremy Bicha upstream/40.3 * Upstream version 40.3 * https://deb.li/tSbi [22:58] eog upstream/latest e8bfdf7 Jeremy Bicha * pushed 10 commits (first 5 follow) * https://deb.li/i7YLd [22:58] eog upstream/latest 4c60e7c Felix Riemann meson.build * Post-release version bump * https://deb.li/yY52 [22:58] eog upstream/latest 27da427 Quentin PAGÈS po/oc.po * Update Occitan translation * https://deb.li/3XiZC [22:58] eog upstream/latest b2f7e48 Alexey Rubtsov po/ru.po * Update Russian translation * https://deb.li/Ji9U [22:59] eog upstream/latest 3bd614a Alexey Rubtsov help/ru/ru.po * Update Russian translation * https://deb.li/3mSWF [22:59] eog upstream/latest c921865 Quentin PAGÈS po/oc.po * Update Occitan translation * https://deb.li/3U7X7 [22:59] eog pristine-tar 3cddfb2 Jeremy Bicha eog_40.3.orig.tar.xz.delta eog_40.3.orig.tar.xz.id * pristine-tar data for eog_40.3.orig.tar.xz * https://deb.li/3O3F [23:04] eog-plugins signed tags ebe5e1f Jeremy Bicha upstream/3.26.7 * Upstream version 3.26.7 * https://deb.li/igDuy [23:04] eog-plugins upstream/latest 43758eb Jeremy Bicha * pushed 9 commits (first 5 follow) * https://deb.li/3g8nz [23:04] eog-plugins upstream/latest c0cbbe1 Felix Riemann configure.ac * Post-release version bump * https://deb.li/3hZUe [23:04] eog-plugins upstream/latest 3671b54 Jordi Mas po/ca.po * Update Catalan translation * https://deb.li/8xsI [23:04] eog-plugins upstream/latest a9cc908 Fran Dieguez po/gl.po * Update Galician translation * https://deb.li/3oJFA [23:04] eog-plugins upstream/latest a3012c3 Felix Riemann plugins/export-to-folder/export-to-folder.py * export-to-folder: Fix untranslated UI labels * https://deb.li/SJvR [23:04] eog-plugins upstream/latest 760e108 Sabri Ünal po/tr.po * Update Turkish translation * https://deb.li/3bM7v [23:05] eog-plugins pristine-tar 0fa8504 Jeremy Bicha eog-plugins_3.26.7.orig.tar.xz.delta eog-plugins_3.26.7.orig.tar.xz.id * pristine-tar data for eog-plugins_3.26.7.orig.tar.xz * https://deb.li/iOxds [23:22] glib tags e4ff10e Simon McVittie upstream/2.68.4 * Upstream version 2.68.4 * https://deb.li/3uMOh [23:23] pango pristine-tar 9de4c90 Simon McVittie pango1.0_1.48.9+ds1.orig.tar.xz.delta pango1.0_1.48.9+ds1.orig.tar.xz.id * pristine-tar data for pango1.0_1.48.9+ds1.orig.tar.xz * https://deb.li/fMdn [23:23] pango upstream/latest f9999d1 Simon McVittie * pushed 94 commits (first 5 follow) * https://deb.li/3eZ37 [23:23] pango upstream/latest 0978052 Matthias Clasen pango/ pango-attributes.c pango-markup.c pangofc-fontmap.c * Merge branch 'approximated-sizes' into 'main' * https://deb.li/3kxBU [23:23] pango upstream/latest 9bed4e1 Matthias Clasen pango/pango-attributes.c tests/markups/valid-11.expected * Correctly handle font attributes * https://deb.li/iWJKF [23:23] pango upstream/latest c7a65e8 Matthias Clasen pango/pango-attributes.c tests/markups/valid-11.expected * Merge branch 'better-ellipsize' into 'main' * https://deb.li/pZP1 [23:24] pango upstream/latest 1016e9e Biswapriyo Nath tests/test-common.c * tests: Fix implicit function declaration warnings with gcc * https://deb.li/3Q8uN [23:24] pango upstream/latest 524f0d7 Matthias Clasen tests/test-common.c * Merge branch 'fix-tests-build' into 'main' * https://deb.li/1JmV [23:24] pango tags a805314 Simon McVittie upstream/1.48.9+ds1 * Upstream version 1.48.9+ds1 * https://deb.li/3VMjg [23:29] gnome-mines signed tags 6b31afc Jeremy Bicha upstream/40.0 * Upstream version 40.0 * https://deb.li/3T8Bi [23:30] gnome-mines upstream/latest fbad05c Jeremy Bicha * pushed 111 commits (first 5 follow) * https://deb.li/GMRl [23:30] gnome-mines upstream/latest c8d73d7 Kjartan Maraas po/nb.po * Update Norwegian Bokmål translation * https://deb.li/35DnI [23:30] gnome-mines upstream/latest 231da96 Fran Dieguez po/gl.po * Update Galician translation * https://deb.li/PZDj [23:30] gnome-mines upstream/latest fdae46e Balázs Meskó po/hu.po * Update Hungarian translation * https://deb.li/3J8sR [23:30] gnome-mines upstream/latest cb6dc3e Sabri Ünal po/tr.po * Update Turkish translation * https://deb.li/nJzD [23:30] gnome-mines upstream/latest ee1181b Марко Костић po/sr.po * Update Serbian translation * https://deb.li/iUMUz [23:30] gnome-mines pristine-tar 60c6b31 Jeremy Bicha gnome-mines_40.0.orig.tar.xz.delta gnome-mines_40.0.orig.tar.xz.id * pristine-tar data for gnome-mines_40.0.orig.tar.xz * https://deb.li/lJB2 [23:54] gnome-screenshot signed tags 17abaa2 Jeremy Bicha upstream/40.0 * Upstream version 40.0 * https://deb.li/3Kagz [23:54] gnome-screenshot upstream/latest 0da7cee Jeremy Bicha * pushed 9 commits (first 5 follow) * https://deb.li/469y [23:54] gnome-screenshot upstream/latest b459127 A S Alam po/pa.po * Update Punjabi translation * https://deb.li/3s6lv [23:54] gnome-screenshot upstream/latest 2eab037 Bilal Elmoussaoui data/org.gnome.Screenshot.metainfo.xml.in * metainfo: add a launchable tag * https://deb.li/C61E [23:55] gnome-screenshot upstream/latest dfcff15 Alexander Mikhaylenko org.gnome.Screenshot.json * flatpak: Run with --interactive by default * https://deb.li/3bExe [23:55] gnome-screenshot upstream/latest d8ecf6e Fran Dieguez po/gl.po * Update Galician translation * https://deb.li/3gQNI [23:55] gnome-screenshot upstream/latest 8e7abd5 Zander Brown src/screenshot-application.c * about: add Alexander Mikhaylenko * https://deb.li/ixzEA [23:55] gnome-screenshot pristine-tar 5d2052e Jeremy Bicha gnome-screenshot_40.0.orig.tar.xz.delta gnome-screenshot_40.0.orig.tar.xz.id * pristine-tar data for gnome-screenshot_40.0.orig.tar.xz * https://deb.li/3WE74 [23:58] gnome-sushi signed tags b3a162c Jeremy Bicha upstream/3.38.1 * Upstream version 3.38.1 * https://deb.li/3d6Fx [23:59] gnome-sushi upstream/latest d3fed46 Jeremy Bicha * pushed 27 commits (first 5 follow) * https://deb.li/fEE0 [23:59] gnome-sushi upstream/latest 94e3eb6 Dušan Kazik po/sk.po * Update Slovak translation * https://deb.li/3YAu2 [23:59] gnome-sushi upstream/latest 45d3f7a Marek Černocký po/cs.po * Updated Czech translation * https://deb.li/34zmi [23:59] gnome-sushi upstream/latest 6bee850 Asier Sarasua Garmendia po/eu.po * Update Basque translation * https://deb.li/ij6Qh [23:59] gnome-sushi upstream/latest a16a72d Goran Vidović po/hr.po * Update Croatian translation * https://deb.li/iaHc [23:59] gnome-sushi upstream/latest 9048fe3 Christian Kirbach po/de.po * Update German translation * https://deb.li/3QQ5y