[01:13] if anyone want to test the 3.29 g-s stack... https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3337.2 ;-= [02:14] Laney, how's Taiwan? [02:21] morning duflu [02:21] Good morning [02:21] Well, the portion of it that I'm inhabiting smells worse and worse each day [02:21] 75 sweaty geeks in a non-ACed room does not a pleasant environment make [02:22] I guess not everyone is used to having to buy anti-perspirant [02:22] perspirant [02:22] Wow. So dyslexic today that I am correcting what's already correct [02:26] heh [02:30] Wait. A conference in a non-ACed room? That's odd [02:32] The lecture theatres are ACed, and the outside space is (a bit) [02:39] Laney: are we targeting GNOME 3.30 for cosmic? Is it ok for me to upload gnome-desktop3 3.29.90 there? [02:40] I won't have time to do as many uploads this cycle, but I needed gnome-desktop3 for testing something any way… [02:45] jbicha: yep, & sure if it works without having to update anything else [02:45] I'm trying to update things in exp where I can and then sync/merge [02:45] but this is annoying now since my key expired [02:46] bribe Seb 🙃 [02:49] heh [02:49] should be able to do mutter/shell/g-c-c/g-s-d today I think [02:50] * Laney is writing the merge changelog for gnome-shell since Trevinho didn't 😈 [02:51] Rules... [02:52] this is a good rule [05:46] good morning [05:48] Morning didrocks [05:50] hey duflu [06:24] hey didrocks [06:24] what go on [06:28] nothing special, holidays tonight \o/ and you Laney? [06:28] still having fun at debconf? [06:29] nice, where are you going? [06:29] debconf's good yeah, bbq last night and conference meal tonight [06:29] :> [06:31] Laney: my parent's, in the Alps, mostly escaping the warm weather :) [06:31] nice! [06:31] gosh [06:31] after the raw meat night, the hyper-grilled one :p [06:32] I hope it's not a heatwave still when I get back [06:32] but https://www.theguardian.com/uk-news/2018/aug/02/heatwave-returns-to-london-and-south-east [06:32] not that I'm in either of those areas [06:32] hope alps is good! [06:33] well, at least, older house with wide walls to protect you inside ;) [06:33] but yeah, it's quite crazy and doesn't seem to want to stop [06:33] ya the house itself should be ok [06:33] and it won't be so insanely humid anyway [06:34] * Laney debsign gnome-shell 3.29.90 [06:34] yeah ;) got used to the humidity btw? [06:34] not so much [06:34] Laney: the *best* release ever of G-S ;) [06:34] (just saying…) [06:34] heheh [06:34] good list of contributors :> [06:34] s/good/excellent/ [06:34] you meant, I guess :p [06:34] I did a breaks on ubuntu-dock and yaru-theme [06:35] is that version from Trevinh_o in the silo a good one to release? [06:35] https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3337.2 [06:36] Laney: ubuntu-dock might change version [06:36] yaru-theme is ok [06:36] hmmmm???????? [06:36] there's a package of dock there to upload [06:37] Laney: right, but I think the version number he pushed doesn't help us [06:37] so if I push that, that is the version [06:37] as the numbers [06:37] ok, then I have to wait [06:37] yes please ;) [06:37] we'll discuss that today [06:37] hum, I wonder if I prepare a branch for g-c-c [06:37] to switch to the new schema value one g-s-d is uploaded for override support [06:37] or let that to the one who will push new g-s-d [06:38] not sure what you mean [06:38] basically, we are going to use the upstream gsettings key for volume override now [06:38] so, g-c-c needs to change what key it's setting [06:38] and we can drop our patch for g-s-d [06:39] ah right [06:39] but I think it would be great to handle migrations (if people had the old key to true…) [06:42] Laney: I'm sure you will be used to the humidity once you get back, and will have wet towels in your bedroom at home to compensate :) [06:42] :> [06:42] I think I pushed those new versions in git, wouuld be great if you wanted to do the patch mangling before uploading [06:44] just pushed gnome-shell, will wait for you to argue about the versions [06:44] Laney: which patch mangling? (you meant g-c-c/g-s-d?) [06:44] * Laney copies yaru meanwhile [06:44] yeah ;) [06:44] yeah [06:44] I'll see if I have time before leaving, I can do that untested still ;) [06:45] we can add the migration as a TODO as well [06:45] hey didrocks, Laney [06:45] good morning desktoppers [06:45] good morning oSoMoN [06:45] yeah that can be done before release, not required now [06:45] hey oSoMoN [06:45] what is up [06:46] yaru-theme 18.10.1 in cosmic [06:46] Candidate copy target: https://api.launchpad.net/devel/ubuntu/+archive/primary [06:46] Copy [y|N]? y [06:46] 1 copy requested. [06:46] do I need to push something? [06:46] nice! :-) [06:47] getting ready for another hot day [06:47] yeah :/ [06:47] holidays in the Alps sounds nice [06:48] I'm going to Brittany in a couple of weeks, hope to get temperate weather there [06:48] crossing fingers! [06:52] I don't find a branch for yaru [06:52] and no Vcs- information mentioned, so guess nothing to push [06:53] https://github.com/ubuntu/yaru/commit/55fd8f8705b56e151147be709aea23f4c6604bea#diff-e6cb5fdaf65628feb1ea2f516e9ade55 looks like it's in there [07:02] ok, wrote the migration script, was easy ;) [07:02] Laney: Trevinho was supposed to add it? [07:03] https://github.com/ubuntu/yaru/commit/ff479c1b6b84a636423c0e99164ee17f2ac38de1 [07:03] that was probably after the current push? [07:05] didrocks: guess so, we got 18.10.1 [07:06] makes sense [07:06] does mean that if I sponsor I can't push changes, and I can't make the release tag [07:08] I think Trevinho pushed the release tag already [07:08] right, but that's weird because he didn't release it [07:09] ask him :) but yeah, it's a similar situation than ubiquity, release-upgrader and other projects… [07:09] indeed [07:11] * didrocks looks at man for dh-migrations, it's not picking it up [07:12] argh, I was on the bionic branch… [07:12] heheh [07:35] pushed the key change for g-c-c + mirgation script [07:35] so, whoever will upload it to the distro… ;) [07:35] and the migration script looks like it's working correctly [07:36] * Laney fixes changelog to mention didrocks instead :> [07:40] isn't /me puzzled, is that not "Didier Roche"? :p [07:40] or you mean the final line? ;) [07:40] I used dch -a for some reasons! avoiding the final blame :p [07:45] yep, the person that gets the trolls [07:50] ah, a new g-s-d with some 100% volume stuff too [07:52] yep! that's why I pushed the patch to g-c-c ;) [07:52] yeh, I missed 3.29.90.1 [07:53] there is no break/relationship btw between the Shell and g-s-d [07:54] if one is before the other, it's just that the whole feature isn't supported [07:54] (if g-s-d is first, the OSD/GNOME Shell will show volume at 100% even when volume is > 100%) [07:55] if the Shell is first, you can just see, if you enabled amplificiation, the max limite at 100% that you set by media keys, you can then only go over using the override manually [07:55] sounds nicely handled [07:55] backward compatilibity |m| [07:56] (apart for the theme :p) [08:02] good morning desktopers [08:04] good morning seb128 [08:04] lut oSoMoN, en forme ? [08:04] hey Laney didrocks [08:05] Trevinho, I don't understand what you ask me [08:05] $ git tag | grep -E '^ubuntu/|^debian/|^upstream/' \ [08:05] | xargs --no-run-if-empty git push origin [08:05] no, I'm not going to type that barbarian command [08:05] seb128, quelques courbatures (qui a dit que le sport c’est la santé?), mais sinon la forme, et toi? [08:05] (neither am I going to rant about the complexity of all those git stuff) [08:06] oSoMoN, en forme, j'avais un peu les courbatures hier après le tennis de mardi, j'espère que ça sera passé ce soir parce que je rejoue :p [08:08] salut seb128! [08:08] hi seb128 [08:30] oSoMoN, do you plan to handle the SRU as well for that gnome-software fix? [08:31] seb128, yes, I'll do that today [08:32] oSoMoN, great, thx [08:34] seb128: hey Seb.... Any of the combinations, but push that tag :-) [08:34] Trevinho, I'm doing it if you gave me decent command to do it [08:34] $ git tag | grep -E '^ubuntu/|^debian/|^upstream/' \ [08:34] | xargs --no-run-if-empty git push origin [08:34] is not [08:35] there has to be an easier way? [08:35] I've sent you 3 options [08:36] push tags does it too [08:36] I didn't understand they were alternative ways [08:36] so why that complex line if push tags is enough? :p [08:36] Or just the specific tag [08:37] That's to push all the tags we need when we import a new revisions for example === as is now known as Guest30739 [08:37] Follow tags might work too [08:50] yeah, that was why I put on the wiki page to set follow tags [08:51] I though I had it set on that checkout [08:51] how do I read that settings value? [08:52] I think it's in .git/config (you can read it as well via git config command) [08:52] * didrocks looks for an example [08:53] [push] [08:53] followTags = true [08:53] in .git/config in your repo [08:53] $ git config --get push.followTags [08:53] $ [08:53] k [08:53] that returns true once it's set [08:54] To git+ssh://seb128@git.launchpad.net/~ubuntu-desktop/ubuntu/+source/nautilus [08:54] * [new tag] ubuntu/1%3.26.4-0ubuntu2 -> ubuntu/1%3.26.4-0ubuntu2 [08:54] * [new tag] upstream/3.26.4 -> upstream/3.26.4 [08:54] Trevinho, ^ [08:55] Good one [08:55] Trevinho, thanks for noticing! [08:59] Trevinho: so, versioning & ubuntu-dock, I think you saw my answers, correct? [08:59] Trevinho: basically, keeping gbp.conf minimal please (as I had to revert for yaru), native version, and if you want, our unmerged patches (not the constant delta we'll keep) as quilt patches [09:00] didrocks: I was about to ask... I saw the issue on gitlab. Not all details though since I still have to relocate to the coworking, so... [09:00] another idea is to have unmerged patches cherry-picked and a file to track those unmerged upstream commit id (again, for things that are not in the permanent delta) [09:00] Trevinho: that's the gist of it ^ [09:00] Ok... That's fine. Going with quilt [09:01] keep it with a native version though, please! :) [09:01] As per version number itself is it fine to follow upstream that way? [09:01] Ah... So 18.10? [09:01] well, you have 2 ways [09:01] 63ubuntu1 [09:01] or 18.10 [09:01] I prefer the second, but I can understand you may want the first [09:01] Ah ok... I used 63ubuntu before... [09:01] with quilt gbp wanes the 1st [09:02] that's fine as long as it's a native version :) [09:02] Or it won't find the tag... [09:02] and stream down gbp.conf [09:02] well, you can use --with quilt [09:02] Then I wanted to ask... Since some docs mention that if it's not in debian has to have -0... But.. [09:02] that's when upstream != downstream [09:03] here, we can consider ubuntu-dock as ubuntu being the upstream [09:03] as we don't ship dash to dock, but rename the projects, and such [09:03] (as there is upstream dash to dock in the repos for the fanclub) [09:03] Ok, in fact I had a push with that version too... Then the missing delimiter was feeling me bad :-P [09:04] don't feel bad, or use 18.10 ;) [09:04] or a mix, but unsure [09:04] like 63+18.10? [09:05] Mh... Or 63ubuntu.18.10.1? [09:05] Or that's for sru only. [09:05] sounds even weirder, what does other people think? [09:05] ? [09:05] I have no strong opinion as long as it's a native version [09:06] Ok, waking to the office... Catch you later with the pushed code [09:10] I don't have strong opinion, either way works [09:10] 18.10 looks a bit nicer that 63ubuntu18 [09:11] I think git is what really told you on what upstream version you are based on [09:29] kenvandine, hi, https://launchpad.net/~gnome3-team/+snap/gnome-characters === Please is now known as Guest64602 [10:06] seb128: hi, I have formatted the bug report as an SRU request, which should help you merge the code into bionic too: LP: #1778011 [10:06] Launchpad bug 1778011 in ubuntu-drivers-common (Ubuntu Bionic) "SRU: PRIME Power Saving mode draws too much power" [High,In progress] https://launchpad.net/bugs/1778011 [10:51] seb128: for the SRU branch of nautilus (https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/350174 ?) can you sponsor that too? [10:52] oSoMoN: hey, in https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-software?h=ubuntu%2Fbionic you've to push the tag too :) [10:53] Trevinho, oh, I thought I had, lemme fix that [10:56] oSoMoN: in case `git tag | grep -E '^ubuntu/|^debian/|^upstream/' | xargs -r git push origin` does it :) [10:56] or `push --tags` although that might push other upstream tags we don't care about (and that L_aney) wanted to filter out :) [11:01] Trevinho, I went for "git push origin ubuntu/3.28.1-0ubuntu4.18.04.3", that did it [11:01] yep, that's enough [11:01] just not to remember all the tags to push I use git tag way :) [11:11] didrocks: anyway that change of the dock in theory got merged, so I could also just remerge it and not use quilt for now [11:11] I would need that for 18.04 though [11:11] or well, as is preferred [11:12] Trevinho: who would you need that for 18.04? isn't it to make it compatible with latest G-S? [11:13] didrocks: no not that patch [11:13] didrocks: but I want to cherry-pick other fixes [11:13] see the current changelog [11:13] for the one I proposed [11:14] Trevinho: ah, sure, I don't think we need to do those as quilt patches [11:14] ok, fine [11:14] so let's continue this way, in case we can always use `--with quilt` and that's it [11:23] yep! [11:25] back [11:25] tseliot, thx, I've a look [11:25] Trevinho, let me have a look to the SRU [11:26] Trevinho, can you explain me that "git tag | grep -E '^ubuntu/|^debian/|^upstream/ | xargs'" business? why is that ever needed, is that to avoid pushing some tags and where would those unwanted tags come from? [11:26] [11:27] git newbie question of the day, is there a way to "git merge (or -b branch)"? [11:27] or does one need to add the remote/fetch it/merge into master and then delete the remote? [11:29] Trevinho: answered [11:30] seb128: if you didn't attach the remote, git pull remote/branch should work [11:30] sorry [11:30] git pull remote-url/branch should work [11:32] Trevinho: so, you are going to drop as well: [11:32] upstream-tag = extensions.gnome.org-v%(version)s [11:32] pristine-tar = False [11:32] correct? [11:32] (minimizing the file, with debian-branch + debian-tag only) [11:32] $ git pull https://git.launchpad.net/~3v1n0/ubuntu/+source/nautilus/ubuntu/bionic [11:32] remote: Repository does not exist. [11:33] I guess I do that wrong [11:33] no [11:33] use lp:~ .... [11:33] seb128: and git pull lp:~3v1n0/ubuntu/+source/nautilus/ubuntu/bionic ? [11:33] and no ubuntu/bionic [11:33] shrug, why is that so complex :( [11:33] seb128: ahah [11:33] git pull lp:~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic ? [11:33] youve to think you're pulling my repo [11:33] and from that repo a branch [11:33] that ^ [11:33] seb128: just add Trevinho's repo, you will need it forever! :) [11:34] yes... how can you live without a marco remote!? [11:34] I've one [11:34] but I still don't know what to do from it [11:34] so just git fetch that [11:34] prefer a marco remote or a locally installed version? :p [11:34] then [11:34] $ git remote [11:34] marco [11:34] origin [11:34] git fetch marco [11:34] git merge macro/ [11:34] (fetch is to refresh the repo metadata locally) [11:34] or in this case git pull marco ubuntu/bionic [11:35] $ git pull lp:~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic [11:35] it's crazy that git has not a variable for current branch though :o [11:35] is failing with "remote error: Repository '~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic' not found." [11:35] just for the record [11:35] eh, that's wrong url [11:35] git remote marco set-url lp:~3v1n0/ubuntu/+source/nautilus [11:35] $ git fetch marco [11:35] $ git merge marco/ubuntu/bionic [11:35] Already up-to-date. [11:36] k good one :) [11:36] $ git log [11:36] commit 08a65da59e9e785283015f5f4ca6d9a6920ffd2b [11:36] Author: Marco Trevisan (Treviño) [11:36] Date: Wed Jul 18 03:35:54 2018 +0200 [11:36] :( [11:36] git pull --tags marco [11:36] nautilus (1:3.26.3-0ubuntu4) bionic; urgency=medium [11:36] is the content [11:36] it didn't pull your branch [11:36] git pull marco ubuntu/bionic doesn't work? [11:37] Already up-to-date. [11:37] https://www.irccloud.com/pastebin/sp345Be1/ [11:38] ensure my remote matches that url [11:38] git remote -v [11:38] well, not same user ofc [11:38] $ git remote -v [11:38] marco git+ssh://seb128@git.launchpad.net/~3v1n0/ubuntu/+source/nautilus (fetch) [11:38] marco git+ssh://seb128@git.launchpad.net/~3v1n0/ubuntu/+source/nautilus (push) [11:38] and how's git log marco/ubuntu/bionic ? [11:39] commit 08a65da59e9e785283015f5f4ca6d9a6920ffd2b [11:39] Author: Marco Trevisan (Treviño) [11:39] Date: Wed Jul 18 03:35:54 2018 +0200 [11:39] at the topc [11:39] waaait [11:39] ubuntu/bionic-3-26-4 :D [11:39] eh, normal.. [11:39] marcoooooo! :) [11:39] shrug [11:39] why why why [11:39] ubuntu/bionic-3-26-4 was the branch eh... you had to check the pull-req, I didn't remember I changed was too long ago for my brain [11:40] why did you create a new branch? is that better? [11:40] cause I wanted for my repo to have ubuntu/bionic match the ubuntu's ubuntu/bionic, while doing work in different branches [11:41] it's just for working in clean way :) [11:41] so you have your local ubuntu/master and ubuntu/foo to point to upstream ones [11:41] why do you need ubuntu/bionic local checkout? [11:41] I didn't do this for shell, but it's a thing I prefer [11:41] in that case, you never need the projected tree [11:41] only keeping it in the remote is enough? [11:41] that's what I do, trying to always minimize the number of branches if I don't need to push them [11:42] Trevinho, can you check I did it right? [11:42] well, it's just my repo and I prefer to keep things around :), I don't like to trash anything... So even temp refs or antyhing else :P [11:42] shrug [11:42] seb128: you pushed already? [11:42] yes [11:43] $ gbp buildpackage -S [11:43] gbp:warning: Unknown compression type of Merge branch 'pristine-tar' of salsa.debian.org:gnome-team/nautilus into pristine-tar, assuming gzip [11:43] seb128: in any case for you the thing should change... just pulling is the same [11:43] gbp:error: Error creating nautilus_3.26.4.orig.tar.gz: Pristine-tar couldn't checkout "nautilus_3.26.4.orig.tar.gz": fatal: Path 'nautilus_3.26.4.orig.tar.gz.delta' does not exist in 'refs/heads/pristine-tar' [11:43] pristine-tar: git show refs/heads/pristine-tar:nautilus_3.26.4.orig.tar.gz.delta failed [11:43] pulled prisitne-tar from me/salsa? [11:43] guess not, let me redo the correct bootstrapping [11:43] seb128: nooo [11:43] can't I tell it to use the orig from the local dir instead? [11:43] seb128: just do this [11:44] git fetch salsa pristine-tar:pristine-tar [11:44] but I don't want their .gz [11:44] I want a .xz [11:44] and git fetch salsa upstream/3.26.x:upstream/3.26.x [11:44] screw those hippies :p [11:45] seb128: anyway, you have to push also the upstream/latest branch too [11:45] * seb128 does good old untar and cp debian/ over [11:45] errr not latest [11:45] 3.26.x [11:45] how could yo love that mess :-D [11:45] how do I tell gbp to use my local .xz [11:45] ah, I see they're all pushed there [11:45] I don't want a .gz [11:45] use whatever it makes for you :-D [11:46] I've no clue [11:46] no [11:46] k, well I copy the debian/ dir over [11:46] didrocks: ^ ? [11:46] I don't think it's possible to have gbp rebuilding some other formats than the one was imported [11:46] which was* [11:46] (checksum, and so on…) [11:46] can I ignore the pristine-tar thing? [11:46] seb128: maybe with --no-pristine-tar? [11:47] and tell it to use the local tarball? [11:47] doesn't seem to work [11:47] --git-tarball-dir=DIRECTORY [11:47] from the man page [11:47] Search for upstream tarballs in DIRECTORY instead of generating [11:47] them. If a tarball is not found here it will be generated never‐ [11:47] theless. [11:47] (never tested) [11:47] would be `--git-no-pristine-tar` but not sure it works [11:49] that failed and screwed my checkout [11:49] like I've lot of local diff now [11:49] git reset --hard :-D [11:49] thanks but I stop there [11:49] wasted enough time for today [11:49] I just cp the debian dir over and do a debuild -S -sa [11:49] seb128: you're vesting, not wasting :D [11:50] trust me I'm wasting [11:50] I've a long todo for the afternoon [11:50] fair enough, I just want that pkg in queue and forget about it :) [11:51] done [11:51] Trevinho, didrocks, thanks for helping with the git non sense [11:51] Trevinho, I only pushed the ubuntu/bionic branch, I guess upstream and pristine-tar were not needed since that version is already in cosmic, right? [11:51] yw seb128! sad it didn't work out [11:52] one day you'll understand any internal... and you'll call your next son "git" :-D [11:52] you can do that :p [11:52] didrocks, well, it somewhat worked, I merged and push that branch and the source is uploaded [11:52] it's a quite good name... short for calling when you need something [11:52] like "ugo" :D [11:53]