| joelesko | micahg: I added the change to my beta branch. Going to do a test build to verify. | 03:59 |
|---|---|---|
| joelesko | micahg: I looked at the thunderbird code branches and see what you mean that you need to redo the seamonkey branches to better organize them | 04:02 |
| joelesko | Let me know if there is anything I can help with. | 04:03 |
| === m_conley is now known as m_conley_away | ||
| micahg | joelesko: thanks, I think just stable and beta are fine for seamonkey at this point | 04:56 |
| micahg | joelesko: ok, so a few things, first, the changelog target should be UNRELEASED, this can be accomplished by making a new changelog with dch -i -DUNRELEASED or dch -v VERSION_GOES_HERE -DUNRELEASED | 05:53 |
| micahg | joelesko: second, patches should only be removed if they're applied upstream, not if they don't apply to the source (they may need to be rebased) | 05:55 |
| micahg | joelesko: third, r261 is confusing, the patches are removed, but they're added to the series file | 05:57 |
| micahg | joelesko: regarding these patches, you might want to look at the thunderbird-beta branch to see which ones have been kept and which ones dropped | 05:57 |
| micahg | joelesko: if you want to try to fix these, you can start with a fresh branch and pull each revision in individually from the old one with bzr merge -c, then you can overwrite the branch you pushed to LP with your new changes | 06:00 |
| micahg | joelesko: if this were a production branch, we'd just commit on top though, but since it's a branch to be merged, you have that luxury :) | 06:01 |
| micahg | joelesko: also, if you can make the commit for the new beta release separate (i.e. before you make changes related to the new release), that would be great | 06:08 |
| chrisccoulson | g'ah, i hate this KDE patch | 12:37 |
| chrisccoulson | i think we should kill it | 12:37 |
| chrisccoulson | it's such a pain having a distro patch this bug | 12:37 |
| chrisccoulson | **big | 12:37 |
| chrisccoulson | m_conley_away, you around? | 12:45 |
| chrisccoulson | could we get the latest version of messagingmenu-extension on addons.mozilla.org? | 12:45 |
| chrisccoulson | we have some upgraders from natty who installed it, and are having issues after upgrading to oneiric (because it takes priority over the bundled version, and loads old libraries in to thunderbirds address space) | 12:46 |
| === m_conley_away is now known as m_conley | ||
| chrisccoulson | w00t, i'm attending mozcamp in berlin :) | 13:39 |
| chrisccoulson | busy month next month | 13:39 |
| byte_bucket | anyone here happen to be involved in the CA (re)verification project ? | 14:47 |
| micahg | chrisccoulson: you were supposed to upstream the KDE patch :P | 15:43 |
| chrisccoulson | micahg, well, it's maintained by the opensuse maintainer | 15:43 |
| chrisccoulson | and it's not really in an "upstreamable" form | 15:44 |
| joelesko | micahg: I did the changes you requested to my beta branch ( I think) . The pldhash is in the upstream version as pldhash.cpp. | 15:46 |
| joelesko | micahg: I'm not sure I'm in sync with what you want yet. I was having some problems with the merge -c stuff. | 15:47 |
| micahg | joelesko: thanks, it's a busy short week for me, so I might not get to review again before the weekend | 15:47 |
| joelesko | no problem. I want to build the beta to make sure it works. | 15:48 |
| micahg | joelesko: so, I was just offering a tip there, it's not required, bzr merge -c REV_NO just gives you the diff of one revision that you can apply to another branch | 15:48 |
| joelesko | micahg: I apperciate tip. I'm always open to learn a better way. I know you have been doing for a long time and would like to learn from your experiences. | 15:49 |
| joelesko | chrisccoulson: Is the L10N intergration difficult? | 15:51 |
| micahg | joelesko: better, but, can you make each change/entry in debian/changelog a single commit, they came through all as one commit this time | 15:51 |
| micahg | it makes it easier to review the changes as well as merge specific changes to another branch | 15:52 |
| micahg | joelesko: well, we wanted to do l10n for oneiric, but I had a build failure, I can push up my branch if you want to play with it | 15:52 |
| joelesko | micahg: I was wondering about that. I think you said it a few times. Each '*' in the changelog needs to be it's own commit. Correct? | 15:52 |
| micahg | joelesko: yes, and bzr commit will use whatever the diff is in debian/changelog as the commit message in oneiric on | 15:53 |
| micahg | joelesko: also, let's not hardcode specific tags in debian/rules, it should be able to use any tag from the beta channel ideally | 15:54 |
| joelesko | ok. makes sense | 15:55 |
| joelesko | I will fix those issues later today. Thanks for the feedback. | 15:56 |
| mdeslaur | chrisccoulson: have you seen an issue where opening firefox will only show the window decorations with nothing inside? | 16:11 |
| mdeslaur | chrisccoulson: retrying 2-3 times eventually makes it open | 16:11 |
| chrisccoulson | mdeslaur, i haven't | 16:14 |
| chrisccoulson | mdeslaur, perhaps try chrome? isn't that what everyone else is using anyway? | 16:15 |
| chrisccoulson | sorry, that was meant to be sarcastic ;) | 16:15 |
| chrisccoulson | not having a good start to the week | 16:15 |
| micahg | chrisccoulson: so this would be a bad time to tell you I'm out Thursday and Friday again this week (last one until I go on a real vacation) ;) | 16:17 |
| chrisccoulson | micahg, i don't mind. perhaps i will book some time off at the end of the week too | 16:18 |
| mdeslaur | chrisccoulson: I can blame compiz if it makes you feel any better | 16:19 |
| chrisccoulson | mdeslaur, oh, blaming compiz always makes me feel better | 16:20 |
| micahg | mdeslaur: there are bugs about compiz/vlc already :) | 16:20 |
| chrisccoulson | especially seeing as i don't use it ;) | 16:20 |
| micahg | unity-2d FTW! :) | 16:20 |
| chrisccoulson | heh | 16:20 |
| chrisccoulson | i actually like gnome-shell | 16:20 |
| * chrisccoulson hides | 16:20 | |
| micahg | chrisccoulson: you're safe in this channel (mozjs :)) | 16:20 |
| chrisccoulson | but i prefer unity-2d over both of them | 16:21 |
| joelesko | chrisccoulson: I always blame it on solar flares :) | 16:23 |
| chrisccoulson | heh :) | 16:23 |
| chrisccoulson | wow, i've booked my flight to the platform rally already. i normally end up forgetting about it and then leaving it really late | 16:24 |
| joelesko | micahg: If we don't put a tag in for what release to use, shouldn't all patches be removed? | 16:26 |
| micahg | joelesko: huh? why? | 16:27 |
| joelesko | from the beta branch | 16:27 |
| joelesko | If you check out a different beta, patches may not work. | 16:27 |
| joelesko | Or am I missing something | 16:27 |
| micahg | joelesko: the patches should only be removed when they get applied upstream or are no longer necessary due to upstream changes (not just not apply) | 16:27 |
| micahg | joelesko: we'll track the latest version of the channel in question, that's why commiting which version you're working on (as an entry in debian/changelog) is important, people can see at what point stuff gets changed/dropped | 16:29 |
| joelesko | ohhhh. Now I get it. Thanks | 16:29 |
| chrisccoulson | mdeslaur, do you see anything on the console when you see your firefox bug btw? | 16:40 |
| mdeslaur | chrisccoulson: no, but I'll restart my session, may not be a firefox issue | 16:42 |
| === m_conley is now known as m_conley_away | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!