[Pkg-xfce-devel] svn structure and 4.4 packaging

[Jani Monoses]

>
> > > Also the goodies don't have any branches for a particular version.
> > We can keep things in trunk like it is now, but  make this not the
> > default work/uploading branch.
>
> Why not? :)


to prevent 4.2-isms  slipping in. What I understand by trunk is a place
where
the common code is and branches specialize that. So thunar can live in the
trunk
but 4.2 and 4.4 should merge from trunk and modify debian/ dirs accoridngly.
there may not be many differences now but you never know :)

> So what is now done in trunk _and_ part of xfce (not gooodies, exo,
> > thunar) let's move over to branches/4.2.3 and do the uploads from
> > there until 4.2.4 and so on.
>
> Right, but how does this get merged in to 4.2.4?


I assume svn copy branches/4.2.3 branches/4.2.4 or  an equivalent command
when
starting the 4.2.4 cycle, at which point 4.2.3 is frozen.

 | At the moment (in theory), we work on trunk, we copy to branches/4.2.3

> the first time and then merge to branches/4.2.3 on subsequent releases.
>
> Then when 4.2.4 comes along (or 4.3.99-RC1 or whatever) we update trunk
> appropriately and copy to that version.


The current situation works too mostly because there is not much difference
in packaging
4.2 vs 4.4, but it would be more pedantic to work on a branch when
effectively that
branch is targeted.

> Make a new branches/4.3 (or 4.3.2 it wasn't any official version
> > AFAIK) and start working there in preparation for when 4.4 beta or RC
> > is released. I am willing to do this work. So when they release there
> > is little left to do packaging-wise for uploading to
> > experimental/dapper.
>
> You're welcome to create /branches/4.3 and use it for experimental
> packages.


will do, thanks.

> > *BUT* what should we do with the goodies?
> > > And where to exo/thunar/orage sit?
> > We don't have to reorganize everything, just make the current
> > situation a bit better for 4.3 work. Orage/thunar seem to work with
> > 4.2 and 4.4 so they are ok in trunk IMHO.
>
> Right but as I explained, they /don't/ sit in /branches/4.2.3 at the
> moment because upstream doesn't release them all at once under one
> version tag.  Likewise the goodies.


Right, as I said only move xfce core - the stuff that clearly is different
in 4.2 vs 4.4 to branches
and keep working on goodies/thunar on trunk.
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
branches.  Either way there are going to be mostly manual merges between
branches as at least the versions
in the changelogs conflict.
So I'll just make a 4.3 branch and if it is too tedious to merge with trunk
we may rediscuss it.

> > This is due by the 19th this month?  i.e. Thursday?  I don't think we
> > > are able to put this in Debian that fast.
> > I don't know anything about planned upstream release dates.
>
> No, this is the date of the Dapper freeze:
>
> http://lists.debian.org/debian-devel-announce/2006/01/msg00008.html
> and     https://wiki.ubuntu.com/DapperReleaseSchedule


Ah that :)

I really hope to get exceptions for xfce packages just as gnome/kde and
other core parts are not
affected by upstream version freeze.

Jani
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.alioth.debian.org/pipermail/pkg-xfce-devel/attachments/20060115/6dcb5bf1/attachment-0001.html