* broder sighs05:24
broderi think i just lost at the game of code review chicken05:25
broderwhich is to say, i just opened up https://code.launchpad.net/~jderose/ubuntu/precise/couchdb/1.1.1-low-delta/+merge/8530105:25
ajmitchbroder: what's the problem with that? that diff looks like it should only take a few minutes to review :)05:48
* broder glares at ajmitch05:49
ajmitchwith that many conflicts?05:49
broderi mean, whatever bzr dance jderose was trying to pull off clearly didn't work05:50
broderthat's on my list of pending feedback05:50
ajmitchyeah, I can't remember what's required to get it to base the diff off the debian branch05:50
ajmitchat least the diff in the description looks a bit more manageable05:51
ajmitchstill, if the couchdb split is done differently than it was previously, it may need some fixing05:52
broderright, that's what i'm trying to figure out05:52
broderit does look like there are differences in the resulting package, which would have also been helpful information to include05:52
broderbah. also, debian bug #573061 refers to a VCS commit with a potential package split for debian to a repository which no longer exists05:53
ubottuDebian bug 573061 in couchdb "[couchdb] Split couchdb into separate packages" [Wishlist,Open] http://bugs.debian.org/57306105:53
ajmitchwhat still depends on couchdb these days?05:53
broderso i can't really evaluate how similar this split is to what debian is going to do, if the maintainers ever do actually do anything05:53
broderall of novacut's stuff, appraently05:53
ajmitchwill it affect U1 in precise?05:53
broderalso channel-server, libnode-cradle, and desktopcouch05:53
broderi thought U1 was mostly transitioning away from couch05:54
ajmitchI see it's been dropped back to univere anyway05:54
broderyeah, and ubuntuone-client at least hasn't05:55
broderi 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 find06:09
broder:-/ the diff he posted in the MP description isn't accurate06:19
ajmitchdespite the version not having changed?06:26
broderi guess? the branch changes debian/rules differently than the description suggests06:27
broderanyway, it looks like the discussion is actually happening on the bug, not the MP06:27
* achiang struggles to add an apport hook to a package... http://pastebin.ubuntu.com/837476/06:31
achiangthe idea is that i'd like to run dh_apport only on ubuntu06:31
achiangbut i don't know where to put that. make an override_dh_apport: target?06:31
achiangone thought i had was to see who rdepends on dh-apport to find an example, but i guess rdepends doesn't work on B-D06:32
broderi don't believe there's any way to do that06:33
broderyou're not allowed to change the build-depends as part of the build process06:33
ajmitchbut you can prefix a command with - so that it doesn't error out when built without it06:34
broderyes, but if there's no way for you to get dh-apport on the build-dep list in the first place...06:34
ajmitchI don't know if that's the best way to do it here, as it also hides other errors06:34
brodersee "CDBS" on http://ftp-master.debian.org/REJECT-FAQ.html06:34
broderi think your best bet is to do what dh_apport does by hand, conditionally, in the rules file06:35
broderor possibly just ship the hook unconditionally06:35
achiangyeah, by hand is what bluez (and other examples) do06:36
* ajmitch would prefer apport to be in debian :)06:36
achiangok, thanks for the help06:38
broderdoes anything good happen when a conffile moves from one package to another? i would assume that triggers a conffile conflict more or less automatically06:47
ajmitchhttp://wiki.debian.org/DpkgConffileHandling has info about moving location, but not about it being moved between 2 packages & keeping the filename06:48
broderright, i know about the stuff on that page06:49
brodermaybe if you add a Replaces06:49
ajmitchhttp://lists.debian.org/debian-devel/2006/12/msg00647.html implies that Replaces wasn't enough, at least back then :)06:55
broderoh god, so *that's* why openssh's maintainer scripts are such a mess06:56
broder"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:56
ajmitchI think we're a bit past that point now06:58
brodergiven that half of the upgrade is going to pre-depend on a dpkg with lzma and dpkg-maintscript-helper...06:58
broderooh, speaking of which, http://lintian.ubuntuwire.org/tags/preinst-uses-dpkg-maintscript-helper-without-predepends.html has built up a collection of tags06:59
broderi'm not sure what to do with the changelog for the couchdb merge07:05
broderjderose didn't make any attempt to merge in the ubuntu history07:05
broderbut he also (deliberately) didn't attempt to merge in the rest of the packaging07:05
broderso dropping the ubuntu history doesn't seem completely unreasonable07:05
broderphew. that was a doozy07:15
=== DktrKranz is now known as Guest88310
=== Guest59628 is now known as juss01
=== juss01 is now known as jussi01
jtaylorhow do I resolve conflicts in .pc/* with bzr?10:43
jtaylorthe numpy dh_python2 was sure done carefully ._.13:12
jtaylorno wonder debian is so relucatant to take patches13:12
jtaylorso numpy 1.6 branch including multiarch fix ready13:23
jtayloranyone want to sanity check it?13:23
jtaylorthere are dangling symlinks, but they are also present in debian13:32
jtaylorthey don't look like a reason to diverge further13:32
=== 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

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