<div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">> > Also the goodies don't have any branches for a particular version.<br>> We can keep things in trunk like it is now, but make this not the
<br>> default work/uploading branch.<br><br>Why not? :)</blockquote><div><br>to prevent 4.2-isms slipping in. What I understand by trunk is a place where<br>the common code is and branches specialize that. So thunar can live in the trunk
<br>but 4.2 and 4.4 should merge from trunk and modify debian/ dirs accoridngly.<br>there may not be many differences now but you never know :)<br></div><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
> So what is now done in trunk _and_ part of xfce (not gooodies, exo,<br>> thunar) let's move over to branches/4.2.3 and do the uploads from<br>> there until 4.2.4 and so on.<br><br>Right, but how does this get merged in to
4.2.4?</blockquote><div><br>I assume svn copy branches/4.2.3 branches/4.2.4 or an equivalent command when<br>starting the 4.2.4 cycle, at which point 4.2.3 is frozen.<br><br></div> | At the moment (in theory), we work on trunk, we copy to branches/4.2.3
<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">the first time and then merge to branches/4.2.3 on subsequent releases.<br><br>Then when
4.2.4 comes along (or 4.3.99-RC1 or whatever) we update trunk<br>appropriately and copy to that version.</blockquote><div><br>The current situation works too mostly because there is not much difference in packaging<br>4.2
vs 4.4, but it would be more pedantic to work on a branch when effectively that<br>branch is targeted.<br></div><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
> Make a new branches/4.3 (or 4.3.2 it wasn't any official version<br>> AFAIK) and start working there in preparation for when 4.4 beta or RC<br>> is released. I am willing to do this work. So when they release there
<br>> is little left to do packaging-wise for uploading to<br>> experimental/dapper.<br><br>You're welcome to create /branches/4.3 and use it for experimental<br>packages.</blockquote><div><br>will do, thanks. <br></div>
<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">> > *BUT* what should we do with the goodies?<br>> > And where to exo/thunar/orage sit?
<br>> We don't have to reorganize everything, just make the current<br>> situation a bit better for 4.3 work. Orage/thunar seem to work with<br>> 4.2 and 4.4 so they are ok in trunk IMHO.<br><br>Right but as I explained, they /don't/ sit in /branches/4.2.3 at the
<br>moment because upstream doesn't release them all at once under one<br>version tag. Likewise the goodies.</blockquote><div><br>Right, as I said only move xfce core - the stuff that clearly is different in 4.2 vs 4.4 to branches
<br>and keep working on goodies/thunar on trunk.<br>Now that I think of it, trunk doesn'r really make sense for xfce core we could just have the 4.2 and the 4.4<br>branches. Either way there are going to be mostly manual merges between branches as at least the versions
<br>in the changelogs conflict. <br></div>So I'll just make a 4.3 branch and if it is too tedious to merge with trunk we may rediscuss it.<br><br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
> > This is due by the 19th this month? i.e. Thursday? I don't think we<br>> > are able to put this in Debian that fast.<br>> I don't know anything about planned upstream release dates.<br><br>No, this is the date of the Dapper freeze:
<br> <a href="http://lists.debian.org/debian-devel-announce/2006/01/msg00008.html">http://lists.debian.org/debian-devel-announce/2006/01/msg00008.html</a><br>and <a href="https://wiki.ubuntu.com/DapperReleaseSchedule">
https://wiki.ubuntu.com/DapperReleaseSchedule</a></blockquote><div><br>Ah that :) <br><br></div></div>I really hope to get exceptions for xfce packages just as gnome/kde and other core parts are not<br>affected by upstream version freeze.
<br><br>Jani<br>