=== asac_ is now known as asac [00:47] how can I make pbuilder-dist not regenerate the source package files? I'm trying to build and upload multiple archs to a private apt server and it doesnt work because the tar/diff files are different each time (specifically it seems the content is the same, but they're recreated slightly and have different hashes) [03:22] fR__, yes [03:26] fR__, You can either set DEBBUILDOPTS="-b" in ~/.pbuilderrc or pass --debbuildopts -b when you call pbuilder [04:15] Hello , my name is Marius and have been a user of Linux for the last 4 years , the two last on Ubuntu. Anyway i was wondering if theres any way i can contribute with code? I have acquired some C++ skills over the last year :) [04:24] cody-somerville: thanks [04:24] cody-somerville: it seemed that also passing -nc worked, but this makes more sense [06:42] good morning [06:42] dholbach: good morning :) [06:42] good morning dholbach [06:42] hi ruslanr [06:42] hey nixternal [06:43] how are you guys doing? [06:43] tired :) [06:43] riding the bike like always :) [06:43] :-) [06:43] working on some KDE and Kubuntu magic to hopefully be released with karmic [06:44] what kind of magic? [06:44] a magician never reveals his secrets [06:44] netbook loving :) [06:44] man... you could reveal some secrets at Ubuntu Developer Week! [06:44] when is it? [06:44] https://wiki.ubuntu.com/UbuntuDeveloperWeek/Prep [06:45] still has some open slots [06:45] maybe something about easy pyqt hacking? [06:46] asac: you wanted to add yourself to UDW too! :) [06:46] interesting..how long has then been in prep and why am I just not hearing about it? [06:46] nixternal: man, I asked for contributions to it for a very long time :-) [06:47] I would be jiggy doing some PyKDE, Plasmoid Hacking, something...need to check with the rest of the team and see if anyone else would be interested as well [06:47] I must have been sleeping when you asked :p [06:47] 2009-06-25 08:12:47 was when I reset it again [06:47] ScottK, Riddell, rgreening ^^ [06:47] nixternal: it'd be great if it was something hands-on [06:47] like you present a piece of code that people can try out or something [06:48] dholbach: I saw a buddy of mine tonight that's very Windows oriented and has always resisted anything Linux I've tried to push him to (he is the IT guy for a medium sized business). I showed him my Mini 10v with Kubuntu on it and it took him about 30 seconds to say he wanted one. [06:48] ScottK: you get your mini today? [06:48] nixternal: Yep [06:48] I am loving this mini 10v with kubuntu on it [06:48] did you play with the dell garbage at all? [06:48] ScottK: NICE [06:48] one update and it was broken...haha [06:49] the first thing I was greeted with when I booted it was Apport :) [06:49] nixternal: Mine came with XP. I couldn't find the hardware I wanted with Ubuntu. I did boot it and it was truly ugly and unsuitable. [06:51] ahh [06:53] I had to put the panel on autohide and slide the config window as high as it would possibly go to see the 'next' button on the WPA passphrase entry screen. [06:53] They did nothing to make it work on a netbook. [06:54] nixternal: Are you having trouble with the touchpad being jumpy? [06:55] ScottK: ya, the touchpad sucks [06:55] nixternal: Look in my PPA. Try the synaptics thingy there. I ported a patch tseliot did to Karmic [06:55] some of the configs in gnome and kde suffer that same exact thing with having to move the window up so you can click OK or next [06:55] Should smooth things up a bit. [06:56] ya, I am using tseliots ppa [06:56] He's only got this patch for Jaunty [06:56] actually, it was already incorporated into karmic I thought [06:56] Nope [06:56] originally, the touchpad didn't even work [06:56] with the shipped ubuntu from dell it didn't work, and at first in kubuntu it didn't work [06:57] it seems there was 0 QA done on the mini when it was shipped, and my buddy experienced the same exact issues with his 10v as well [06:58] It was jumpy in XP too. [06:59] nixternal: It's a whole lot better with the one patch added. [07:01] Good morning [07:02] Morning pitti [07:03] kirkland: thanks; I'm not quite sure whether cache or config, but that should be fine :) [07:04] kirkland: thanks for stopping my home dir cluttering :) [07:27] nixternal, scottK, Riddell, rgreening: if you have a topic you'd like to talk about at UDW, please let me know soon - I'd like to have the schedule in the bag before I go on vacations (end of next week :-)) [07:27] (if you have more than one, that's great to :-)) [07:32] hmm, update-manager didnt want to upgrade upstart for me ... dist-upgrade did ... strange [07:32] * ogra reboots to new upstart [07:35] great, seems Keybuk didnt mess up my system :) [07:36] morning guys [07:36] hey fabbione [07:37] hey oliver! [07:37] Padre! [07:37] * pitti hugs fabbione [07:37] hey pitti === tkamppeter_ is now known as tkamppeter [07:38] ogra: at somepoint, once I am back from vacation, I need to suck your brain for a few minutes :) [07:39] sure, feel free :) [07:39] * fabbione sucks... [07:39] ;) [07:39] * ogra hears the slurping from the top [07:40] hmm, my boot is still very slow ... [07:40] * ogra reboots with profile to see if readahead update helps [07:48] * StevenK prods pitti good naturedly for MIRs :-) [07:49] StevenK: have the tab open already [07:51] hmm, didnt really get faster [07:54] pitti: Heh, great. :-) [07:54] zul, kirkland: I'd like to have postgresql-8.4 by default in karmic; is that ok with you guys? should I talk to someone else in the server team about it, or "just do it"? [07:57] darn, 2 seconds slower here even [08:07] pitti: pgsql 8.4 is out? Hmm, I'm behind the times. [08:21] just synced from Debian [08:22] pitti: if the sync script is still close could you sync apt-xapian-index from debian/sid too? or should I rather write a fomal sync request? [08:23] mvo: doing [08:24] * mvo hugs pitti [08:46] hmm, my boot sits quietly for 10s without moving [08:47] seems udevd probes like mad [08:52] I'm off for a few hours, need to do some errands === Quintasan_ is now known as Quintasan [09:59] Session terminated, killing shell... [09:59] Build killed with signal 15 after 150 minutes of inactivity [09:59] that's very rude, mr armel buildd [10:00] Keybuk, what package ? [10:00] ogra: Upstart [10:00] happened to me with mesa as well [10:00] Keybuk, afaik NCommander filed an RT ticket for setting the timeout values higher [10:01] Keybuk, so either wait or make your code compile faster ;) [10:01] https://edge.launchpad.net/ubuntu/+source/mesa/7.5~rc4-1ubuntu3/+build/1109719/+files/buildlog_ubuntu-karmic-armel.mesa_7.5~rc4-1ubuntu3_FAILEDTOBUILD.txt.gz [10:01] why's upstart sitting inactive for 2.5 hours in the middle of the build? [10:01] cjwatson: it wasn't inactive, it was compiling [10:01] well, inactive => no output [10:01] Sarvatt, yes, i looked at that already, its on NCommander's list [10:01] sure, it's compiling a vewy vewy big file [10:01] which is all the buildd can tell atm [10:01] though I am quite amused that it takes > 2.5 hours on arm :) [10:02] * liw is finding X in karmic to be unstable enough to be unusable :( [10:02] actually, that one's not unreasonbly big [10:02] Keybuk: mind if I fix up the seeds and ubuntu-meta for the new upstart? [10:03] cjwatson: sure [10:03] cjwatson: I put provides and replaces in, which seems fine for apt, but not for update-manager fwict [10:03] was just looking at that [10:03] liw: are you sure it's X that's unstable? [10:03] Keybuk, no [10:04] liw: do you get randomly logged out after some interesting number like 10 minutes? [10:04] Keybuk, I get randomly logged out at random intervals like from under a minute up to seven hours [10:05] liw: it's basically caused by X and getty sharing a vt and getty killing X [10:05] liw: "sudo stop tty1" after you login [10:06] Keybuk, yay, one more thing to do after I login -- but thanks, I assume a proper fix is forthcoming [10:06] liw: pitti has been working on it [10:06] (although since update-manager now crashes on me, perhaps I won't be getting the fix either *sigh*) [10:07] wasnt that fixed yesterday ? [10:07] * ogra thought it was in gdm's changelog from last night [10:07] crashes without a crash report, more's the pity [10:07] new ubuntu-meta might make update-manager's job easier [10:07] at least those split-out upstart packages weren't Essential: yes ;-) [10:08] hm, actually, something (apport?) told me that update-manager crashed, after which I happily finished the update using it [10:08] yeah, bug 396226 appaers to be closed by the last gdm upload [10:08] Launchpad bug 396226 in gdm "GDM logs out after some minutes of typing on the keyboard" [Critical,Fix released] https://launchpad.net/bugs/396226 [10:08] liw, is your system up to date ? [10:08] liw: maybe it forked and a subprocess crashed? [10:08] ogra, now it should be; it was up to date as of yesterday afternoon though [10:09] cjwatson: I'm confused as to why update-manager didn't dtrt though? [10:09] cjwatson, possibly. in that case apport (if that was it) shouldn't have been triggered, though? [10:09] right, the gdm fix was uploaded around 6pm [10:09] Keybuk, at least dist-upgrade did :) [10:09] Keybuk: mm, I haven't tried it. apt-get dist-upgrade wanted to remove upstart-compat-sysv and upstart-logd, but for some reason not startup-tasks or system-services [10:10] Keybuk: oh, don't you want Conflicts on those packages too? [10:10] it removed it for me ... system still boots [10:10] Replaces: startup-tasks, system-services, sysvinit, upstart-compat-sysv [10:10] Provides: startup-tasks, system-services, upstart-compat-sysv [10:10] is the "These windows do not support 'save current setup' and will have to be restarted manually..." bug going to be fixed, too? :) (that's the error dialog I get after I log in, for gdm-simple-greeter) [10:10] Conflicts: sysvinit [10:10] cjwatson: I wasn't sure on the Conflicts [10:10] "replace entire package" => Conflicts+Replaces, per policy [10:10] liw, thats the one remaining one [10:10] liw: what is the traceback? [10:10] mvo, of the update-manager thing? there is none [10:10] ok, let me add those as well [10:11] liw: nothing in the crash file? [10:11] Replaces alone is just "I stole some of your files" [10:11] mvo, nothing whatsoever, except an old epiphany one [10:11] mvo, I apologize for whining about something you can't fix :( [10:11] cjwatson: I thought Replaces+Provides was the special one [10:11] nah [10:12] http://people.ubuntu.com/~cjwatson/ubuntu-policy/policy.html/ch-relationships.html#s7.6.2 [10:12] cjwatson: ah, no, that's the special one in dpkg isn't it [10:12] apt needs conflicts as well [10:12] I remember [10:12] hmm... gdm-greeter, /dev/sdd1, and xrandr... just three things for me to do after login, to work around bugs, now [10:12] * liw quits whining and goes find lunch [10:13] * mvo hugs liw [10:17] Keybuk, hmm, no /etc/event.d/tty files anymore ? [10:17] ogra: /etc/init/tty* [10:17] oh, thats the new dir [10:17] i was looking for jobs.d :) [10:17] man 5 init [10:17] [10:18] i still have /etc/event.d/control-alt-delete and /etc/event.d/sulogin left though [10:18] ogra: yes, I haven't done any magic to migrate user changes from /etc/event.d into /etc/init yet [10:18] so I deliberately left them there [10:18] ok [10:18] before FF, there'll be some Perl that'll migrate things over and clean up [10:19] * ogra guesses the serial console howto will need updating [10:20] that's weird [10:20] ? [10:20] my init(8) is out of date [10:21] cjwatson: so, here's one for you ;) [10:21] mine isnt [10:21] I seem to have both /usr/share/man/man8/init.8 [10:21] and /usr/share/man/man8/init.8.gz [10:21] :p [10:21] DDTT ;-) [10:21] dh_installman called after dh_compress? [10:22] ah, no [10:22] "make install" vs "dpkg -i" [10:22] ah [10:22] I doubt that man-db defines any ordering between those two files [10:26] liw: should be fixed with latest gdm (ubuntu5) [10:26] apparmor depends on upstart-compat-sysv (>= 0.3.9-6) | sysvinit (>= 2.86.ds1-56ubuntu3); however: [10:26] *sigh* [10:27] I wonder why it even does that === sabdfl1 is now known as sabdfl [10:34] cjwatson: you were doing a seed and meta update, right? [10:35] I did [10:36] does it need a further change? [10:39] cjwatson: did you drop the upstart-logd dep? [10:39] ah yes [10:39] great, no further change necessary [10:39] my -changes folder hadn't quite caught up [10:40] ok [10:41] Keybuk: http://cdimage.ubuntu.com/custom/20090710-i486/ http://cdimage.ubuntu.com/custom/20090710-i586/ [10:41] Keybuk: gratuitously oversized; I haven't bothered to investigate why [10:41] no idea whether it'll boot successfully, etc. :-) [10:42] I'm sure it'll break usb-creator in some new and unique way [10:42] but great, I shall download that and get testing presently [10:43] Keybuk: I just ran it through the usual cdimage code, so hopefully not too much new and exciting there, but the live filesystems were necessarily built rather weirdly [10:59] Brasero broken ? it can't find a single device here :s [11:04] dupondje: -v [11:10] Keybuk: it segfaults on brasero --version :( [11:10] ii brasero 2.27.3-0ubuntu1 CD/DVD burning application for GNOME [11:12] dupondje: karmic? use apport to file a bug [11:15] https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/397776 [11:15] there [11:15] Ubuntu bug 397776 in brasero "Unable to find any device" [Undecided,New] [11:19] the speed difference between "initctl list" and "sudo initctl list" is kinda interesting [11:59] * NCommander grumbles awake [11:59] (ish) [12:06] ogra, Keybuk I extended the RT request on the timeout for mesa now that I see its the same issue [12:07] NCommander, i thought you wanted to have it higher generally [12:07] that would make a lot more sense given that even upstart times out now [12:07] ogra, I did, but I also provided a list of packages we know are doing it [12:07] But its up to IS to decide if they want to extend the timeout overall, or just for specific packages [12:08] tkamppeter: foo2zjs now recommends tix and thus tries to pull tix into main; I don't think that we want that; can the recommends be dropped to a suggests? [12:09] well, add upstart to the list :) [12:09] doesnt build either [12:13] Ugh [12:13] We need to take a look at why lzma is so slow on ARM [12:13] Even on 1GHz hardware, it should be fast enough to crunch upstart down to size [12:13] what makes you so sure its lzma ? [12:14] ogra, that's what it was for KDE, and mesa using lzma compression [12:14] I haven't looked at upstart yet [12:14] (the change that broke KDE was also lzma) [12:14] upstart is an unrelated FTBFS [12:15] well, i dont see any indicator in either upstart or mesa that its lzma related [12:15] (if it dies in dpkg-deb, and pkgstriptranslations has run, and it uses LZMA compression, then it usually is just lzma taking too long) [12:15] ogra, mesa fails in dpkg-deb, the options have it use lzma compresison, its failing during creation of the actual debs [12:16] * ogra thought he saw it dying in unpacking ... [12:16] * ogra checks again [12:16] oh, right [12:16] ogra, right, so mesa is the same issue, upstart isn't; the compiler looks like its hanging there [12:17] yeah, its Keybuk's code or packaging [12:18] pitti, yes, the tix recommendation in foo2zjs can be changed to a Suggests. [12:19] grumble [12:19] That's going to be annoying to fix [12:19] we should just run the buildds with cerosine instead of diesel :) [12:22] ogra, huh? [12:22] * NCommander felt that joke buzz my hair as it flew over my head === jussio1 is now known as jussi01 [12:44] tkamppeter: do the hplip upstream guys read LP? bug 394447 has an upstream task, but no link to an upstream bug [12:44] Launchpad bug 394447 in hplip "karmic printing regression on HP PSC 750" [High,New] https://launchpad.net/bugs/394447 === agateau_ is now known as agateau [13:08] kirkland: thanks for stopping my home dir cluttering :) .... [13:08] pitti: wow, that one patch stopped your home dir cluttering ? :-) [13:09] pitti: if you're looking for opinions, you could mention it on the ubuntu-server@ mailing list, or in next week's community IRC meeting (Tuesday) [13:09] pitti: we had a similar discussion about PHP5.3 this week [13:09] pitti, HP uses Launchpad as upstream bug tracker, so adding an upstream task makes a real upstream bug report out of the Ubuntu bug. [13:10] pitti: on the other hand... you could just "do it", and you won't catch any flack from me, or rest of Canonical's server team; not sure about the rest of the community [13:14] kirkland, how goes the kvm SRU :-) [13:28] NCommander: SRU or backport? [13:28] NCommander: oh, it's in -proposed [13:28] kirkland, did we say we were going to wait on the SRU before backporting? [13:28] Right [13:28] ;-) [13:29] NCommander: hmm, yeah, I'm not opposed to that [13:30] If you do the backport first you'll never get SRU testers. [13:30] kirkland, my concern is in the (admitly unlikely case) the update gets deleted [13:30] ScottK, this is the backport of kvm [13:30] NCommander: let me poke a few people to verify the -proposed upload [13:30] NCommander: OK. I got that. [13:30] ScottK, its already been heavily PPA tested, but I wanted the latest SRU to land before I give it the magic blessing [13:30] NCommander: I agree with that. [13:31] ScottK, indeed [13:38] kirkland: the only 8.3 specific dependency is bacula, I'll do that migratino [13:42] pitti: could you have a look at my last comment to https://bugs.edge.launchpad.net/ubuntu/+source/kvm/+bug/392295 and see if that's reasonable? [13:42] Ubuntu bug 392295 in kvm "Kvm-84 qcow2 problems" [High,Fix committed] [13:44] kirkland: answered in the bug [13:45] pitti: cool, thanks. [14:06] could someone have a look at gupnp-idg and telepathy-mission-control-5 that are sitting in karmic new queue? [14:08] bigon, why? [14:09] tp-mc-5 will be needed by empathy 2.28 [14:09] and gupnp-igd provide upnp support to libnice (I don't know if we want that) [14:10] booth are stuck in debian newqueue ATM [14:11] bigon, is there any hurry, is it blocking an update? [14:11] bigon, ie any reason to drop other tasks to hurry on that now or can it wait? [14:14] not really actually (and I've just checked ff is in 1month+ ahead) [14:16] but maybe enabling upnp support is not a bad idea to let ppl test it [14:16] right, but that seems it can wait for monday [14:16] I will have a look next week if nobody is faster [14:17] I still have things I want to get done today and it's friday afternoon ;-) [14:17] no problem :) === fabbione is now known as fabbione-vac [14:44] hi mbiebl - have you done any more work on tracker packaging recently? it seems that a 0.7 release is quite close, and i wanted to start thinking about the packaging in ubuntu now [15:18] * liw has the first results from zsync benchmarking: for hardy-security updates, it saves 25% compared to plain http, if the .debs get recompressed [15:24] cjwatson: ^^ [15:24] :) [15:25] liw: recompressed ordinarily, or with gzip --rsyncable? [15:25] with --rsyncable [15:25] I'm not entirely impressed with these results [15:25] Keybuk: it's probably something very old === Tonio__ is now known as Tonio_ === chrisccoulson is now known as chrisccoulson_ === chrisccoulson_ is now known as chrisccoulson [15:37] liw: mm, not superb. I'm interested in Packages file savings? [15:37] cjwatson, that's on my todo list, haven [15:38] 't gotten that far yet [15:39] * cjwatson nods [15:40] is there an archive of the Packages files easily accessible? [15:41] I don't think so, I think we throw those away [15:41] you'd probably just have to sit downloading them daily for a while to get a decent archive [15:41] or you might try snapshot.debian.net for near-equivalents, maybe? [15:41] I can't remember if it has the right kind of indices [15:42] for now, I'll just test the packages files between hardy and hardy-security, but I'll set up something to snapshot the packages fail daily for karmic [15:43] hm, no, there's no point in updating from hardy to hardy-security for the Packages file [15:43] so I'll just do the snapshotting first [15:43] perhaps compare hardy-security to hardy-updates for that? [15:49] how often does the packages file get updated? hourly? [15:51] hm, total bytes in original .debs: 1271336808; recompressed with --rsyncable: 1283683849; that's less than 1% of increase [15:52] hourly, yes [15:52] liw: what's that, main? [15:52] oh, the security packages [15:52] cjwatson, yeah, security [15:52] did you recompress hardy as well? [15:52] or do you not need to? [15:53] both files need to be re-compressed [15:53] mm, that's what I thought [15:55] that should not be a problem, though, since apt-sync needs to re-create the .deb (using dpkg-repack) and can do --rsyncable then [15:55] hmm... if I undo the compression within the .deb, the percentage of re-used bytes grows up to 50 [15:56] can we stop compressing .debs, please? ;-) === nxvl_ is now known as nxvl [15:57] did you exclude non-gzipped packages from the set, or just recompress them? [15:58] essentially I do this: (cd "$temp" && ar x x.deb && gunzip *.gz && gzip --rsyncable *.tar && [15:58] rm -f x.deb && ar qc x.deb *) [16:00] hm, maybe I should push the bzr branch with these scripts somewhere public [16:01] (I decided it's worth automating the whole running of the benchmarks, since I'm a klutz and will be running them many times. Also, helps other people reproduce results.) [16:04] right, so maybe exclude anything bz2/lzma-compressed there, since we think we know those aren't going to work out so well [16:05] I should to that, yes [16:05] or I could convert those compressions to gzip --rsyncable? [16:06] or that, yes [16:06] it'd be useful data even if we don't do that with the .debs themselves [16:06] I wonder how many of the security updates do that, anyway === Nicke_ is now known as Nicke [16:08] there's a bunch [16:11] cjwatson, one more question -- is there a standard mapping for area-zones to city-zones, (e.g. US/Eastern -> America/New_York) sitting around somewhere? Seems to only be US/MX/CA that use area-zones [16:13] the 'backward' file in the tzdata source package has an equivalence list [16:13] cjwatson, you are chock-full of useful information. :) Thanks [16:15] evand, duh about oem reserved name. :) thanks for the catch [16:16] Sure thing. I completely missed it while eying over the code. [16:18] for x in hardy-security-2009-07-10/*.deb; do echo "$x $(ar t $x | grep -E '\.(lzma|bz2)$' | tr '\n' ' ')"; done | awk '/ (control|data).tar.(lzma|bz2)/ { print $1 }' | sed 's:.*/::;s:_.*$::' # my youth was misspent [16:19] 186 packages, mainly openoffice.org and linux kernel related ones [16:21] lzma will go up a lot in Karmic. [16:23] hi, i found mysqlslap is listed as one of the MySQL 5.1 Client Programs at http://dev.mysql.com/doc/refman/5.1/en/programs-client.html, but not included in any of the apt packages like other client programs. i'm not sure if it's a bug or intended? [16:27] maybe not the right place to report this:( [16:33] Keybuk: hey, you didn't update the apparmor bzr tree. :P [16:39] pitti: around? [16:39] kirkland: yes (in release meeting) [16:39] pitti: perhaps naive MIR question.... [16:40] pitti: i wonder about the utility of the wiki portion of the MIR [16:40] pitti: what does the wiki add, that couldn't be handled in an LP bug? [16:41] kirkland: some MIR bugs paste the info directly, that's generally fine [16:41] kirkland: not much, just better formatting, but it's not important [16:41] pitti: okay, cool, thanks. [16:41] by and large, just for historical reasons [17:04] james_w: hey - could you bump mysql-dfsg-5.{0,1} in the package importer? [17:04] so nobody care about all the bugs in the RT-kernel??? [17:05] mathiaz: I can, but it won't be very quick I'm afriad [17:05] am i the only one trying to make music with linux? [17:05] the LP API is currently broken [17:05] james_w: I'm fine with that [17:05] should be back up today [17:06] james_w: ok - I was playing with the bzr branches yesterday [17:06] queued anyway [17:06] everything go ok? [17:06] anyone knows, maybe someone is working on it and i will finally shut the $"#% up === dpm is now known as dpm-afk [17:07] wip: why don't you ask the kernel team? [17:07] cjwatson, re: your 'backward' isn't exported. Yeah, I was looking at that. It might just be easiest to hardcode US/MX/CA mappings. [17:07] Whats the best way to do deal with an upstream who released an rc and actual release (note there are changes between the two releases) but don't change the version (so the tarball name is different but naturally have different md5sums)? [17:08] Quintasan: is there a specific irc channel? [17:08] james_w: well - I was suprised how easy it was to merge a new debian revision [17:08] james_w: but when I tried to merge a new upstream version it got much more complicated [17:08] wip: dunno try #ubuntu-kernel or use mailing lists [17:08] mathiaz: what did you try? [17:09] james_w: so I tried squid, which was a new debian revision [17:09] cody-somerville: the RC is in the archive? [17:09] james_w, yes [17:09] james_w: bzr branch sid/ k-merge [17:09] james_w: cd k-merge; bzr merge ../karmic [17:09] cody-somerville: I'd just change the version number, with a ".really" or something if needed [17:09] james_w: it went very well [17:09] * cody-somerville nods. [17:09] and explain in the changelog [17:10] not really another option [17:10] james_w: I could do things like bzr diff --old ../sid or bzr diff --old ../karmic [17:10] mathiaz: cool [17:10] james_w: and things were much faster than using debdiffs [17:10] james_w: after that I tried drbd8 which was a new upstream version [17:11] james_w: and then I got way more information to look at, tons of conflicts [17:11] mterry: you could take md5sums of everything in /usr/share/zoneinfo and look for dups; could be done pretty cheaply I think [17:11] cjwatson, or could add tzdata to d-i source packages and steal the backward file [17:11] james_w: so I'm not about the correct workflow to do a merge when there is a new upstream version [17:11] mathiaz: still merging from debian? [17:12] james_w: yes [17:12] cody-somerville: doesn't really matter what the upstream tarball is called; you'll be renaming it to foo_1.0.orig.tar.gz anyway, and the directory at the top-level of the tarball doesn't matter as dpkg-source canonicalises that itself [17:12] mathiaz: let me try [17:12] cjwatson, but really, I thought the number of zones was small enough to get away with cheap and dirty [17:12] mterry: could do, though it feels messy [17:12] mathiaz: ah, where are the branches? [17:12] james_w: hm - right - it wasn't drbd [17:12] cjwatson, They name their tarball as foo_1.0.orig.tar.gz [17:12] mterry: it's probably OK, just consider whether there's any rate of change there [17:12] james_w: let me go try to remember which package I choose [17:12] cjwatson, so the md5sum mismatches foo_1.0.orig.tar.gz already in the archive [17:13] cody-somerville: oh, in that case what james_w said. consider this a reason not to package RCs as 1.0 in the future ;-)) [17:14] cjwatson, Yar, I'm not sure. How often do the area-zones change? (every time the law renames them? :)) It doesn't sound like tzsetup upstream is likely to add new translations for area-zones soon [17:14] superm1, ^^ ;] [17:14] it's usually every time some legislature gets a bright idea, yes [17:15] james_w: found it - it was ipsec-tools [17:15] not so much renames, but additions (think things like Indiana and Arizona) [17:15] which I think are city-based in the US but I don't know whether that's the case everywhere [17:16] mathiaz: thanks, pulling, I'll get back to you in a minute :-) [17:17] james_w: great - so what I did was branch sid/ k-merge; cd k-merge; merge ../karmic [17:17]