Trevinhoif anyone want to test the  3.29 g-s stack... https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3337.2 ;-=01:13
dufluLaney, how's Taiwan?02:14
Laneymorning duflu02:21
dufluGood morning02:21
LaneyWell, the portion of it that I'm inhabiting smells worse and worse each day02:21
Laney75 sweaty geeks in a non-ACed room does not a pleasant environment make02:21
dufluI guess not everyone is used to having to buy anti-perspirant02:22
dufluWow. So dyslexic today that I am correcting what's already correct02:22
dufluWait. A conference in a non-ACed room? That's odd02:30
LaneyThe lecture theatres are ACed, and the outside space is (a bit)02:32
jbichaLaney: are we targeting GNOME 3.30 for cosmic? Is it ok for me to upload gnome-desktop3 3.29.90 there?02:39
jbichaI won't have time to do as many uploads this cycle, but I needed gnome-desktop3 for testing something any way…02:40
Laneyjbicha: yep, & sure if it works without having to update anything else02:45
LaneyI'm trying to update things in exp where I can and then sync/merge02:45
Laneybut this is annoying now since my key expired02:45
jbichabribe Seb 🙃02:46
Laneyshould be able to do mutter/shell/g-c-c/g-s-d today I think02:49
* Laney is writing the merge changelog for gnome-shell since Trevinho didn't 😈02:50
Laneythis is a good rule02:52
didrocksgood morning05:46
dufluMorning didrocks05:48
didrockshey duflu05:50
Laneyhey didrocks06:24
Laneywhat go on06:24
didrocksnothing special, holidays tonight \o/ and you Laney?06:28
didrocksstill having fun at debconf?06:28
Laneynice, where are you going?06:29
Laneydebconf's good yeah, bbq last night and conference meal tonight06:29
didrocksLaney: my parent's, in the Alps, mostly escaping the warm weather :)06:31
didrocksafter the raw meat night, the hyper-grilled one :p06:31
LaneyI hope it's not a heatwave still when I get back06:32
Laneybut https://www.theguardian.com/uk-news/2018/aug/02/heatwave-returns-to-london-and-south-east06:32
Laneynot that I'm in either of those areas06:32
Laneyhope alps is good!06:32
didrockswell, at least, older house with wide walls to protect you inside ;)06:33
didrocksbut yeah, it's quite crazy and doesn't seem to want to stop06:33
Laneyya the house itself should be ok06:33
Laneyand it won't be so insanely humid anyway06:33
* Laney debsign gnome-shell 3.29.9006:34
didrocksyeah ;) got used to the humidity btw?06:34
Laneynot so much06:34
didrocksLaney: the *best* release ever of G-S ;)06:34
didrocks(just saying…)06:34
Laneygood list of contributors :>06:34
didrocksyou meant, I guess :p06:34
LaneyI did a breaks on ubuntu-dock and yaru-theme06:34
Laneyis that version from Trevinh_o in the silo a good one to release?06:35
didrocksLaney: ubuntu-dock might change version06:36
didrocksyaru-theme is ok06:36
Laneythere's a package of dock there to upload06:36
didrocksLaney: right, but I think the version number he pushed doesn't help us06:37
Laneyso if I push that, that is the version06:37
didrocksas the numbers06:37
Laneyok, then I have to wait06:37
didrocksyes please ;)06:37
didrockswe'll discuss that today06:37
didrockshum, I wonder if I prepare a branch for g-c-c06:37
didrocksto switch to the new schema value one g-s-d is uploaded for override support06:37
didrocksor let that to the one who will push new g-s-d06:37
Laneynot sure what you mean06:38
didrocksbasically, we are going to use the upstream gsettings key for volume override now06:38
didrocksso, g-c-c needs to change what key it's setting06:38
didrocksand we can drop our patch for g-s-d06:38
Laneyah right06:39
didrocksbut I think it would be great to handle migrations (if people had the old key to true…)06:39
didrocksLaney: 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
LaneyI think I pushed those new versions in git, wouuld be great if you wanted to do the patch mangling before uploading06:42
Laneyjust pushed gnome-shell, will wait for you to argue about the versions06:44
didrocksLaney: which patch mangling? (you meant g-c-c/g-s-d?)06:44
* Laney copies yaru meanwhile06:44
didrocksyeah ;)06:44
didrocksI'll see if I have time before leaving, I can do that untested still ;)06:44
didrockswe can add the migration as a TODO as well06:45
oSoMoNhey didrocks, Laney06:45
oSoMoNgood morning desktoppers06:45
didrocksgood morning oSoMoN06:45
Laneyyeah that can be done before release, not required now06:45
Laneyhey oSoMoN06:45
Laneywhat is up06:45
Laneyyaru-theme 18.10.1 in cosmic06:46
LaneyCandidate copy target: https://api.launchpad.net/devel/ubuntu/+archive/primary06:46
LaneyCopy [y|N]? y06:46
Laney1 copy requested.06:46
Laneydo I need to push something?06:46
didrocksnice! :-)06:46
oSoMoNgetting ready for another hot day06:47
didrocksyeah :/06:47
oSoMoNholidays in the Alps sounds nice06:47
oSoMoNI'm going to Brittany in a couple of weeks, hope to get temperate weather there06:48
didrockscrossing fingers!06:48
LaneyI don't find a branch for yaru06:52
Laneyand no Vcs- information mentioned, so guess nothing to push06:52
Laneyhttps://github.com/ubuntu/yaru/commit/55fd8f8705b56e151147be709aea23f4c6604bea#diff-e6cb5fdaf65628feb1ea2f516e9ade55 looks like it's in there06:53
didrocksok, wrote the migration script, was easy ;)07:02
didrocksLaney: Trevinho was supposed to add it?07:02
didrocksthat was probably after the current push?07:03
Laneydidrocks: guess so, we got 18.10.107:05
didrocksmakes sense07:06
Laneydoes mean that if I sponsor I can't push changes, and I can't make the release tag07:06
didrocksI think Trevinho pushed the release tag already07:08
Laneyright, but that's weird because he didn't release it07:08
didrocksask him :) but yeah, it's a similar situation than ubiquity, release-upgrader and other projects…07:09
* didrocks looks at man for dh-migrations, it's not picking it up07:11
didrocksargh, I was on the bionic branch…07:12
didrockspushed the key change for g-c-c + mirgation script07:35
didrocksso, whoever will upload it to the distro… ;)07:35
didrocksand the migration script looks like it's working correctly07:35
* Laney fixes changelog to mention didrocks instead :>07:36
didrocksisn't /me puzzled, is that not "Didier Roche"? :p07:40
didrocksor you mean the final line? ;)07:40
didrocksI used dch -a for some reasons! avoiding the final blame :p07:40
Laneyyep, the person that gets the trolls07:45
Laneyah, a new g-s-d with some 100% volume stuff too07:50
didrocksyep! that's why I pushed the patch to g-c-c ;)07:52
Laneyyeh, I missed
didrocksthere is no break/relationship btw between the Shell and g-s-d07:53
didrocksif one is before the other, it's just that the whole feature isn't supported07:54
didrocks(if g-s-d is first, the OSD/GNOME Shell will show volume at 100% even when volume is > 100%)07:54
didrocksif 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 manually07:55
Laneysounds nicely handled07:55
didrocksbackward compatilibity |m|07:55
didrocks(apart for the theme :p)07:56
seb128good morning desktopers08:02
oSoMoNgood morning seb12808:04
seb128lut oSoMoN, en forme ?08:04
seb128hey Laney didrocks08:04
seb128Trevinho, I don't understand what you ask me08:05
seb128$ git tag | grep -E '^ubuntu/|^debian/|^upstream/' \08:05
seb128   | xargs --no-run-if-empty  git push origin08:05
seb128no, I'm not going to type that barbarian command08:05
oSoMoNseb128, 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
seb128oSoMoN, 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 :p08:06
didrockssalut seb128!08:08
Laneyhi seb12808:08
seb128oSoMoN, do you plan to handle the SRU as well for that gnome-software fix?08:30
oSoMoNseb128, yes, I'll do that today08:31
seb128oSoMoN, great, thx08:32
Trevinhoseb128: hey Seb.... Any of the combinations, but push that tag :-)08:34
seb128Trevinho, I'm doing it if you gave me decent command to do it08:34
seb128 $ git tag | grep -E '^ubuntu/|^debian/|^upstream/' \08:34
seb128    | xargs --no-run-if-empty  git push origin08:34
seb128is not08:34
seb128there has to be an easier way?08:35
TrevinhoI've sent you 3 options08:35
Trevinhopush tags does it too08:36
seb128I didn't understand they were alternative ways08:36
seb128so why that complex line if push tags is enough? :p08:36
TrevinhoOr just the specific tag08:36
TrevinhoThat's to push all the tags we need when we import a new revisions for example08:37
=== as is now known as Guest30739
TrevinhoFollow tags might work too08:37
didrocksyeah, that was why I put on the wiki page to set follow tags08:50
seb128I though I had it set on that checkout08:51
seb128how do I read that settings value?08:51
didrocksI think it's in .git/config (you can read it as well via git config command)08:52
* didrocks looks for an example08:52
didrocks        followTags = true08:53
didrocksin .git/config in your repo08:53
seb128$ git config  --get push.followTags08:53
seb128that returns true once it's set08:53
seb128To git+ssh://seb128@git.launchpad.net/~ubuntu-desktop/ubuntu/+source/nautilus08:54
seb128 * [new tag]         ubuntu/1%3.26.4-0ubuntu2 -> ubuntu/1%3.26.4-0ubuntu208:54
seb128 * [new tag]         upstream/3.26.4 -> upstream/3.26.408:54
seb128Trevinho, ^08:54
TrevinhoGood one08:55
seb128Trevinho, thanks for noticing!08:55
didrocksTrevinho: so, versioning & ubuntu-dock, I think you saw my answers, correct?08:59
didrocksTrevinho: 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 patches08:59
Trevinhodidrocks: 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
didrocksanother 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
didrocksTrevinho: that's the gist of it ^09:00
TrevinhoOk... That's fine. Going with quilt09:00
didrockskeep it with a native version though, please! :)09:01
TrevinhoAs per version number itself is it fine to follow upstream that way?09:01
TrevinhoAh... So 18.10?09:01
didrockswell, you have 2 ways09:01
didrocksor 18.1009:01
didrocksI prefer the second, but I can understand you may want the first09:01
TrevinhoAh ok... I used 63ubuntu before...09:01
Trevinhowith quilt gbp wanes the 1st09:01
didrocksthat's fine as long as it's a native version :)09:02
TrevinhoOr it won't find the tag...09:02
didrocksand stream down gbp.conf09:02
didrockswell, you can use --with quilt09:02
TrevinhoThen I wanted to ask... Since some docs mention that if it's not in debian has to have -0... But..09:02
didrocksthat's when upstream != downstream09:02
didrockshere, we can consider ubuntu-dock as ubuntu being the upstream09:03
didrocksas we don't ship dash to dock, but rename the projects, and such09:03
didrocks(as there is upstream dash to dock in the repos for the fanclub)09:03
TrevinhoOk, in fact I had a push with that version too... Then the missing delimiter was feeling me bad :-P09:03
didrocksdon't feel bad, or use 18.10 ;)09:04
didrocksor a mix, but unsure09:04
didrockslike 63+18.10?09:04
TrevinhoMh... Or 63ubuntu.18.10.1?09:05
TrevinhoOr that's for sru only.09:05
didrockssounds even weirder, what does other people think?09:05
didrocksI have no strong opinion as long as it's a native version09:05
TrevinhoOk, waking to the office... Catch you later with the pushed code09:06
seb128I don't have strong opinion, either way works09:10
seb12818.10 looks a bit nicer that 63ubuntu1809:10
didrocksI think git is what really told you on what upstream version you are based on09:11
ricotzkenvandine, hi, https://launchpad.net/~gnome3-team/+snap/gnome-characters09:29
=== Please is now known as Guest64602
tseliotseb128: hi, I have formatted the bug report as an SRU request, which should help you merge the code into bionic too: LP: #177801110:06
ubot5Launchpad bug 1778011 in ubuntu-drivers-common (Ubuntu Bionic) "SRU: PRIME Power Saving mode draws too much power" [High,In progress] https://launchpad.net/bugs/177801110:06
Trevinhoseb128: 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
TrevinhooSoMoN: hey, in https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-software?h=ubuntu%2Fbionic you've to push the tag too :)10:52
oSoMoNTrevinho, oh, I thought I had, lemme fix that10:53
TrevinhooSoMoN: in case `git tag | grep -E '^ubuntu/|^debian/|^upstream/' | xargs -r  git push origin` does it :)10:56
Trevinhoor `push --tags` although that might push other upstream tags we don't care about (and that L_aney) wanted to filter out :)10:56
oSoMoNTrevinho, I went for "git push origin ubuntu/3.28.1-0ubuntu4.18.04.3", that did it11:01
Trevinhoyep, that's enough11:01
Trevinhojust not to remember all the tags to push  I use git tag way :)11:01
Trevinhodidrocks: anyway that change of the dock in theory got merged, so I could also just remerge it and not use quilt for now11:11
TrevinhoI would need that for 18.04 though11:11
Trevinhoor well, as is preferred11:11
didrocksTrevinho: who would you need that for 18.04? isn't it to make it compatible with latest G-S?11:12
Trevinhodidrocks: no not that patch11:13
Trevinhodidrocks: but I want to cherry-pick other fixes11:13
Trevinhosee the current changelog11:13
Trevinhofor the one I proposed11:13
didrocksTrevinho: ah, sure, I don't think we need to do those as quilt patches11:14
Trevinhook, fine11:14
Trevinhoso let's continue this way, in case we can always use `--with quilt` and that's it11:14
seb128tseliot, thx, I've a look11:25
seb128Trevinho, let me have a look to the SRU11:25
seb128Trevinho, 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
seb128git newbie question of the day, is there a way to "git merge <remove-url(/branch)?> (or -b branch)"?11:27
seb128or does one need to add the remote/fetch it/merge into master and then delete the remote?11:27
didrocksTrevinho: answered11:29
didrocksseb128: if you didn't attach the remote, git pull remote/branch should work11:30
didrocksgit pull remote-url/branch should work11:30
didrocksTrevinho: so, you are going to drop as well:11:32
didrocksupstream-tag = extensions.gnome.org-v%(version)s11:32
didrockspristine-tar = False11: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/bionic11:32
seb128remote: Repository does not exist.11:32
seb128I guess I do that wrong11:33
Trevinhouse lp:~ ....11:33
didrocksseb128: and git pull lp:~3v1n0/ubuntu/+source/nautilus/ubuntu/bionic ?11:33
Trevinhoand no ubuntu/bionic11:33
seb128shrug, why is that so complex :(11:33
Trevinhoseb128: ahah11:33
didrocksgit pull lp:~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic ?11:33
Trevinhoyouve to think you're pulling my repo11:33
Trevinhoand from that repo a branch11:33
Trevinhothat ^11:33
didrocksseb128: just add Trevinho's repo, you will need it forever! :)11:33
Trevinhoyes... how can you live without a marco remote!?11:34
seb128I've one11:34
seb128but I still don't know what to do from it11:34
Trevinhoso just git fetch that11:34
didrocksprefer a marco remote or a locally installed version? :p11:34
seb128$ git remote11:34
didrocksgit fetch marco11:34
didrocksgit merge macro/<branch>11:34
didrocks(fetch is to refresh the repo metadata locally)11:34
Trevinhoor in this case git pull marco ubuntu/bionic11:34
seb128$ git pull lp:~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic11:35
Trevinhoit's crazy that git has not a variable for current branch though :o11:35
seb128is failing with "remote error: Repository '~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic' not found."11:35
seb128just for the record11:35
Trevinhoeh, that's wrong url11:35
Trevinhogit remote marco set-url lp:~3v1n0/ubuntu/+source/nautilus11:35
seb128$ git fetch marco11:35
seb128$ git merge marco/ubuntu/bionic11:35
seb128Already up-to-date.11:35
Trevinhok good one :)11:36
seb128$ git log11:36
seb128commit 08a65da59e9e785283015f5f4ca6d9a6920ffd2b11:36
seb128Author: Marco Trevisan (Treviño) <mail@3v1n0.net>11:36
seb128Date:   Wed Jul 18 03:35:54 2018 +020011:36
Trevinhogit pull --tags marco11:36
seb128nautilus (1:3.26.3-0ubuntu4) bionic; urgency=medium11:36
seb128is the content11:36
seb128it didn't pull your branch11:36
Trevinhogit pull marco ubuntu/bionic doesn't work?11:36
seb128Already up-to-date.11:37
Trevinhoensure my remote matches that url11:38
Trevinhogit remote -v11:38
Trevinhowell, not same user ofc11:38
seb128$ git remote -v11:38
seb128marcogit+ssh://seb128@git.launchpad.net/~3v1n0/ubuntu/+source/nautilus (fetch)11:38
seb128marcogit+ssh://seb128@git.launchpad.net/~3v1n0/ubuntu/+source/nautilus (push)11:38
Trevinhoand how's git log marco/ubuntu/bionic ?11:38
seb128commit 08a65da59e9e785283015f5f4ca6d9a6920ffd2b11:39
seb128Author: Marco Trevisan (Treviño) <mail@3v1n0.net>11:39
seb128Date:   Wed Jul 18 03:35:54 2018 +020011:39
seb128at the topc11:39
Trevinhoubuntu/bionic-3-26-4 :D11:39
Trevinhoeh, normal..11:39
didrocksmarcoooooo! :)11:39
seb128why why why11:39
Trevinhoubuntu/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 brain11:39
seb128why did you create a new branch? is that better?11:40
Trevinhocause I wanted for my repo to have ubuntu/bionic match the ubuntu's ubuntu/bionic, while doing work in different branches11:40
Trevinhoit's just for working in clean way :)11:41
Trevinhoso you have your local ubuntu/master and ubuntu/foo to point to upstream ones11:41
didrockswhy do you need ubuntu/bionic local checkout?11:41
TrevinhoI didn't do this for shell, but it's a thing I prefer11:41
didrocksin that case, you never need the projected tree11:41
didrocksonly keeping it in the remote is enough?11:41
didrocksthat's what I do, trying to always minimize the number of branches if I don't need to push them11:41
seb128Trevinho, can you check I did it right?11:42
Trevinhowell, 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 :P11:42
Trevinhoseb128: you pushed already?11:42
seb128$ gbp buildpackage -S11:43
seb128gbp:warning: Unknown compression type of Merge branch 'pristine-tar' of salsa.debian.org:gnome-team/nautilus into pristine-tar, assuming gzip11:43
Trevinhoseb128: in any case for you the thing should change... just pulling is the same11:43
seb128gbp: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
seb128pristine-tar: git show refs/heads/pristine-tar:nautilus_3.26.4.orig.tar.gz.delta failed11:43
Trevinhopulled prisitne-tar from me/salsa?11:43
seb128guess not, let me redo the correct bootstrapping11:43
Trevinhoseb128: nooo11:43
seb128can't I tell it to use the orig from the local dir instead?11:43
Trevinhoseb128: just do this11:43
Trevinhogit fetch salsa pristine-tar:pristine-tar11:44
seb128but I don't want their .gz11:44
seb128I want a .xz11:44
Trevinhoand git fetch salsa upstream/3.26.x:upstream/3.26.x11:44
seb128screw those hippies :p11:44
Trevinhoseb128: anyway, you have to push also the upstream/latest branch too11:45
* seb128 does good old untar and cp debian/ over11:45
Trevinhoerrr not latest11:45
Trevinhohow could yo love that mess :-D11:45
seb128how do I tell gbp to use my local .xz11:45
Trevinhoah, I see they're all pushed there11:45
seb128I don't want a .gz11:45
Trevinhouse whatever it makes for you :-D11:45
TrevinhoI've no clue11:46
seb128k, well I copy the debian/ dir over11:46
Trevinhodidrocks: ^ ?11:46
didrocksI don't think it's possible to have gbp rebuilding some other formats than the one was imported11:46
didrockswhich was*11:46
didrocks(checksum, and so on…)11:46
seb128can I ignore the pristine-tar thing?11:46
Trevinhoseb128: maybe with --no-pristine-tar?11:46
seb128and tell it to use the local tarball?11:47
seb128doesn't seem to work11:47
didrocksfrom the man page11:47
didrocks              Search  for upstream tarballs in DIRECTORY instead of generating11: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
Trevinhowould be `--git-no-pristine-tar` but not sure it works11:47
seb128that failed and screwed my checkout11:49
seb128like I've lot of local diff now11:49
Trevinhogit reset --hard :-D11:49
seb128thanks but I stop there11:49
seb128wasted enough time for today11:49
seb128I just cp the debian dir over and do a debuild -S -sa11:49
Trevinhoseb128: you're vesting, not wasting :D11:49
seb128trust me I'm wasting11:50
seb128I've a long todo for the afternoon11:50
Trevinhofair enough, I just want that pkg in queue and forget about it :)11:50
seb128Trevinho, didrocks, thanks for helping with the git non sense11:51
seb128Trevinho, 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
didrocksyw seb128! sad it didn't work out11:51
Trevinhoone day you'll understand any  internal... and you'll call your next son "git" :-D11:52
seb128you can do that :p11:52
seb128didrocks, well, it somewhat worked, I merged and push that branch and the source is uploaded11:52
Trevinhoit's a quite good name... short for calling when you need something11:52
Trevinholike "ugo" :D11:52
didrocksseb128: yeah, but it means that if version_format_in_ubuntu != version_format_in_debian and we base on the debian branch, we are screwed11:53
seb128I think we can re-upload an different orign if we do a -S -sa11:53
seb128it just means that forces us to move back to .gz though?11:53
Trevinhodidrocks: for the dock you want me to finalize the changelog, tag and push to the bileto or you handle that?11:53
seb128were .xz was a mirror space win11:53
didrocksseb128: ah, I thought with -sa launchpad would refuse telling it has one already with a different checksum11:54
seb128the filename is different11:54
didrocksTrevinho: finalize the changelog/tag/push please11:54
seb128I *think* it works11:54
seb128but I didn't try for a while11:54
didrockscould be11:54
didrocksTrevinho: I can't test it though before my holidays (meeting first and need to leave soon afterwards)11:55
didrocksand you didn't push to the PR?11:55
Trevinhodidrocks: well, let's do that I push the PR, then laney can finish the testing11:55
didrocksTrevinho: even better, request Michele the rights11:56
didrocksTrevinho: that way, you can merge it back yourself11:56
Trevinhodidrocks: ok, pushed the PR though11:56
didrockswe told that you would remove upstream-tag and pristine-tar11:56
didrocksthose aren't necessary, please remove them :)11:57
didrocksthe rest LGTM11:57
Trevinhoah, I thought you meant only master11:57
didrocksnope, everything not necessary11:57
Trevinhoupstream-tag would be necessary in case we swtich to quilt...11:57
didrocksbut until then, we don't need it11:57
didrocksso, let's remove :)11:57
Trevinho(when I used patches, it would use)...11:57
Trevinhomh, ok11:57
Trevinhojust like to be preemptive :)11:57
didrocksI don't want quilt for things cherry-picked11:58
didrocksand that will force it11:58
didrocksanyway, meeting, bbl11:59
Trevinhodidrocks: ok, that's re-pushed with almost gbp changes12:02
Trevinhoalmost no*12:02
Trevinhoseb128: anyway in my setup gbp generates .xz files12:09
TrevinhoI always forget, how I do generate the control out of the .in?12:17
didrocksdebian/rules clean should do it12:17
didrocksTrevinho: you still had some ubuntu/ tags…12:20
Trevinhodidrocks: in my repo you mean?12:24
Trevinhoyeah, old pushes... I might have not push --delete'd them all, you can delete those12:24
Trevinhoas I was lazy enough to only use git push gh:dash-to-dock without having a remote :-D12:25
Trevinhoso not a list of tags12:25
Trevinhoah, I need to update bionic too, I was forgetting12:25
didrocksTrevinho: so, I'm doing the tag deletion, please do it as well :)12:28
Trevinhodidrocks: from a session file you can't set env variables, right?12:33
didrocksTrevinho: unfortunately no, you can do it from the session .desktop file though12:34
Trevinhodidrocks: data/org.gnome.Shell.desktop.in.in so?12:35
Trevinhoor the one used by gnome-session?12:35
didrocksTrevinho: the ones used by gnome-session12:35
Trevinhodidrocks: we don't have a git repo for ubunut-session, right?12:39
didrocksit's gnome-session?12:39
Trevinhonvm, yeah, I remembered 1ms after asking :)12:39
didrocksTrevinho: too much latency :p12:40
Trevinhodidrocks: 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? mhmhmh12:51
Trevinhodidrocks: so, for my purpose that's enough :P12:55
didrocksTrevinho: well, that clearly works as it's how we are selecting the SHELL mode :)12:59
kenvandinericotz, yeah, i got the mail for that one today13:08
kenvandinei'll fix it13:08
ricotzkenvandine, ok, but it already failed multiple times not just today ;)13:38
kenvandinericotz, yeah, i wasn't subscribed to the emails until yesterday13:38
kenvandinenow i see them :)13:38
kenvandinericotz, and i've fixed the build upstream so it will build on the next sync13:40
ricotzkenvandine, thanks13:41
kenvandinericotz, np13:41
ricotzless launchpad spam :)13:41
kenvandineoSoMoN, did you see the email about bug 1780996 ?13:41
ubot5bug 1780996 in libomxil-bellagio (Ubuntu Bionic) "Convert triggers to noawait" [Undecided,Triaged] https://launchpad.net/bugs/178099613:41
kenvandinericotz, yeah!13:41
kenvandineoSoMoN, it's marked as fixed in bionic for libreoffice but needs a fix in xenial too13:42
oSoMoNkenvandine, I’ve seen it, and am looking into it as I write13:44
ricotzoSoMoN, hi :), don't forget about libreoffice 6.0.613:49
oSoMoNricotz, yeah, I'm not forgetting!13:55
ricotzoSoMoN, thank you14:01
ricotz( is officially final)14:02
seb128how do I "uncommit" with git?14:51
seb128fuck, 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 archive14:52
seb128like 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
ograseb128, reset14:53
seb128I pushed that change to launchpad14:53
seb128so it's not as easy, or I need to checkout some previous head and force push or something14:54
ograoh ...14:54
ogragit push -f origin master14:54
ograor some such (depends if you are in master etc )14:55
ogra(origin being the remote )14:55
ograthats largely the same as bzr's --force-overwrite14:56
seb128well, first I need to roll back 3  commits14:56
seb128which 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
ograyeah, you do that with checkout14:57
ograreset 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
Trevinhoseb128: also the tag in gdm is missing :)15:07
Trevinhoseb128: git for uncommit... I seent you my .gitconfig...15:07
Trevinhothere's an uncommit there15:07
seb128$ git config  --get push.followTags15:07
seb128Trevinho, I fixed it15:07
Trevinhoseb128: push --tags :)15:08
seb128I did "git reset --hard HEAD^^^" & commit push -f15:08
Trevinhogit reset --hard HEAD~1 will do it (but be worried)15:08
seb128Trevinho, isn't push.followTags = true supposed to do that?15:08
Trevinhoseb128: in theory... but it doesn't seem to work so well15:08
Trevinhoso, just use push --tags15:08
Trevinhoseb128: 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 back15:09
Trevinhoso HEAD~4 points to the 4th commit before head15:09
Trevinhoyou can also just do `reset --hard origin/ubuntu/master` to go back to clean state15:10
Trevinhoi miss the ubuntu215:10
Trevinhohas not a tag15:11
seb128right, just I already had pushed to ubuntu/master on launchpad15:11
seb128Trevinho, https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/tag/?id=ubuntu/3.28.2-3ubuntu2 ?15:11
=== tdaitx_ is now known as tdaitx
Trevinhoseb128: also you did those orig imports?15:11
Trevinhonope I did15:11
seb1283.28.2-3ubuntu2 I did15:11
seb128since they cowboy uploaded it15:12
Trevinhobut anyway https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/commit/?id=e210e5d98c5a822128c793c00e19d70fccf34dbb is not there15:12
seb128I used gbp import-dsc15:12
seb128what are you asking me now?15:12
Trevinhogit tag  "ubuntu/3.28.2-3ubuntu2" e210e5d98c5a822128c793c00e19d70fccf34dbb -f15:12
Trevinhogit push  "ubuntu/3.28.2-3ubuntu2" -f15:13
Trevinhoit looks like you changed that tag in the run...15:13
Trevinhoso you've to make sure it points to the right commit and then force-push it15:13
seb128the tag exists but on a commit that got reverted15:13
Trevinho[TBH all this is not nice :)]15:13
ograsometimes i think git was only created so people can sell books about it ... its like learning another language with totally mad grammar15:13
seb128I guess the reset HEAD^^^ and push -f didn't delete it15:13
Trevinhoseb128: no15:13
Trevinhoto delete15:14
Trevinhoyou've to do15:14
seb128I did delete it manually15:14
Trevinhogit push --delete "TAG NAME"15:14
Trevinhoand that will delete from remote15:14
seb128because dsc-import complained15:14
Trevinhobut if you pushed you've to remove it from remote too15:14
seb128'ubuntu/3.28.2-3ubuntu2' does not appear to be a git repository15:14
seb128in your push command15:14
seb128git tag push I guess?15:15
Trevinhoadd git push origin ...15:15
Trevinhoand then the rest15:15
Trevinhoalso for https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/commit/?id=d03c139448733f34f11b9764092df251a5990e6a you did't use gbp right? :)15:17
seb128no, I had a diff, not a dsc15:17
seb128I did patch -p1 < and git commit15:17
seb128why ?15:17
seb128also I don't know what's the heck with the tag15:18
seb128Trevinho, https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gdm3/tag/?id=ubuntu/3.28.2-3ubuntu215:19
seb128Trevinho, what's the issue with the other commit15:19
seb128crap, I used dch one too much and did skip ubuntu3 revision15:19
seb128oh well15:19
seb128it's uploaded, too late for changing it15:19
seb128Trevinho, vcs is fine now?15:19
seb128I think it is, stepping out for a bit15:24
Trevinhoseb128: yeah, thanks... Sorry I had a call15:46
jbichafossfreedom: mutter 3.29.90 was uploaded to cosmic (& Debian experimental) so when you get a chance, can you update budgie-desktop for it? thanks16:07
jbichaLaney: did you see https://gitlab.gnome.org/help/workflow/repository_mirroring#pushing-to-a-remote-repository ?16:44
jbichait 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 that16:45
jbichaseb128: could you maybe follow up with Chris about handling bug 1784974? (since he did the last bionic mozjs52 upload)18:28
ubot5bug 1784974 in mozjs52 (Ubuntu Bionic) "Update mozjs52 to 52.1.9" [Undecided,Triaged] https://launchpad.net/bugs/178497418:28
Trevinhojbicha: that's cool... so we might use gitlab for patch and merge management in case18:33
jbichawell 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 LP18:36
Trevinhogit log18:42
Trevinhoops :-D18:42
seb128jbicha, k, but next week, he's off today and tomorrow20:27
Trevinhokenvandine: can you land this SRU? https://bileto.ubuntu.com/#/ticket/333820:42
kenvandineTrevinho, looking21:24
kenvandineTrevinho, publishing21:26
Trevinhokenvandine: cool thanks21:46

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!