=== blueyed__ is now known as blueyed | ||
micahg | on a bzr merge where changes were made to the source and should be a patch instead, what's the best procedure? Do I need to have the merge proposer fix it or can I just convert it to a patch and use it that way with the appropriate attribution in the changelog? | 02:43 |
---|---|---|
ScottK | lfaraone: At UDS, so no way I can concentrate on it enought to have a useful opinion. | 02:48 |
micahg | hi ScottK, is there any gathering of community people this evening? | 02:50 |
ScottK | micahg: Several of us are in the bar near the check in. | 02:50 |
micahg | ScottK: cool | 02:51 |
AnAnt | Hello | 07:31 |
AnAnt | a package contains 3 kernel modules, one of them can only be compiled for x86 archs, how can I handle that in the DKMS conf file ? | 08:22 |
AnAnt | I read in the dkms manpage about BUILD_EXCLUSIVE_ARCH, but that seems to be a global config variable not a per-module configuration. | 08:22 |
_ruben | dkms tends to be pretty limited in certain areas, wouldn't surprise me if the only "solution" would be to split it into 2 dkms packages | 08:25 |
geser | micahg: let the merge proposer fix it as he probably wants to become a developer in the future so should know how to merge/modify packages correctly | 08:43 |
=== hannesw_ is now known as hannesw | ||
hyperair | anyone from motu-sru around? | 09:56 |
stgraber | /win 39 | 12:58 |
stgraber | oops | 12:58 |
\sh | hmmm...will there be a video stream or audio stream from keynot @UDS-N? | 13:02 |
xteejx | When merging, do we have to set us as the maintainer in d/control? | 13:06 |
xteejx | i.e. ubuntu devs | 13:07 |
Laney | yes | 13:10 |
xteejx | Laney: Thanks :) | 13:11 |
micahg | xteejx: use the update-maintainer script | 13:14 |
xteejx | Why does a debian-changes file keep being created, I'm not editing the source, just stuff in debian/ | 13:15 |
xteejx | control and control.in | 13:15 |
xteejx | It says about the changes debian made, but why? They're already in the package, can I safely remove | 13:16 |
xteejx | that from the package and debdiff and use that on theLP merge report? | 13:17 |
micahg | xteejx: what is in the changes file? | 13:17 |
xteejx | micahg: My changelog entry, dep3 markers and every single change from the old to new debian version | 13:18 |
xteejx | base>debian even | 13:18 |
micahg | xteejx: how did you create the merge? | 13:19 |
xteejx | grab-merge, changed control and control.in, edited changelog, debuild -S | 13:19 |
micahg | xteejx: which package? | 13:20 |
xteejx | anjuta-extras | 13:20 |
xteejx | I can't see any reason why dpkg should be creating it :S | 13:21 |
=== apachetransit is now known as udslogger | ||
=== bilalakhtar_ is now known as bilalakhtar | ||
=== bilalakhtar_ is now known as bilalakhtar | ||
=== zul_ is now known as zul | ||
nicko | Hi all, I maintain a new package in debian (unstable) and would like to see it in Ubuntu, what do I need to do to have it sync-ed? | 14:13 |
geser | nicko: it should get auto-synced once the archive admins are all back from UDS and start also syncing new packages (new = not yet in the Ubuntu archive) | 14:14 |
shadeslayer | nicko: alternatively use requestsync script | 14:15 |
geser | shadeslayer: not needed at this stage of development (unless you need it synced now) | 14:15 |
shadeslayer | geser: ah.. ok ... | 14:16 |
nicko | ok thanks, so the process is automatic (as long as there is no build problem on Ubuntu I guess), perfect! | 14:16 |
shadeslayer | geser: are you at UDS? | 14:16 |
geser | shadeslayer: no | 14:17 |
shadeslayer | :( | 14:18 |
geser | nicko: yes, at least till Debian Import Freeze which is still several weeks away | 14:18 |
=== RoAkSoAx is now known as andreserl | ||
=== RoAk is now known as RoAkSoAx | ||
=== nicko is now known as nickbnf | ||
=== jdstrand_ is now known as jdstrand | ||
=== ara_ is now known as ara | ||
AnAnt | superm1: ping | 17:10 |
superm1 | AnAnt, pong | 17:10 |
AnAnt | superm1: got my email ? | 17:10 |
=== Dr_Who is now known as tgall_foo | ||
AnAnt | superm1: ?? | 18:23 |
xteejx | bug 666334, have I done this correctly? | 18:44 |
ubottu | Launchpad bug 666334 in xdotool (Ubuntu) "please sync xdotool 1:2.20100701.2961-3 from debian unstable" [Wishlist,Triaged] https://launchpad.net/bugs/666334 | 18:44 |
tumbleweed | xteejx: looks good, it's in the sponsor queue. Btw you can use "requestsync" to file these bugs | 18:48 |
xteejx | tumbleweed: Oh :) Does that do all that stuff automagically? | 18:48 |
tumbleweed | xteejx: happens when you subscribe sponsors. the URL is in the topic | 18:50 |
xteejx | Ahhh, and I'm last lol | 18:51 |
=== Dr_Who is now known as tgall_foo | ||
xteejx | Hi all | 21:07 |
xteejx | Not sure on sync/merge for bcfg2, I can only see 3 changes in the ubuntu patch that arent in Deb | 21:07 |
xteejx | "add no-databse DB backend", "add dpatch support", and "backport support for auto version number from 1.0" | 21:08 |
tumbleweed | xteejx: if there are any changes, and they actually matter, we keep them. (Useless changes can be dropped). Forward them upstream so that we can eventually sync again. | 21:12 |
xteejx | No prob, just gonna look through d/patches | 21:12 |
=== ara_ is now known as ara | ||
ari-tczew | geser: IIRC you're familiar with update-maintainer. could you take a look on bug 666504 ? | 21:54 |
ubottu | Launchpad bug 666504 in ubuntu-dev-tools (Ubuntu) "update-maintainer can't update if XSBC-Original- has got @ubuntu.com" [Undecided,New] https://launchpad.net/bugs/666504 | 21:54 |
bdrung | ari-tczew: can you run update-maintainer with -v? | 22:03 |
ari-tczew | geser: update-maintainer: error: no such option: -v | 22:07 |
ari-tczew | s/geser/bdrung | 22:07 |
bdrung | hm, ok. | 22:08 |
ari-tczew | bdrung: I attached d/control to bug, you can try it locally | 22:08 |
bdrung | i will once i have time for it | 22:09 |
geser | ari-tczew: do you know where this XSBC-O-M comes from? | 22:17 |
ari-tczew | geser: debian? | 22:18 |
bdrung | geser: from update-maintainer probably | 22:20 |
geser | bdrung: the questions is why is then Maintainer not @ubuntu.com | 22:20 |
=== hannesw_ is now known as hannesw |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!