[pkg-fso-maint] I need a DD to upload libfsoresource :-)

[Heiko Stübner]

Am Sonntag 14 März 2010 20:49:47 schrieb Jonas Smedegaard:
> Sorry, I do not understand.
> 
> I tried reading the debian/copyright file to find the upstream source
> but that only points to http://www.freesmartphone.org - some fumbling
> around and guessing lead me to http://git.freesmartphone.org/ but there
> I see no libfsoresource which is a) a problem for me to understand right
> now and b) unacceptable for Debian.
one possible download location would be 
http://downloads.freesmartphone.org/sources, which was linked to from the 
freesmartphone.org startpage. And it seems they built a new one that is 
missing this link. Also libfsoresource is a subdirectory of the cornucopia 
upstream git repository.

So I should elaborate a bit more in the copyright files.


> Please elaborate more on the correlation between Upstream Git and Debian
> packaging Git - both what has been done and also what was the intend of
> doing what was done.  Perhaps if I understand both I can suggest a
> structure which is both convenient for your needs and elegant for other
> Debian developers to grasp (I have had some experience in keeping
> upstream and Debian Gits in sync at the Sugar project(s)).
As the fso releases are far between we use git snapshot as base for the debian 
packages at the moment. The individual projects only exists as subdirectories 
[no git submodules] in the cornucopia repository.

So the individual subdirectories are spearated to new branches. I.e. 
	./libfsoresource in the master branch
becomes
	./ in the libfsoresource branch
This branch in between is simply a means to keep this separation and the 
following changes also separate.

upstream-dist becomes libfsoresource + "autoreconf -i".

According to you schema:
    Upstream Git     Debian Git
    ------------     ----------
 
    master		-> master
    			-> libfsoresource
			-> upstream-dist
	                -> pristine-tar
                  	-> debian


> >As we will follow upstreams git for a while still, I would like to keep
> >the branches as is for now. With this layout it's possible to make
> >scnapshots with relative ease [merge master to "programname"-branch,
> >merge "prog"-branch to upstream-dist, run autogen, merge to debian,
> >update build files, build].
> >
> >Also this helps visualize where each one comes from. I.e. debian branch
> >on top of upstream etc.
> 
> I fail to see a problem in renaming the branches.  Only if a single Git
> repository is used for both upstream work and Debian packaging would
> that be needed as I see it - and I strongly recommend against that.
> Unless I missed something special to this particular project, Git have
> no problem renaming brnaches across clones and still keep things in sync
> - like this:
> 
>    Upstream Git     Debian Git
>    ------------     ----------
> 
>    master
>    upstream-dist -> upstream
>                     pristine-tar
>                     master
> 
> I would really want to rename now before too many start tracking our
> Git, as I believe we cannot rename without all users of the Git
> needing to handle it manually.
> 
> So please try convince me what is so special here, or allow me to
> rename.
ok I think I understand now. Implementing it something like this should work:

    Upstream Git     Debian Git
    ------------     ----------
 
    master		-> upstream-git [name may vary]
    			-> libfsoresource
			-> upstream
	                -> pristine-tar
                  	-> master

right?
When I look at this schema, it looks reasonable to me :-)
[By the way, how does the renaming of git branches work? For another project I 
did a search for it but didn't find anything]


Heiko