| Trevinho | if anyone want to test the 3.29 g-s stack... https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3337.2 ;-= | 01:13 |
|---|---|---|
| duflu | Laney, how's Taiwan? | 02:14 |
| Laney | morning duflu | 02:21 |
| duflu | Good morning | 02:21 |
| Laney | Well, the portion of it that I'm inhabiting smells worse and worse each day | 02:21 |
| Laney | 75 sweaty geeks in a non-ACed room does not a pleasant environment make | 02:21 |
| duflu | I guess not everyone is used to having to buy anti-perspirant | 02:22 |
| duflu | perspirant | 02:22 |
| duflu | Wow. So dyslexic today that I am correcting what's already correct | 02:22 |
| Laney | heh | 02:26 |
| duflu | Wait. A conference in a non-ACed room? That's odd | 02:30 |
| Laney | The lecture theatres are ACed, and the outside space is (a bit) | 02:32 |
| jbicha | Laney: are we targeting GNOME 3.30 for cosmic? Is it ok for me to upload gnome-desktop3 3.29.90 there? | 02:39 |
| jbicha | I won't have time to do as many uploads this cycle, but I needed gnome-desktop3 for testing something any way… | 02:40 |
| Laney | jbicha: yep, & sure if it works without having to update anything else | 02:45 |
| Laney | I'm trying to update things in exp where I can and then sync/merge | 02:45 |
| Laney | but this is annoying now since my key expired | 02:45 |
| jbicha | bribe Seb 🙃 | 02:46 |
| Laney | heh | 02:49 |
| Laney | should be able to do mutter/shell/g-c-c/g-s-d today I think | 02:49 |
| * Laney is writing the merge changelog for gnome-shell since Trevinho didn't 😈 | 02:50 | |
| duflu | Rules... | 02:51 |
| Laney | this is a good rule | 02:52 |
| didrocks | good morning | 05:46 |
| duflu | Morning didrocks | 05:48 |
| didrocks | hey duflu | 05:50 |
| Laney | hey didrocks | 06:24 |
| Laney | what go on | 06:24 |
| didrocks | nothing special, holidays tonight \o/ and you Laney? | 06:28 |
| didrocks | still having fun at debconf? | 06:28 |
| Laney | nice, where are you going? | 06:29 |
| Laney | debconf's good yeah, bbq last night and conference meal tonight | 06:29 |
| Laney | :> | 06:29 |
| didrocks | Laney: my parent's, in the Alps, mostly escaping the warm weather :) | 06:31 |
| didrocks | nice! | 06:31 |
| Laney | gosh | 06:31 |
| didrocks | after the raw meat night, the hyper-grilled one :p | 06:31 |
| Laney | I hope it's not a heatwave still when I get back | 06:32 |
| Laney | but https://www.theguardian.com/uk-news/2018/aug/02/heatwave-returns-to-london-and-south-east | 06:32 |
| Laney | not that I'm in either of those areas | 06:32 |
| Laney | hope alps is good! | 06:32 |
| didrocks | well, at least, older house with wide walls to protect you inside ;) | 06:33 |
| didrocks | but yeah, it's quite crazy and doesn't seem to want to stop | 06:33 |
| Laney | ya the house itself should be ok | 06:33 |
| Laney | and it won't be so insanely humid anyway | 06:33 |
| * Laney debsign gnome-shell 3.29.90 | 06:34 | |
| didrocks | yeah ;) got used to the humidity btw? | 06:34 |
| Laney | not so much | 06:34 |
| didrocks | Laney: the *best* release ever of G-S ;) | 06:34 |
| didrocks | (just saying…) | 06:34 |
| Laney | heheh | 06:34 |
| Laney | good list of contributors :> | 06:34 |
| didrocks | s/good/excellent/ | 06:34 |
| didrocks | you meant, I guess :p | 06:34 |
| Laney | I did a breaks on ubuntu-dock and yaru-theme | 06:34 |
| Laney | is that version from Trevinh_o in the silo a good one to release? | 06:35 |
| Laney | https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3337.2 | 06:35 |
| didrocks | Laney: ubuntu-dock might change version | 06:36 |
| didrocks | yaru-theme is ok | 06:36 |
| Laney | hmmmm???????? | 06:36 |
| Laney | there's a package of dock there to upload | 06:36 |
| didrocks | Laney: right, but I think the version number he pushed doesn't help us | 06:37 |
| Laney | so if I push that, that is the version | 06:37 |
| didrocks | as the numbers | 06:37 |
| Laney | ok, then I have to wait | 06:37 |
| didrocks | yes please ;) | 06:37 |
| didrocks | we'll discuss that today | 06:37 |
| didrocks | hum, I wonder if I prepare a branch for g-c-c | 06:37 |
| didrocks | to switch to the new schema value one g-s-d is uploaded for override support | 06:37 |
| didrocks | or let that to the one who will push new g-s-d | 06:37 |
| Laney | not sure what you mean | 06:38 |
| didrocks | basically, we are going to use the upstream gsettings key for volume override now | 06:38 |
| didrocks | so, g-c-c needs to change what key it's setting | 06:38 |
| didrocks | and we can drop our patch for g-s-d | 06:38 |
| Laney | ah right | 06:39 |
| didrocks | but I think it would be great to handle migrations (if people had the old key to true…) | 06:39 |
| didrocks | 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 |
| Laney | :> | 06:42 |
| Laney | I think I pushed those new versions in git, wouuld be great if you wanted to do the patch mangling before uploading | 06:42 |
| Laney | just pushed gnome-shell, will wait for you to argue about the versions | 06:44 |
| didrocks | Laney: which patch mangling? (you meant g-c-c/g-s-d?) | 06:44 |
| * Laney copies yaru meanwhile | 06:44 | |
| didrocks | yeah ;) | 06:44 |
| Laney | yeah | 06:44 |
| didrocks | I'll see if I have time before leaving, I can do that untested still ;) | 06:44 |
| didrocks | we can add the migration as a TODO as well | 06:45 |
| oSoMoN | hey didrocks, Laney | 06:45 |
| oSoMoN | good morning desktoppers | 06:45 |
| didrocks | good morning oSoMoN | 06:45 |
| Laney | yeah that can be done before release, not required now | 06:45 |
| Laney | hey oSoMoN | 06:45 |
| Laney | what is up | 06:45 |
| Laney | yaru-theme 18.10.1 in cosmic | 06:46 |
| Laney | Candidate copy target: https://api.launchpad.net/devel/ubuntu/+archive/primary | 06:46 |
| Laney | Copy [y|N]? y | 06:46 |
| Laney | 1 copy requested. | 06:46 |
| Laney | do I need to push something? | 06:46 |
| didrocks | nice! :-) | 06:46 |
| oSoMoN | getting ready for another hot day | 06:47 |
| didrocks | yeah :/ | 06:47 |
| oSoMoN | holidays in the Alps sounds nice | 06:47 |
| oSoMoN | I'm going to Brittany in a couple of weeks, hope to get temperate weather there | 06:48 |
| didrocks | crossing fingers! | 06:48 |
| Laney | I don't find a branch for yaru | 06:52 |
| Laney | and no Vcs- information mentioned, so guess nothing to push | 06:52 |
| Laney | https://github.com/ubuntu/yaru/commit/55fd8f8705b56e151147be709aea23f4c6604bea#diff-e6cb5fdaf65628feb1ea2f516e9ade55 looks like it's in there | 06:53 |
| didrocks | ok, wrote the migration script, was easy ;) | 07:02 |
| didrocks | Laney: Trevinho was supposed to add it? | 07:02 |
| didrocks | https://github.com/ubuntu/yaru/commit/ff479c1b6b84a636423c0e99164ee17f2ac38de1 | 07:03 |
| didrocks | that was probably after the current push? | 07:03 |
| Laney | didrocks: guess so, we got 18.10.1 | 07:05 |
| didrocks | makes sense | 07:06 |
| Laney | does mean that if I sponsor I can't push changes, and I can't make the release tag | 07:06 |
| didrocks | I think Trevinho pushed the release tag already | 07:08 |
| Laney | right, but that's weird because he didn't release it | 07:08 |
| didrocks | ask him :) but yeah, it's a similar situation than ubiquity, release-upgrader and other projects… | 07:09 |
| Laney | indeed | 07:09 |
| * didrocks looks at man for dh-migrations, it's not picking it up | 07:11 | |
| didrocks | argh, I was on the bionic branch… | 07:12 |
| Laney | heheh | 07:12 |
| didrocks | pushed the key change for g-c-c + mirgation script | 07:35 |
| didrocks | so, whoever will upload it to the distro… ;) | 07:35 |
| didrocks | and the migration script looks like it's working correctly | 07:35 |
| * Laney fixes changelog to mention didrocks instead :> | 07:36 | |
| didrocks | isn't /me puzzled, is that not "Didier Roche"? :p | 07:40 |
| didrocks | or you mean the final line? ;) | 07:40 |
| didrocks | I used dch -a for some reasons! avoiding the final blame :p | 07:40 |
| Laney | yep, the person that gets the trolls | 07:45 |
| Laney | ah, a new g-s-d with some 100% volume stuff too | 07:50 |
| didrocks | yep! that's why I pushed the patch to g-c-c ;) | 07:52 |
| Laney | yeh, I missed 3.29.90.1 | 07:52 |
| didrocks | there is no break/relationship btw between the Shell and g-s-d | 07:53 |
| didrocks | if one is before the other, it's just that the whole feature isn't supported | 07:54 |
| didrocks | (if g-s-d is first, the OSD/GNOME Shell will show volume at 100% even when volume is > 100%) | 07:54 |
| didrocks | 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 |
| Laney | sounds nicely handled | 07:55 |
| didrocks | backward compatilibity |m| | 07:55 |
| didrocks | (apart for the theme :p) | 07:56 |
| seb128 | good morning desktopers | 08:02 |
| oSoMoN | good morning seb128 | 08:04 |
| seb128 | lut oSoMoN, en forme ? | 08:04 |
| seb128 | hey Laney didrocks | 08:04 |
| seb128 | Trevinho, I don't understand what you ask me | 08:05 |
| seb128 | $ git tag | grep -E '^ubuntu/|^debian/|^upstream/' \ | 08:05 |
| seb128 | | xargs --no-run-if-empty git push origin | 08:05 |
| seb128 | no, I'm not going to type that barbarian command | 08:05 |
| oSoMoN | seb128, quelques courbatures (qui a dit que le sport c’est la santé?), mais sinon la forme, et toi? | 08:05 |
| seb128 | (neither am I going to rant about the complexity of all those git stuff) | 08:05 |
| seb128 | 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:06 |
| didrocks | salut seb128! | 08:08 |
| Laney | hi seb128 | 08:08 |
| seb128 | oSoMoN, do you plan to handle the SRU as well for that gnome-software fix? | 08:30 |
| oSoMoN | seb128, yes, I'll do that today | 08:31 |
| seb128 | oSoMoN, great, thx | 08:32 |
| Trevinho | seb128: hey Seb.... Any of the combinations, but push that tag :-) | 08:34 |
| seb128 | Trevinho, I'm doing it if you gave me decent command to do it | 08:34 |
| seb128 | $ git tag | grep -E '^ubuntu/|^debian/|^upstream/' \ | 08:34 |
| seb128 | | xargs --no-run-if-empty git push origin | 08:34 |
| seb128 | is not | 08:34 |
| seb128 | there has to be an easier way? | 08:35 |
| Trevinho | I've sent you 3 options | 08:35 |
| Trevinho | push tags does it too | 08:36 |
| seb128 | I didn't understand they were alternative ways | 08:36 |
| seb128 | so why that complex line if push tags is enough? :p | 08:36 |
| Trevinho | Or just the specific tag | 08:36 |
| Trevinho | That's to push all the tags we need when we import a new revisions for example | 08:37 |
| === as is now known as Guest30739 | ||
| Trevinho | Follow tags might work too | 08:37 |
| didrocks | yeah, that was why I put on the wiki page to set follow tags | 08:50 |
| seb128 | I though I had it set on that checkout | 08:51 |
| seb128 | how do I read that settings value? | 08:51 |
| didrocks | 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:52 | |
| didrocks | [push] | 08:53 |
| didrocks | followTags = true | 08:53 |
| didrocks | in .git/config in your repo | 08:53 |
| seb128 | $ git config --get push.followTags | 08:53 |
| seb128 | $ | 08:53 |
| seb128 | k | 08:53 |
| seb128 | that returns true once it's set | 08:53 |
| seb128 | To git+ssh://seb128@git.launchpad.net/~ubuntu-desktop/ubuntu/+source/nautilus | 08:54 |
| seb128 | * [new tag] ubuntu/1%3.26.4-0ubuntu2 -> ubuntu/1%3.26.4-0ubuntu2 | 08:54 |
| seb128 | * [new tag] upstream/3.26.4 -> upstream/3.26.4 | 08:54 |
| seb128 | Trevinho, ^ | 08:54 |
| Trevinho | Good one | 08:55 |
| seb128 | Trevinho, thanks for noticing! | 08:55 |
| didrocks | Trevinho: so, versioning & ubuntu-dock, I think you saw my answers, correct? | 08:59 |
| didrocks | 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 | 08:59 |
| Trevinho | 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 |
| didrocks | 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 |
| didrocks | Trevinho: that's the gist of it ^ | 09:00 |
| Trevinho | Ok... That's fine. Going with quilt | 09:00 |
| didrocks | keep it with a native version though, please! :) | 09:01 |
| Trevinho | As per version number itself is it fine to follow upstream that way? | 09:01 |
| Trevinho | Ah... So 18.10? | 09:01 |
| didrocks | well, you have 2 ways | 09:01 |
| didrocks | 63ubuntu1 | 09:01 |
| didrocks | or 18.10 | 09:01 |
| didrocks | I prefer the second, but I can understand you may want the first | 09:01 |
| Trevinho | Ah ok... I used 63ubuntu before... | 09:01 |
| Trevinho | with quilt gbp wanes the 1st | 09:01 |
| didrocks | that's fine as long as it's a native version :) | 09:02 |
| Trevinho | Or it won't find the tag... | 09:02 |
| didrocks | and stream down gbp.conf | 09:02 |
| didrocks | well, you can use --with quilt | 09:02 |
| Trevinho | Then I wanted to ask... Since some docs mention that if it's not in debian has to have -0... But.. | 09:02 |
| didrocks | that's when upstream != downstream | 09:02 |
| didrocks | here, we can consider ubuntu-dock as ubuntu being the upstream | 09:03 |
| didrocks | as we don't ship dash to dock, but rename the projects, and such | 09:03 |
| didrocks | (as there is upstream dash to dock in the repos for the fanclub) | 09:03 |
| Trevinho | Ok, in fact I had a push with that version too... Then the missing delimiter was feeling me bad :-P | 09:03 |
| didrocks | don't feel bad, or use 18.10 ;) | 09:04 |
| didrocks | or a mix, but unsure | 09:04 |
| didrocks | like 63+18.10? | 09:04 |
| Trevinho | Mh... Or 63ubuntu.18.10.1? | 09:05 |
| Trevinho | Or that's for sru only. | 09:05 |
| didrocks | sounds even weirder, what does other people think? | 09:05 |
| Trevinho | ? | 09:05 |
| didrocks | I have no strong opinion as long as it's a native version | 09:05 |
| Trevinho | Ok, waking to the office... Catch you later with the pushed code | 09:06 |
| seb128 | I don't have strong opinion, either way works | 09:10 |
| seb128 | 18.10 looks a bit nicer that 63ubuntu18 | 09:10 |
| didrocks | I think git is what really told you on what upstream version you are based on | 09:11 |
| ricotz | kenvandine, hi, https://launchpad.net/~gnome3-team/+snap/gnome-characters | 09:29 |
| === Please is now known as Guest64602 | ||
| tseliot | 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 |
| ubot5 | 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:06 |
| Trevinho | 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:51 |
| Trevinho | oSoMoN: hey, in https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-software?h=ubuntu%2Fbionic you've to push the tag too :) | 10:52 |
| oSoMoN | Trevinho, oh, I thought I had, lemme fix that | 10:53 |
| Trevinho | oSoMoN: in case `git tag | grep -E '^ubuntu/|^debian/|^upstream/' | xargs -r git push origin` does it :) | 10:56 |
| Trevinho | or `push --tags` although that might push other upstream tags we don't care about (and that L_aney) wanted to filter out :) | 10:56 |
| oSoMoN | Trevinho, I went for "git push origin ubuntu/3.28.1-0ubuntu4.18.04.3", that did it | 11:01 |
| Trevinho | yep, that's enough | 11:01 |
| Trevinho | just not to remember all the tags to push I use git tag way :) | 11:01 |
| Trevinho | 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 |
| Trevinho | I would need that for 18.04 though | 11:11 |
| Trevinho | or well, as is preferred | 11:11 |
| didrocks | Trevinho: who would you need that for 18.04? isn't it to make it compatible with latest G-S? | 11:12 |
| Trevinho | didrocks: no not that patch | 11:13 |
| Trevinho | didrocks: but I want to cherry-pick other fixes | 11:13 |
| Trevinho | see the current changelog | 11:13 |
| Trevinho | for the one I proposed | 11:13 |
| didrocks | Trevinho: ah, sure, I don't think we need to do those as quilt patches | 11:14 |
| Trevinho | ok, fine | 11:14 |
| Trevinho | so let's continue this way, in case we can always use `--with quilt` and that's it | 11:14 |
| didrocks | yep! | 11:23 |
| seb128 | back | 11:25 |
| seb128 | tseliot, thx, I've a look | 11:25 |
| seb128 | Trevinho, let me have a look to the SRU | 11:25 |
| seb128 | 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 |
| seb128 | 11:26 | |
| seb128 | git newbie question of the day, is there a way to "git merge <remove-url(/branch)?> (or -b branch)"? | 11:27 |
| seb128 | or does one need to add the remote/fetch it/merge into master and then delete the remote? | 11:27 |
| didrocks | Trevinho: answered | 11:29 |
| didrocks | seb128: if you didn't attach the remote, git pull remote/branch should work | 11:30 |
| didrocks | sorry | 11:30 |
| didrocks | git pull remote-url/branch should work | 11:30 |
| didrocks | Trevinho: so, you are going to drop as well: | 11:32 |
| didrocks | upstream-tag = extensions.gnome.org-v%(version)s | 11:32 |
| didrocks | pristine-tar = False | 11:32 |
| didrocks | correct? | 11:32 |
| didrocks | (minimizing the file, with debian-branch + debian-tag only) | 11:32 |
| seb128 | $ git pull https://git.launchpad.net/~3v1n0/ubuntu/+source/nautilus/ubuntu/bionic | 11:32 |
| seb128 | remote: Repository does not exist. | 11:32 |
| seb128 | I guess I do that wrong | 11:33 |
| Trevinho | no | 11:33 |
| Trevinho | use lp:~ .... | 11:33 |
| didrocks | seb128: and git pull lp:~3v1n0/ubuntu/+source/nautilus/ubuntu/bionic ? | 11:33 |
| Trevinho | and no ubuntu/bionic | 11:33 |
| seb128 | shrug, why is that so complex :( | 11:33 |
| Trevinho | seb128: ahah | 11:33 |
| didrocks | git pull lp:~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic ? | 11:33 |
| Trevinho | youve to think you're pulling my repo | 11:33 |
| Trevinho | and from that repo a branch | 11:33 |
| Trevinho | that ^ | 11:33 |
| didrocks | seb128: just add Trevinho's repo, you will need it forever! :) | 11:33 |
| Trevinho | yes... how can you live without a marco remote!? | 11:34 |
| seb128 | I've one | 11:34 |
| seb128 | but I still don't know what to do from it | 11:34 |
| Trevinho | so just git fetch that | 11:34 |
| didrocks | prefer a marco remote or a locally installed version? :p | 11:34 |
| Trevinho | then | 11:34 |
| seb128 | $ git remote | 11:34 |
| seb128 | marco | 11:34 |
| seb128 | origin | 11:34 |
| didrocks | git fetch marco | 11:34 |
| didrocks | git merge macro/<branch> | 11:34 |
| didrocks | (fetch is to refresh the repo metadata locally) | 11:34 |
| Trevinho | or in this case git pull marco ubuntu/bionic | 11:34 |
| seb128 | $ git pull lp:~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic | 11:35 |
| Trevinho | it's crazy that git has not a variable for current branch though :o | 11:35 |
| seb128 | is failing with "remote error: Repository '~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic' not found." | 11:35 |
| seb128 | just for the record | 11:35 |
| Trevinho | eh, that's wrong url | 11:35 |
| Trevinho | git remote marco set-url lp:~3v1n0/ubuntu/+source/nautilus | 11:35 |
| seb128 | $ git fetch marco | 11:35 |
| seb128 | $ git merge marco/ubuntu/bionic | 11:35 |
| seb128 | Already up-to-date. | 11:35 |
| Trevinho | k good one :) | 11:36 |
| seb128 | $ git log | 11:36 |
| seb128 | commit 08a65da59e9e785283015f5f4ca6d9a6920ffd2b | 11:36 |
| seb128 | Author: Marco Trevisan (Treviño) <mail@3v1n0.net> | 11:36 |
| seb128 | Date: Wed Jul 18 03:35:54 2018 +0200 | 11:36 |
| seb128 | :( | 11:36 |
| Trevinho | git pull --tags marco | 11:36 |
| seb128 | nautilus (1:3.26.3-0ubuntu4) bionic; urgency=medium | 11:36 |
| seb128 | is the content | 11:36 |
| seb128 | it didn't pull your branch | 11:36 |
| Trevinho | git pull marco ubuntu/bionic doesn't work? | 11:36 |
| seb128 | Already up-to-date. | 11:37 |
| Trevinho | https://www.irccloud.com/pastebin/sp345Be1/ | 11:37 |
| Trevinho | ensure my remote matches that url | 11:38 |
| Trevinho | git remote -v | 11:38 |
| Trevinho | well, not same user ofc | 11:38 |
| seb128 | $ git remote -v | 11:38 |
| seb128 | marcogit+ssh://seb128@git.launchpad.net/~3v1n0/ubuntu/+source/nautilus (fetch) | 11:38 |
| seb128 | marcogit+ssh://seb128@git.launchpad.net/~3v1n0/ubuntu/+source/nautilus (push) | 11:38 |
| Trevinho | and how's git log marco/ubuntu/bionic ? | 11:38 |
| seb128 | commit 08a65da59e9e785283015f5f4ca6d9a6920ffd2b | 11:39 |
| seb128 | Author: Marco Trevisan (Treviño) <mail@3v1n0.net> | 11:39 |
| seb128 | Date: Wed Jul 18 03:35:54 2018 +0200 | 11:39 |
| seb128 | at the topc | 11:39 |
| Trevinho | waaait | 11:39 |
| Trevinho | ubuntu/bionic-3-26-4 :D | 11:39 |
| Trevinho | eh, normal.. | 11:39 |
| didrocks | marcoooooo! :) | 11:39 |
| seb128 | shrug | 11:39 |
| seb128 | why why why | 11:39 |
| Trevinho | 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:39 |
| seb128 | why did you create a new branch? is that better? | 11:40 |
| Trevinho | cause I wanted for my repo to have ubuntu/bionic match the ubuntu's ubuntu/bionic, while doing work in different branches | 11:40 |
| Trevinho | it's just for working in clean way :) | 11:41 |
| Trevinho | so you have your local ubuntu/master and ubuntu/foo to point to upstream ones | 11:41 |
| didrocks | why do you need ubuntu/bionic local checkout? | 11:41 |
| Trevinho | I didn't do this for shell, but it's a thing I prefer | 11:41 |
| didrocks | in that case, you never need the projected tree | 11:41 |
| didrocks | only keeping it in the remote is enough? | 11:41 |
| didrocks | that's what I do, trying to always minimize the number of branches if I don't need to push them | 11:41 |
| seb128 | Trevinho, can you check I did it right? | 11:42 |
| Trevinho | 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 |
| seb128 | shrug | 11:42 |
| Trevinho | seb128: you pushed already? | 11:42 |
| seb128 | yes | 11:42 |
| seb128 | $ gbp buildpackage -S | 11:43 |
| seb128 | gbp:warning: Unknown compression type of Merge branch 'pristine-tar' of salsa.debian.org:gnome-team/nautilus into pristine-tar, assuming gzip | 11:43 |
| Trevinho | seb128: in any case for you the thing should change... just pulling is the same | 11:43 |
| seb128 | 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 |
| seb128 | pristine-tar: git show refs/heads/pristine-tar:nautilus_3.26.4.orig.tar.gz.delta failed | 11:43 |
| Trevinho | pulled prisitne-tar from me/salsa? | 11:43 |
| seb128 | guess not, let me redo the correct bootstrapping | 11:43 |
| Trevinho | seb128: nooo | 11:43 |
| seb128 | can't I tell it to use the orig from the local dir instead? | 11:43 |
| Trevinho | seb128: just do this | 11:43 |
| Trevinho | git fetch salsa pristine-tar:pristine-tar | 11:44 |
| seb128 | but I don't want their .gz | 11:44 |
| seb128 | I want a .xz | 11:44 |
| Trevinho | and git fetch salsa upstream/3.26.x:upstream/3.26.x | 11:44 |
| seb128 | screw those hippies :p | 11:44 |
| Trevinho | 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 | |
| Trevinho | errr not latest | 11:45 |
| Trevinho | 3.26.x | 11:45 |
| Trevinho | how could yo love that mess :-D | 11:45 |
| seb128 | how do I tell gbp to use my local .xz | 11:45 |
| Trevinho | ah, I see they're all pushed there | 11:45 |
| seb128 | I don't want a .gz | 11:45 |
| Trevinho | use whatever it makes for you :-D | 11:45 |
| Trevinho | I've no clue | 11:46 |
| seb128 | no | 11:46 |
| seb128 | k, well I copy the debian/ dir over | 11:46 |
| Trevinho | didrocks: ^ ? | 11:46 |
| didrocks | I don't think it's possible to have gbp rebuilding some other formats than the one was imported | 11:46 |
| didrocks | which was* | 11:46 |
| didrocks | (checksum, and so on…) | 11:46 |
| seb128 | can I ignore the pristine-tar thing? | 11:46 |
| Trevinho | seb128: maybe with --no-pristine-tar? | 11:46 |
| seb128 | and tell it to use the local tarball? | 11:47 |
| seb128 | doesn't seem to work | 11:47 |
| didrocks | --git-tarball-dir=DIRECTORY | 11:47 |
| didrocks | from the man page | 11:47 |
| didrocks | Search for upstream tarballs in DIRECTORY instead of generating | 11:47 |
| didrocks | them. If a tarball is not found here it will be generated never‐ | 11:47 |
| didrocks | theless. | 11:47 |
| didrocks | (never tested) | 11:47 |
| Trevinho | would be `--git-no-pristine-tar` but not sure it works | 11:47 |
| seb128 | that failed and screwed my checkout | 11:49 |
| seb128 | like I've lot of local diff now | 11:49 |
| Trevinho | git reset --hard :-D | 11:49 |
| seb128 | thanks but I stop there | 11:49 |
| seb128 | wasted enough time for today | 11:49 |
| seb128 | I just cp the debian dir over and do a debuild -S -sa | 11:49 |
| Trevinho | seb128: you're vesting, not wasting :D | 11:49 |
| seb128 | trust me I'm wasting | 11:50 |
| seb128 | I've a long todo for the afternoon | 11:50 |
| Trevinho | fair enough, I just want that pkg in queue and forget about it :) | 11:50 |
| seb128 | done | 11:51 |
| seb128 | Trevinho, didrocks, thanks for helping with the git non sense | 11:51 |
| seb128 | 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 |
| didrocks | yw seb128! sad it didn't work out | 11:51 |
| Trevinho | one day you'll understand any internal... and you'll call your next son "git" :-D | 11:52 |
| seb128 | you can do that :p | 11:52 |
| seb128 | didrocks, well, it somewhat worked, I merged and push that branch and the source is uploaded | 11:52 |
| Trevinho | it's a quite good name... short for calling when you need something | 11:52 |
| Trevinho | like "ugo" :D | 11:52 |
| didrocks | seb128: yeah, but it means that if version_format_in_ubuntu != version_format_in_debian and we base on the debian branch, we are screwed | 11:53 |
| seb128 | I think we can re-upload an different orign if we do a -S -sa | 11:53 |
| seb128 | it just means that forces us to move back to .gz though? | 11:53 |
| Trevinho | didrocks: for the dock you want me to finalize the changelog, tag and push to the bileto or you handle that? | 11:53 |
| seb128 | were .xz was a mirror space win | 11:53 |
| didrocks | seb128: ah, I thought with -sa launchpad would refuse telling it has one already with a different checksum | 11:54 |
| seb128 | the filename is different | 11:54 |
| didrocks | Trevinho: finalize the changelog/tag/push please | 11:54 |
| seb128 | I *think* it works | 11:54 |
| seb128 | but I didn't try for a while | 11:54 |
| didrocks | could be | 11:54 |
| didrocks | Trevinho: I can't test it though before my holidays (meeting first and need to leave soon afterwards) | 11:55 |
| didrocks | and you didn't push to the PR? | 11:55 |
| Trevinho | didrocks: well, let's do that I push the PR, then laney can finish the testing | 11:55 |
| didrocks | yep | 11:56 |
| didrocks | Trevinho: even better, request Michele the rights | 11:56 |
| didrocks | Trevinho: that way, you can merge it back yourself | 11:56 |
| Trevinho | didrocks: ok, pushed the PR though | 11:56 |
| didrocks | ack | 11:56 |
| didrocks | hum | 11:56 |
| didrocks | we told that you would remove upstream-tag and pristine-tar | 11:56 |
| didrocks | those aren't necessary, please remove them :) | 11:57 |
| didrocks | the rest LGTM | 11:57 |
| Trevinho | ah, I thought you meant only master | 11:57 |
| didrocks | nope, everything not necessary | 11:57 |
| Trevinho | upstream-tag would be necessary in case we swtich to quilt... | 11:57 |
| didrocks | but until then, we don't need it | 11:57 |
| didrocks | so, let's remove :) | 11:57 |
| Trevinho | (when I used patches, it would use)... | 11:57 |
| Trevinho | mh, ok | 11:57 |
| Trevinho | just like to be preemptive :) | 11:57 |
| didrocks | I don't want quilt for things cherry-picked | 11:58 |
| didrocks | and that will force it | 11:58 |
| didrocks | anyway, meeting, bbl | 11:59 |
| Trevinho | didrocks: ok, that's re-pushed with almost gbp changes | 12:02 |
| Trevinho | almost no* | 12:02 |
| Trevinho | seb128: anyway in my setup gbp generates .xz files | 12:09 |
| Trevinho | I always forget, how I do generate the control out of the .in? | 12:17 |
| didrocks | debian/rules clean should do it | 12:17 |
| didrocks | Trevinho: you still had some ubuntu/ tags… | 12:20 |
| Trevinho | didrocks: in my repo you mean? | 12:24 |
| Trevinho | yeah, old pushes... I might have not push --delete'd them all, you can delete those | 12:24 |
| Trevinho | as I was lazy enough to only use git push gh:dash-to-dock without having a remote :-D | 12:25 |
| Trevinho | so not a list of tags | 12:25 |
| Trevinho | ah, I need to update bionic too, I was forgetting | 12:25 |
| didrocks | Trevinho: so, I'm doing the tag deletion, please do it as well :) | 12:28 |
| Trevinho | yep | 12:29 |
| Trevinho | didrocks: from a session file you can't set env variables, right? | 12:33 |
| didrocks | Trevinho: unfortunately no, you can do it from the session .desktop file though | 12:34 |
| Trevinho | didrocks: data/org.gnome.Shell.desktop.in.in so? | 12:35 |
| Trevinho | or the one used by gnome-session? | 12:35 |
| didrocks | Trevinho: the ones used by gnome-session | 12:35 |
| Trevinho | didrocks: we don't have a git repo for ubunut-session, right? | 12:39 |
| didrocks | it's gnome-session? | 12:39 |
| Trevinho | nvm, yeah, I remembered 1ms after asking :) | 12:39 |
| didrocks | Trevinho: too much latency :p | 12:40 |
| Trevinho | didrocks: mh, the way I see it's done in session files is still using env though (I thought it was using something cleaner), but since that calls the shell sesssion .desktop file anyway, wouldn't that work? mhmhmh | 12:51 |
| Trevinho | didrocks: so, for my purpose that's enough :P | 12:55 |
| didrocks | Trevinho: well, that clearly works as it's how we are selecting the SHELL mode :) | 12:59 |
| kenvandine | ricotz, yeah, i got the mail for that one today | 13:08 |
| kenvandine | i'll fix it | 13:08 |
| ricotz | kenvandine, ok, but it already failed multiple times not just today ;) | 13:38 |
| kenvandine | ricotz, yeah, i wasn't subscribed to the emails until yesterday | 13:38 |
| kenvandine | now i see them :) | 13:38 |
| ricotz | ok | 13:39 |
| kenvandine | ricotz, and i've fixed the build upstream so it will build on the next sync | 13:40 |
| ricotz | kenvandine, thanks | 13:41 |
| kenvandine | ricotz, np | 13:41 |
| ricotz | less launchpad spam :) | 13:41 |
| kenvandine | oSoMoN, did you see the email about bug 1780996 ? | 13:41 |
| ubot5 | bug 1780996 in libomxil-bellagio (Ubuntu Bionic) "Convert triggers to noawait" [Undecided,Triaged] https://launchpad.net/bugs/1780996 | 13:41 |
| kenvandine | ricotz, yeah! | 13:41 |
| kenvandine | oSoMoN, it's marked as fixed in bionic for libreoffice but needs a fix in xenial too | 13:42 |
| oSoMoN | kenvandine, I’ve seen it, and am looking into it as I write | 13:44 |
| kenvandine | awesome | 13:44 |
| ricotz | oSoMoN, hi :), don't forget about libreoffice 6.0.6 | 13:49 |
| oSoMoN | ricotz, yeah, I'm not forgetting! | 13:55 |
| ricotz | oSoMoN, thank you | 14:01 |
| ricotz | (6.0.6.2 is officially final) | 14:02 |
| seb128 | how do I "uncommit" with git? | 14:51 |
| seb128 | fuck, that's annoying, trying to be helpful and sponsor a change for dgadomski but someone else did cowboy upload and now git disagrees with the archive | 14:52 |
| seb128 | like i have other things to finish and I didn't plan to have to fight with the vcs for another half an hour :/ | 14:52 |
| ogra | seb128, reset | 14:53 |
| seb128 | no | 14:53 |
| seb128 | I pushed that change to launchpad | 14:53 |
| seb128 | so it's not as easy, or I need to checkout some previous head and force push or something | 14:54 |
| ogra | oh ... | 14:54 |
| ogra | git push -f origin master | 14:54 |
| ogra | or some such (depends if you are in master etc ) | 14:55 |
| ogra | (origin being the remote ) | 14:55 |
| ogra | thats largely the same as bzr's --force-overwrite | 14:56 |
| seb128 | well, first I need to roll back 3 commits | 14:56 |
| seb128 | which in bzr I would have done "bzr uncommit; bzr uncommit; bzr uncommit; bzr revert; bzr push --overwrite" | 14:57 |
| * seb128 tries "git reset --hard HEAD^^^" | 14:57 | |
| ogra | yeah, you do that with checkout | 14:57 |
| ogra | reset actually resets the branch to original state, checkout allows you to go back commit by commit (and keeping the changes but dropping the log entry) | 14:58 |
| Trevinho | seb128: also the tag in gdm is missing :) | 15:07 |
| Trevinho | seb128: git for uncommit... I seent you my .gitconfig... | 15:07 |
| Trevinho | there's an uncommit there | 15:07 |
| Trevinho | or... | 15:07 |
| seb128 | $ git config --get push.followTags | 15:07 |
| seb128 | true | 15:07 |
| seb128 | Trevinho, I fixed it | 15:07 |
| Trevinho | seb128: push --tags :) | 15:08 |
| seb128 | I did "git reset --hard HEAD^^^" & commit push -f | 15:08 |
| Trevinho | git reset --hard HEAD~1 will do it (but be worried) | 15:08 |
| seb128 | Trevinho, isn't push.followTags = true supposed to do that? | 15:08 |
| Trevinho | seb128: in theory... but it doesn't seem to work so well | 15:08 |
| Trevinho | so, just use push --tags | 15:08 |
| seb128 | https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/tag/?id=ubuntu/3.28.2-3ubuntu4 | 15:09 |
| Trevinho | seb128: basically to go back imagine that for $ANY_REFERENCE you can use a format like $REFERENCE~[numbers of commit to go back] or as many ^ as many you want go back | 15:09 |
| Trevinho | so HEAD~4 points to the 4th commit before head | 15:09 |
| Trevinho | you can also just do `reset --hard origin/ubuntu/master` to go back to clean state | 15:10 |
| Trevinho | i miss the ubuntu2 | 15:10 |
| Trevinho | https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/commit/?id=e210e5d98c5a822128c793c00e19d70fccf34dbb | 15:10 |
| Trevinho | has not a tag | 15:11 |
| seb128 | right, just I already had pushed to ubuntu/master on launchpad | 15:11 |
| seb128 | Trevinho, https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/tag/?id=ubuntu/3.28.2-3ubuntu2 ? | 15:11 |
| === tdaitx_ is now known as tdaitx | ||
| Trevinho | seb128: also you did those orig imports? | 15:11 |
| Trevinho | nope I did | 15:11 |
| Trevinho | :) | 15:11 |
| seb128 | 3.28.2-3ubuntu2 I did | 15:11 |
| seb128 | since they cowboy uploaded it | 15:12 |
| Trevinho | but anyway https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/commit/?id=e210e5d98c5a822128c793c00e19d70fccf34dbb is not there | 15:12 |
| seb128 | I used gbp import-dsc | 15:12 |
| seb128 | what are you asking me now? | 15:12 |
| Trevinho | git tag "ubuntu/3.28.2-3ubuntu2" e210e5d98c5a822128c793c00e19d70fccf34dbb -f | 15:12 |
| Trevinho | then | 15:13 |
| Trevinho | git push "ubuntu/3.28.2-3ubuntu2" -f | 15:13 |
| Trevinho | it looks like you changed that tag in the run... | 15:13 |
| Trevinho | so you've to make sure it points to the right commit and then force-push it | 15:13 |
| seb128 | the tag exists but on a commit that got reverted | 15:13 |
| Trevinho | [TBH all this is not nice :)] | 15:13 |
| ogra | sometimes i think git was only created so people can sell books about it ... its like learning another language with totally mad grammar | 15:13 |
| seb128 | I guess the reset HEAD^^^ and push -f didn't delete it | 15:13 |
| Trevinho | seb128: no | 15:13 |
| Trevinho | to delete | 15:14 |
| Trevinho | you've to do | 15:14 |
| seb128 | I did delete it manually | 15:14 |
| Trevinho | git push --delete "TAG NAME" | 15:14 |
| Trevinho | and that will delete from remote | 15:14 |
| seb128 | because dsc-import complained | 15:14 |
| Trevinho | indeed | 15:14 |
| Trevinho | but if you pushed you've to remove it from remote too | 15:14 |
| seb128 | 'ubuntu/3.28.2-3ubuntu2' does not appear to be a git repository | 15:14 |
| seb128 | in your push command | 15:14 |
| Trevinho | err | 15:14 |
| seb128 | git tag push I guess? | 15:15 |
| Trevinho | add git push origin ... | 15:15 |
| Trevinho | and then the rest | 15:15 |
| Trevinho | also for https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/commit/?id=d03c139448733f34f11b9764092df251a5990e6a you did't use gbp right? :) | 15:17 |
| seb128 | no, I had a diff, not a dsc | 15:17 |
| seb128 | I did patch -p1 < and git commit | 15:17 |
| seb128 | why ? | 15:17 |
| seb128 | also I don't know what's the heck with the tag | 15:18 |
| seb128 | Trevinho, https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/tag/?id=ubuntu/3.28.2-3ubuntu2 | 15:19 |
| seb128 | better? | 15:19 |
| seb128 | Trevinho, what's the issue with the other commit | 15:19 |
| seb128 | crap, I used dch one too much and did skip ubuntu3 revision | 15:19 |
| seb128 | oh well | 15:19 |
| seb128 | it's uploaded, too late for changing it | 15:19 |
| seb128 | Trevinho, vcs is fine now? | 15:19 |
| seb128 | I think it is, stepping out for a bit | 15:24 |
| Trevinho | seb128: yeah, thanks... Sorry I had a call | 15:46 |
| jbicha | fossfreedom: mutter 3.29.90 was uploaded to cosmic (& Debian experimental) so when you get a chance, can you update budgie-desktop for it? thanks | 16:07 |
| jbicha | Laney: did you see https://gitlab.gnome.org/help/workflow/repository_mirroring#pushing-to-a-remote-repository ? | 16:44 |
| jbicha | it sounds useful for our ubuntu-desktop branches derived from Debian, but I don't know if we'd be able to set up a limited LP account just for that | 16:45 |
| Beret | hrm | 18:19 |
| jbicha | seb128: could you maybe follow up with Chris about handling bug 1784974? (since he did the last bionic mozjs52 upload) | 18:28 |
| ubot5 | bug 1784974 in mozjs52 (Ubuntu Bionic) "Update mozjs52 to 52.1.9" [Undecided,Triaged] https://launchpad.net/bugs/1784974 | 18:28 |
| Trevinho | jbicha: that's cool... so we might use gitlab for patch and merge management in case | 18:33 |
| jbicha | well that wasn't exactly my intent. It would be nice if we didn't need to manually push the pristine-tar & upstream/* branches (with tags) to LP | 18:36 |
| Trevinho | yep | 18:42 |
| Trevinho | git log | 18:42 |
| Trevinho | ops :-D | 18:42 |
| seb128 | jbicha, k, but next week, he's off today and tomorrow | 20:27 |
| Trevinho | kenvandine: can you land this SRU? https://bileto.ubuntu.com/#/ticket/3338 | 20:42 |
| kenvandine | Trevinho, looking | 21:24 |
| Trevinho | thanks | 21:24 |
| kenvandine | Trevinho, publishing | 21:26 |
| Trevinho | kenvandine: cool thanks | 21:46 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!