[05:24] * broder sighs [05:25] i think i just lost at the game of code review chicken [05:25] which is to say, i just opened up https://code.launchpad.net/~jderose/ubuntu/precise/couchdb/1.1.1-low-delta/+merge/85301 [05:48] broder: what's the problem with that? that diff looks like it should only take a few minutes to review :) [05:49] * broder glares at ajmitch [05:49] with that many conflicts? [05:50] i mean, whatever bzr dance jderose was trying to pull off clearly didn't work [05:50] that's on my list of pending feedback [05:50] yeah, I can't remember what's required to get it to base the diff off the debian branch [05:51] at least the diff in the description looks a bit more manageable [05:52] still, if the couchdb split is done differently than it was previously, it may need some fixing [05:52] right, that's what i'm trying to figure out [05:52] it does look like there are differences in the resulting package, which would have also been helpful information to include [05:53] bah. also, debian bug #573061 refers to a VCS commit with a potential package split for debian to a repository which no longer exists [05:53] Debian bug 573061 in couchdb "[couchdb] Split couchdb into separate packages" [Wishlist,Open] http://bugs.debian.org/573061 [05:53] what still depends on couchdb these days? [05:53] so i can't really evaluate how similar this split is to what debian is going to do, if the maintainers ever do actually do anything [05:53] all of novacut's stuff, appraently [05:53] will it affect U1 in precise? [05:53] also channel-server, libnode-cradle, and desktopcouch [05:54] ENODATA [05:54] i thought U1 was mostly transitioning away from couch [05:54] I see it's been dropped back to univere anyway [05:55] yeah, and ubuntuone-client at least hasn't [06:09] i do feel like i'm struggling not to blame the contributor for our lameness in my writeup. there's a balance here that's hard to find [06:19] :-/ the diff he posted in the MP description isn't accurate [06:26] despite the version not having changed? [06:27] i guess? the branch changes debian/rules differently than the description suggests [06:27] anyway, it looks like the discussion is actually happening on the bug, not the MP [06:31] * achiang struggles to add an apport hook to a package... http://pastebin.ubuntu.com/837476/ [06:31] the idea is that i'd like to run dh_apport only on ubuntu [06:31] but i don't know where to put that. make an override_dh_apport: target? [06:32] one thought i had was to see who rdepends on dh-apport to find an example, but i guess rdepends doesn't work on B-D [06:33] i don't believe there's any way to do that [06:33] you're not allowed to change the build-depends as part of the build process [06:34] but you can prefix a command with - so that it doesn't error out when built without it [06:34] yes, but if there's no way for you to get dh-apport on the build-dep list in the first place... [06:34] I don't know if that's the best way to do it here, as it also hides other errors [06:34] see "CDBS" on http://ftp-master.debian.org/REJECT-FAQ.html [06:35] hm [06:35] i think your best bet is to do what dh_apport does by hand, conditionally, in the rules file [06:35] or possibly just ship the hook unconditionally [06:36] yeah, by hand is what bluez (and other examples) do [06:36] * ajmitch would prefer apport to be in debian :) [06:38] ok, thanks for the help [06:47] does anything good happen when a conffile moves from one package to another? i would assume that triggers a conffile conflict more or less automatically [06:48] http://wiki.debian.org/DpkgConffileHandling has info about moving location, but not about it being moved between 2 packages & keeping the filename [06:49] right, i know about the stuff on that page [06:49] maybe if you add a Replaces [06:55] http://lists.debian.org/debian-devel/2006/12/msg00647.html implies that Replaces wasn't enough, at least back then :) [06:56] oh god, so *that's* why openssh's maintainer scripts are such a mess [06:56] "once we can expect everyone to have etch's dpkg installed we can move conffiles between packages more or less like any other files" [06:58] right [06:58] I think we're a bit past that point now [06:58] given that half of the upgrade is going to pre-depend on a dpkg with lzma and dpkg-maintscript-helper... [06:59] ooh, speaking of which, http://lintian.ubuntuwire.org/tags/preinst-uses-dpkg-maintscript-helper-without-predepends.html has built up a collection of tags [07:05] i'm not sure what to do with the changelog for the couchdb merge [07:05] jderose didn't make any attempt to merge in the ubuntu history [07:05] but he also (deliberately) didn't attempt to merge in the rest of the packaging [07:05] so dropping the ubuntu history doesn't seem completely unreasonable [07:15] phew. that was a doozy === DktrKranz is now known as Guest88310 === Guest59628 is now known as juss01 === juss01 is now known as jussi01 [10:43] how do I resolve conflicts in .pc/* with bzr? [13:12] the numpy dh_python2 was sure done carefully ._. [13:12] no wonder debian is so relucatant to take patches [13:15] :P [13:23] so numpy 1.6 branch including multiarch fix ready [13:23] anyone want to sanity check it? [13:31] lp:~jtaylor/ubuntu/precise/python-numpy/merge-1.6 [13:32] there are dangling symlinks, but they are also present in debian [13:32] they don't look like a reason to diverge further === med_out is now known as med_ === medberry is now known as med_ === JackyAlcine is now known as Guest29620 === Guest88310 is now known as DktrKranz === almaisan-away is now known as al-maisan === lifeless_ is now known as lifeless