=== ChanServ changed the topic of #ubuntu-uos-community to: Currently no events are active in this room - http://summit.ubuntu.com/uos-1611/community/ - http://irclogs.ubuntu.com/2016/11/15/%23ubuntu-uos-community.html [17:49] nacc: do you know how to setup the hangout for your session? [17:49] if not, https://wiki.ubuntu.com/UDS/Sessions has the step-by-step instructions [17:50] mhall119: i *think* it should be setup now === ChanServ changed the topic of #ubuntu-uos-community to: Track: Community | Git-based Ubuntu development workflow | Url: http://summit.ubuntu.com/uos-1611/meeting/22710/git-based-merge-workflow/ [17:50] thanks to rbasak :) [17:50] nice work! [17:50] nacc: the video doesn't allow embedding [17:51] rbasak: ^^ can you edit the video settings? [17:51] Where would I do that? [17:52] not sure after it's created [17:52] nacc: Could you invite me to the video hangout (Ian Jackson, I created b83m6t@fyvzl.net for this) [17:52] Diziet: sure, give me one second [17:52] thanks [17:52] Diziet: try going to https://hangouts.google.com/hangouts/_/ytl/yq07F04I9D_f6YnWIxoB7HycyY363CimE_hAfjF8Ptc=?hl=en_GB&authuser=0 [17:52] rbasak: when you set it up , in Advanced settings,there's an option for "Allow embedding" towards the bottom [17:53] you might have to create a new video to change that though [17:53] mhall119: in that case, do I need to quit...right. [17:53] Diziet: so that won't work. One moment. [17:53] we'll be ready in just a sec :) [17:54] mhall119: it says "You can't embed live streams." [17:54] And the checkbox is disabled. [17:55] huh....not sure why that is, it's enabled for my account [17:55] "ou will need to have a Verified YouTube profile before you can start an On-Air Hangout." ? [17:55] The help page says that my channel has to be verified. [17:55] Right. I thought I already did that with a phone call. Or was that just the account? [17:55] not sure, they've changed so much about on-air hangouts lately [17:55] I can host this next one if you'd like [17:56] Please [17:58] ok, updated the summit page, https://hangouts.google.com/hangouts/_/ytl/FfvzFcwTgW8qXQc2vOX5pYOQS51NOMYubPQfO1XGCfU=?hl=en_US&authuser=0 is the new hangout [17:58] mhall119: thank you! [17:58] https://www.youtube.com/watch?v=bD45uJ8q2dk [18:00] getting everyone setup on the hangout, we'll be starting soon [18:02] barry: view-only link, so you have that at least: https://www.youtube.com/watch?v=bD45uJ8q2dk [18:02] Will @jcastro be joining us ? [18:02] http://pad.ubuntu.com/uos-1611-git-based-merge-workflow [18:02] ^ has all relevant links now [18:04] huh, hangout toolbox completely broken for me, no way to put my name on anymore [18:07] slangasek: running chromium? [18:07] it breaks there sometimes [18:10] QUESTION: Does Debian keep their package sources in Git now too? [18:10] fwiw, git-dpm is essentially abandonware [18:10] barry: good to know [18:10] mhall119: firefox [18:10] hmmm, works for me in FF (today anyway) [18:10] Hi. [18:11] My angle is mostly that I'm trying to talk people into using patches-applied trees. [18:11] mhall119: it's a maintainer's choice, aiui -- the choice of how to do it, is up to them [18:11] ah, ok, so nothing uniform [18:12] mhall119: right, and not enforced to be one particular VCS by any means [18:12] it does, thanks rbasak [18:12] i have a very dumb script which does a git-dpm import-dsc + chdists to do git dev of a pure ubuntu update, but this work is much better for merges than anything else i've used. what i'm interested in is moving this more toward a git-based replacement for udd. i.e. automatic imports, publicly available repo urls, with long term dream of push(+tag?) == upload [18:13] QUESTION: I doubt that I am not alone in not knowing all of the issues connected with this project - But my question is WHAT about translations and how can we better integrate them/tose in your project ? #Noob question. [18:13] oh, nice one Diziet [18:13] sans tose/tose [18:13] sans tose/those [18:15] aside: d/patches management is pretty crucial imho (i.e. 3.0 quilt <-> git), which when it works in git-dpm is pretty easy and when it doesn't is very painful. similarly gbp-pq [18:16] barry: Yes. That's where most of the code in dgit is. [18:16] As an example, you can "git clone https://git.launchpad.net/~usd-import-team/ubuntu/+source/dovecot" and take a look at the tree in "gitk --all" [18:16] Diziet: ack. that's where all the "fun" is :) [18:16] Is ack @sil on this channel ? [18:17] no [18:17] he is afk [18:17] popey, thanks-you. [18:17] warning: remote HEAD refers to nonexistent ref, unable to checkout. [18:17] Diziet: that's fine, ignore. [18:17] That's because there is no master branch. [18:18] git checkout ubuntu/zesty <- fixed it [18:19] nacc, rbasak: where do I file bug reports? ;) Because there should be a trunk which is the Ubuntu development trunk, and ubuntu/rel branches should only be needed for SRU [18:20] slangasek: https://launchpad.net/usd-importer [18:20] slangasek: there is an "ubuntu/devel" tip maintained that is the Ubuntu development trunk. [18:20] Perhaps HEAD should point to that. [18:20] cool [18:21] We'd probably need an LP API if there isn't one already to make HEAD point to the right thing. That's more than just the "git push" that the importer does today. [18:21] changelog merge conflicts> devscripts has a mergechangelogs tool which often DTRT [18:21] Diziet: yes, we use dpkg-mergechangelogs extensively in our workflow. [18:22] It does get very painful when we cherry-pick individual bugfixes though. The right thing doesn't happen in debian/changelog. [18:22] So instead we keep changes to debian/changelog in their own commits. [18:22] And write debian/changelog basically only straight before upload. [18:22] Very similar to git-dch. [18:22] Hmm. Yes, I can see why you might do that. [18:22] Uh, gbp dch. [18:23] mhall119 Does www.packages.ubuntu.com include the Soutce file and license usually (incl. git repos) ? [18:23] **sans Soutce/Source [18:24] CoderEurope: I'm not familiar with packages.ubuntu.com, sorry [18:24] slangasek: https://bugs.launchpad.net/usd-importer [18:25] nacc: yep - already added to the pad, thanks :) [18:25] slangasek: thank you! [18:27] is this "dgit" or "dget"? [18:27] mhall119: dgit [18:27] thanks [18:28] Diziet: QUESTION: with a patches-applied tree, how do you extract the patches applied to pristine upstream, e.g. to submit patches upstream, drop patches once applied upstream, etc.? [18:28] nacc, rbasak: you described usd-importer as "not doing a git merge"; that makes a certain amount of sense given that we don't have import branches tracking the full Debian history today; is this a fundamental design decision? i.e. if we had rich history branches for Debian, would you be opposed to switching to merge? [18:29] slangasek: it's not actually that it doens't do merges [18:29] slangasek: the importer does a lot of merges :) [18:29] slangasek: just 'ubuntu merges' aren't 'git merges' [18:29] nacc: ok, well - for UDD, ubuntu merges /are/ git merges ;) [18:29] er [18:29] bzr merges [18:29] (sorry, my brain autoreplaced bzr with git on the fly) [18:30] interesting, I'd need to look at that in more detail -- there's no hard requirement, in and of itself, that they not be git-merges [18:30] slangasek: merge of the old ubuntu with the new debian? [18:30] yes [18:30] slangasek: ok, that's what the importer will do, as well [18:30] ok :) [18:32] slangasek: there are up to 3 parents for any given publish: publishing parent (per Launchpad and the series history), changelog parent (from that publish's debian/changelog) and upload parent (in case a user pushed an upload tag to the repository representing their upload to the archive) [18:33] slangasek: that's a relatively low level detail, but I think answers your question more completely [18:33] * slangasek nods [18:40] https://lists.alioth.debian.org/cgi-bin/mailman/listinfo/vcs-pkg-discuss [18:41] any chance it's on gmane? ;) [18:43] http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/2016-November/000909.html also, as a direct link [18:47] mhall119 : QUESTIOn (duplicate) earlier: .... the issues connected with this project - But my question is WHAT about translations and how can we better integrate them/those in your project ? [18:47] ^^ for rbasak or nacc I think [18:48] CoderEurope: thank you for the question -- sorry, the current topic is quite involved [18:48] no prob/lem [18:49] CoderEurope: I personally don't know much about translations; but if they are just changes to debian/, it's sort of orthogonal to our project. Or maybe parallel :) That is, you can commit to the imported tree to add translations and ask that those changes get merged in order to upload them. It's not a focus of the workflows (yet), but it seems like translations could be one future documented [18:49] (common) workflow. [18:49] -udsbotu:#ubuntu-uos-community- 5 minutes left in this session! [18:50] nacc, Thank-you you need to tell users 'Where' to file bugs too .. give a screenshare maybe of the launchpad page ? [18:50] -udsbotu:#ubuntu-uos-community- 4 minutes left in this session! [18:50] slangasek: please no! having separate patches on top of upstream (whether directly represented or generated) is imho, very important for any interactions with upstream [18:51] barry: but they're represented as git commits [18:51] which is long-term better for us all [18:51] CoderEurope: yes, will do. I think it's in the pad and I'll add it to the summit description [18:51] nacc, right-oh [18:51] -udsbotu:#ubuntu-uos-community- 3 minutes left in this session! [18:52] slangasek: yes, if those aren't squashed, *and* they're easily derived from upstream, then that's okay [18:52] -udsbotu:#ubuntu-uos-community- 2 minutes left in this session! [18:52] barry: so patches in debian/patches inherited from Debian, and imported into Ubuntu via dgit, would be squashed; but we're not responsible for those in Ubuntu [18:53] barry: but Ubuntu patches would not have their commits squashed [18:53] -udsbotu:#ubuntu-uos-community- 1 minute left in this session! [18:54] slangasek: but there's often a lot of overlap between "responsible in ubuntu" and "responsible in debian". but if otoh i could look at the debian unsquashed view of the world then maybe it's okay, but it feels more complicated [18:54] -udsbotu:#ubuntu-uos-community- This session has ended. === ChanServ changed the topic of #ubuntu-uos-community to: Track: Community | UbuCon Europe organization | Url: http://summit.ubuntu.com/uos-1611/meeting/22715/ubucon-europe/ [18:56] So the git-based merge workflow is going to switch to a second hangout, URL forthcoming [18:57] Good idea [18:57] we will make sure to capture that recording, as well, and it will be included in the UOS page/pad etc [18:58] gmane.comp.package.vcs-pkg fwiw [18:58] git workflow continuation hangout URL: https://hangouts.google.com/hangouts/_/ytl/ItUlmFSFjrFhFGzkE9LNt5tbVR32v8C9B3zsg-YK8zQ=?hl=en_GB&authuser=0 [18:58] Is there an IRC channel to which we can move as well? [18:59] you can use #ubuntu-uos-overflow [18:59] barry: well basically, it means if you have a Debian branch where you're maintaining, your workflow there doesn't change; and dgit's synthesized branches /for Debian/ don't change; but the dgit imported branches /for Ubuntu/ would flatten debian/patches for convenience [18:59] hey svij [18:59] hey dholbach [19:00] I'm checking if i'm doing everyhing correct… [19:00] barry: and furthermore, if you adopted a dgit workflow in Debian, you would still have commit-per-patch view that merges through into Ubuntu [19:00] https://hangouts.google.com/call/7dbrin2vszadrmjkoniqt4eizae [19:00] do you have the broadcast url too? [19:01] if I find that… [19:01] svij: "Links" in the bottom right corner of the hangout screen [19:02] if it's an on-air hangout [19:02] dholbach will set it up again [19:02] since I'm too dumb for that :D [19:02] 2 more secs [19:03] https://hangouts.google.com/hangouts/_/ytl/6Cyqdfp7edHoROiXxoyfCoMCWPiSjyZ-ggQazNz2UIo= for everyone who wants to join in [19:03] svij: https://wiki.ubuntu.com/UDS/Sessions [19:03] http://youtu.be/RJWSxDUVMBE broadcast [19:04] Heya !! [19:04] Online yet? [19:04] mhall119, you joining? [19:04] or who else are we waiting for? [19:04] google say's I'm already there....and alone [19:05] oh [19:05] mhall119: https://hangouts.google.com/hangouts/_/ytl/6Cyqdfp7edHoROiXxoyfCoMCWPiSjyZ-ggQazNz2UIo= this one? [19:05] we had to update the links [19:05] oh right [19:05] i can't join hangout, will follow by listening and replying here if needed :) [19:05] we'll be right there [19:05] dholbach: says I'mnot authorized now :( [19:06] * cm-t is in weekly board loco team [19:06] huh [19:06] mhall119, https://hangouts.google.com/hangouts/_/ytl/6Cyqdfp7edHoROiXxoyfCoMCWPiSjyZ-ggQazNz2UIo=?authuser=1 maybe? [19:06] I'm not sure what to do [19:06] the others could join [19:06] maybe wrong account or something? [19:06] if I use authuser=1 or =2 it lets me in, but I'm alone [19:06] on the summit site it says it will start soon [19:06] cm-t: not live yet [19:06] are you sure it's the right link? [19:06] we're 4 [19:07] Etherpad (nothing in it) http://pad.ubuntu.com/uos-1611-ubucon-europe [19:07] \o/ [19:08] \o/ working [19:08] kristbaum o/ [19:08] Mister_Q: o/ [19:08] * flexiondotorg is coming too :-) [19:09] * Mister_Q waves from a company event and can't be in the hangout unfortunately [19:09] <3 [19:09] Re. [19:10] guided tour through this: https://www.zollverein.de/angebote/ueber-kohle-und-kumpel [19:10] http://ubucon.org/en/events/ubucon-europe/schedule/ [19:10] I have no microphone or webcam though on this desktop [19:11] svij: where would one apply for a place to the trip? [19:11] to the Coalmines ;) [19:12] Spoiler: LeUbuntuPodcast will release within 24h a video promoting explaining UbuCon in english, from cuts at ubucon summit us interviews [19:13] i hope it will bring maybe 1 or 2 more visitors ^^ [19:13] QUESTION: Where can we buy camera stuff like sd cards in Essen City, Germany ? [19:14] there should be lots of places around [19:14] and the Unperfekthaus is in the middle of the city center [19:15] QUESTION: What is the IRC channel for the Ubucon conference in 2016 ? [19:16] not sure if that's decided... svij: ^ [19:16] #ubucon-eu [19:16] yeah I don't think IRC works that well at the confrence [19:18] there's always going to be some who hang out there :) [19:19] svij: I'm there on Fryday, if I want to help out, should I just come to the Unperfekthaus? [19:20] QUESTION: What contingencies are there for people that become unwell ? [19:20] what? [19:21] there's always one Patient Zero [19:21] :D [19:21] CoderEurope, Eat your vegetables. [19:21] ha! [19:21] yes! [19:21] veggies FTW [19:21] +1 [19:21] Yummy [19:21] flexiondotorg: I am a carnivor ;) [19:22] CoderEurope, Are you coming? [19:22] mmm veggies [19:22] I am perpetually broke. [19:22] Syncing the flu ;) [19:23] Ugh, but it's so early :( [19:23] * Mister_Q forces kristbaum to write a blogpost about coalmines and ubuntu on ubuntufun. de if he actually attends that social event :D [19:23] * kristbaum will do it ;) [19:23] Thanks ;) [19:24] kristbaum haha [19:25] I am lucky to have a laptop with both [19:26] QUESTION: Will there be hotdogs, if not what foodies shall there be available ? [19:27] good no stuart langridge dying from too much carls junior [19:27] question: Beer 🍻🍺 [19:27] that's not a question, that's an answer [19:27] Ohhh [19:27] QUESTION: can you just enter an leave as you please, or does everyone get a braclett or something? [19:27] CoderEurope, I'm curious, if you're not going why are you asking these questions? [19:29] flexiondotorg: I am sorry but I have been to many cons also I own /r/ubucon so I have a slight interest/experience. Are you gaining me ? [19:29] spirits? [19:29] kristbaum http://misterq.me/nextcloud/index.php/s/fc9B1dr942jQfxt [19:30] * lynorian is part of ubuntu- california team and want to see if any good ideas for this ubucon but can't really make it this time [19:30] lynorian: are you in touch with richard gaskin or nathan haines about UbuCon in California? [19:30] Mister_Q so everyone will run around with popeys nametag now :D [19:31] I am in touch with nhianes a lot [19:31] and some with richard gaskin [19:31] nhaines will be attending [19:32] QUESTION: Will you be using something like #mediagoblin to show the slides/talk videos ? [19:32] kristbaum you'll get your own namebadge dont worry ;) It's just that I was too lazy and popey's namebadge was the first that I've cut out yet [19:32] Please help spread the video we will release within 24h to promote ubucon europe 💞 [19:32] you're in mhall119 :D [19:33] dh u2 :) [19:33] in what? [19:33] a video we will release before tomorow to promote ubucon [19:33] it's cuts from last ubucon summit passadena [19:33] QUESTION: So the talks shall just remain on YTube ? Whats the name of the channel ? [19:34] CoderEurope: IIRC they will be probably on a channel named Ubuntufun also [19:34] Mister_Q: ^ [19:34] CoderEurope I will record a few talks and they'll go up on our ubuntufun youtube channel. Unfortunately I can not record every talk [19:35] svij ;) [19:35] kristbaum never heard of that :D [19:35] Maybe use ubucon europe g+ account? [19:35] nope [19:35] \o/ till friday! [19:35] I have all the work with editing and filming them so they go up on our channel [19:35] svij, Thanks for organising UbuCon Europe. Can't wait :-) [19:35] See you friday !!!! [19:35] flexiondotorg: :) [19:36] mister_q right :) [19:36] cm-t, Indeed. [19:37] * Mister_Q goes back to the party, see you in essen \o/ [19:38] thanks guys. [19:38] haha :) [19:39] great [19:39] * svij goes to update the friday social events on the webpage… [19:54] -udsbotu:#ubuntu-uos-community- 5 minutes left in this session! [19:55] -udsbotu:#ubuntu-uos-community- 4 minutes left in this session! [19:56] -udsbotu:#ubuntu-uos-community- 3 minutes left in this session! [19:57] -udsbotu:#ubuntu-uos-community- 2 minutes left in this session! [19:58] -udsbotu:#ubuntu-uos-community- 1 minute left in this session! [19:59] -udsbotu:#ubuntu-uos-community- This session has ended. === ChanServ changed the topic of #ubuntu-uos-community to: Currently no events are active in this room - http://summit.ubuntu.com/uos-1611/community/ - http://irclogs.ubuntu.com/2016/11/15/%23ubuntu-uos-community.html