[Pkg-giraffe-discuss] Mailing lists created - branch layout in giraffe.git Re: Upstreaming patches Re: zarafa in Debian
Ivo Timmermans
i.timmermans at zarafa.com
Thu Nov 10 15:20:45 UTC 2011
Hi all,
I'm afraid I don't know enough about git branch structuring to answer your questions. However, what kind of help would you like in regards to making a DFSG-compatible branch? You probably know this better than I do.
This message was sent using Zarafa WebApp.
-----Original message-----
> From:Christian Leutloff <leutloff at sundancer.oche.de>
> Sent: Don 10-Nov-2011 13:54
> Naar: Guido Günther <agx at sigxcpu.org>
> Cc: Ivo Timmermans <i.timmermans at zarafa.com>; Remon van Gijn <r.vangijn at zarafa.com>; John van der Kamp <j.vdkamp at zarafa.com>; wolfi at sigxcpu.org
> onderwerp: Mailing lists created - branch layout in giraffe.git Re: Upstreaming patches Re: zarafa in Debian
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi,
>
> I have set up two mailing lists, so that we can continue the
> discussion in the open (when all interested parties have subscribed):
>
> pkg-giraffe-maintainers: Packaging related discussions
> and
> pkg-giraffe-discuss: Discussing non packaging related topics
>
> The subscription to the mailing lists is available on alioth:
> https://alioth.debian.org/mail/?group_id=100693
>
>
>
> Let me summarize the initial branch layout in giraffe.git:
>
> - - upstream/7.0 (mirrors https://git.zarafa.com/zcp/zcp/commits/7.0)
> - - dfsg-clean/7.0 (only the dfsg-free content from above)
> - - debian/7.0 (this is dfsg-clean/7.0 plus debian packaging)
>
> Is this correct?
>
>
> This leads to these (my) action items:
>
> 1) remove existing giraffe.git and create empty new one
> (these on git.debian.org, the other commands on my PC:
> rm giraffe.git && git init giraffe.git)
>
> 2) create branch upstream/7.0 in giraffe.git and clone from
> https://git.zarafa.com/zcp/zcp/commits/7.0
> (git clone https://git.zarafa.com/zcp/zcp/commits/7.0 upstream/7.0)
>
> 3) create branch dfsg-clean/7.0
> (git checkout -b dfsg-clean/7.0 upstream/7.0)
>
> What is the best strategy to fill it
> a) clone from upstream/7.0 and remove any non dfsg-free file or
> b) add only the checked dfsg-free files one by one (or chunk by chunk)?
>
> 4) create branch debian/7.0 and clone from dfsg-clean/7.0 and add the
> debian packaging files
>
> (git checkout -b debian/7.0 dfsg-clean/7.0
> git add debian
> git commit -m ""
> git push)
>
>
> I have the following questions:
>
> 1) Will the tar file automatically generated from the upstream branch
> or dfsg-clean branch?
>
> 2) Is there an example available for another project where the used
> git commands are shown that leads to the desired structure? Or is git
> - --help enough?
>
> The other project organizational action item would be to remove
> pkg-giraffe.git from alioth and add giraffe.git and to d-push.git to
> the scm page (or a least to a project web page). The alioth related
> part will be performed by Guido?
>
>
> Bye
> Christian
>
>
> Am 08.11.2011 17:56, schrieb Guido Günther:
> > On Tue, Nov 08, 2011 at 04:45:43PM +0100, Ivo Timmermans wrote:
> >> Wait, is the name of the tree pkg-giraffe/pkg-giraffe.git or
> >> pkg-giraffe/giraffe.git? The former has no files, the latter
> >> does; the former is available via the Alioth SCM browser, the
> >> latter isn't.
> >
> > The _project_ is named pkg-giraffe so the repo is named
> > giraffe.git. Christian already put in some files but I think we
> > should better wipe it and mirror the Zarafa branch (as discussed)
> > and put Christian's work on top. It's not available in the web gui
> > since it doesn't have read permissions for 'others'. I'll let
> > Christian handle the initial setup it so we don't have several
> > people interfering.
> >
> > pkg-giraffe.git got autocreated by the alioth software. I've
> > removed it once but it seems to get recreated automatically -
> > that's a new feature since the last alioth update, will have to
> > check how to turn it off. Cheers, -- Guido
> >
> >>
> >>
> >> Kind regards,
> >>
> >> Ivo Timmermans Manager Development
> >>
> >>> -----Original Message----- From: Guido Günther
> >>> [mailto:agx at sigxcpu.org] Sent: dinsdag 8 november 2011 12:27
> >>> To: Ivo Timmermans Cc: Christian Leutloff; Remon van Gijn; John
> >>> van der Kamp; wolfi at sigxcpu.org Subject: Re: Upstreaming
> >>> patches Re: zarafa in Debian
> >>>
> >>> On Tue, Nov 08, 2011 at 10:27:08AM +0100, Ivo Timmermans
> >>> wrote:
> >>>> Hi Guido,
> >>>>
> >>>> That is correct. The common ancestor for 7.0 and master are
> >>>> much further away than the history of this git repository,
> >>>> and it's not really practical to retrofit that. Now that we
> >>>> *have* a git tree, we will continue to update them (both
> >>>> master and 7.0), and when we fork off 7.1, we will have a
> >>>> common ancestor for 7.1 and master. Does the current
> >>>> situation stand in the way of something?
> >>>
> >>> No, it's great. I just wanted to make sure the 7.0.X branch
> >>> won't stay as a single commit. However I just noticed that
> >>> Christian already pushed things into the repository, so we'll
> >>> need to coordinate with him first ;) Cheers, -- Guido
> >>>
> >>>>
> >>>>
> >>>> Kind regards,
> >>>>
> >>>> Ivo Timmermans Manager Development
> >>>>
> >>>>
> >>>>> -----Original Message----- From: Guido Günther
> >>>>> [mailto:agx at sigxcpu.org] Sent: dinsdag 8 november 2011
> >>>>> 7:04 To: Ivo Timmermans Cc: Christian Leutloff; Remon van
> >>>>> Gijn; John van der Kamp; wolfi at sigxcpu.org Subject: Re:
> >>>>> Upstreaming patches Re: zarafa in Debian
> >>>>>
> >>>>> On Mon, Nov 07, 2011 at 10:34:54AM +0100, Ivo Timmermans
> >>>>> wrote:
> >>>>>> Hi Guido,
> >>>>>>
> >>>>>> It almost makes sense. What I don't understand is if
> >>>>>> 'upstream/foo' is a
> >>>>> branch or a directory in the pkg-giraffe tree?
> >>>>>>
> >>>>>> Anyway, I created the 7.0 branch (see
> >>>>> https://git.zarafa.com/zcp/zcp/commits/7.0), so you can do
> >>>>> the organization if you want to. :) The code in this
> >>>>> branch is exactly the same as the 7.0.3 beta1 release
> >>>>> here:
> >>>>> http://download.zarafa.com/community/beta/7.0/7.0.3beta1-
> >>>>> 30283/sourcecode/zcp-7.0.3.tar.gz.
> >>>>>>
> >>>>>
> >>>>> Hmm...the repo seems to have two detached trees without a
> >>>>> common history (master and 7.0) so I assume we won't gain
> >>>>> much from using that oner over using git-import-orig on the
> >>>>> above tarball? Or are you plannig to push more fine grained
> >>>>> updates there in the future (in which it would make lots of
> >>>>> sense to share a common commit history). Cheers, -- Guido
> >>>>>
> >>>>>>
> >>>>>>
> >>>>>> Kind regards,
> >>>>>>
> >>>>>> Ivo Timmermans Manager Development
> >>>>>>
> >>>>>>
> >>>>>>> -----Original Message----- From: Guido Günther
> >>>>>>> [mailto:agx at sigxcpu.org] Sent: maandag 7 november 2011
> >>>>>>> 10:03 To: Ivo Timmermans Cc: Christian Leutloff; Remon
> >>>>>>> van Gijn; John van der Kamp; wolfi at sigxcpu.org Subject:
> >>>>>>> Re: Upstreaming patches Re: zarafa in Debian
> >>>>>>>
> >>>>>>> Hi Ivo, On Mon, Nov 07, 2011 at 08:51:07AM +0100, Ivo
> >>>>>>> Timmermans wrote:
> >>>>>>>> Hi,
> >>>>>>>>
> >>>>>>>> I will create a branch of the 7.0 series in the open
> >>>>>>>> source git
> >>>>>>>
> >>>>>>> That sounds great.
> >>>>>>>
> >>>>>>>> project on git.zarafa.com, so that we can clone from
> >>>>>>>> that and put the debian directory that I sent out
> >>>>>>>> earlier in there. I understand that's the easiest
> >>>>>>>> way to set this up.
> >>>>>>>
> >>>>>>> It might in fact be easier to keep the debian/
> >>>>>>> directory separate for now. I think we should set up
> >>>>>>> this branch structure on
> >>>>> git.debian.org:
> >>>>>>> (assuming you call the branch on git.zaraffa.com foo):
> >>>>>>>
> >>>>>>> upstream/foo (mirrors your branch on
> >>>>>>> git.zaraffa.com) | ` dfsg-clean/foo (keeps the
> >>>>>>> dfsg-clean version of this |
> >>>>>>> branch - e.g. copyrighted images
> >>>>> removed)
> >>>>>>> ` debian/foo (keeps the above plus the debian
> >>>>> packaging)
> >>>>>>>
> >>>>>>> This worked out very well for the mozilla products.
> >>>>>>> Does it make
> >>> sense?
> >>>>>>> Cheers, -- Guido
> >>>>>>>
> >>>>>>>>
> >>>>>>>>
> >>>>>>>> Kind regards,
> >>>>>>>>
> >>>>>>>> Ivo Timmermans Manager Development
> >>>>>>>>
> >>>>>>>>
> >>>>>>>>> -----Original Message----- From: Guido Günther
> >>>>>>>>> [mailto:agx at sigxcpu.org] Sent: zaterdag 5 november
> >>>>>>>>> 2011 14:03 To: Ivo Timmermans; Christian Leutloff;
> >>>>>>>>> Remon van Gijn; John van der Kamp;
> >>>>>>>>> wolfi at sigxcpu.org Subject: Re: Upstreaming patches
> >>>>>>>>> Re: zarafa in Debian
> >>>>>>>>>
> >>>>>>>>> On Fri, Nov 04, 2011 at 05:25:22PM +0100, Guido
> >>>>>>>>> Günther wrote:
> >>>>>>>>>> On Mon, Oct 31, 2011 at 09:24:33AM +0100, Ivo
> >>>>>>>>>> Timmermans
> >>> wrote:
> >>>>>>>>>>> Hi all,
> >>>>>>>>>>>
> >>>>>>>>>>> John did work on the Debian packages of Zarafa,
> >>>>>>>>>>> however, there were
> >>>>>>>>> three problems:
> >>>>>>>>>>>
> >>>>>>>>>>> - the libvmime dependency
> >>>>>>>>>>>
> >>>>>>>>>>> You already mentioned this. We have sent all
> >>>>>>>>>>> our patches to the
> >>>>>>>>> upstream maintainer, and most are now included in
> >>>>>>>>> the vmime svn. However, there still are several
> >>>>>>>>> patches that are not (yet?) included. Also, the
> >>>>>>>>> vmime guys have not released a stable version since
> >>>>>>>>> over a year ago (0.9.1 is the latest available).
> >>>>>>>>>>>
> >>>>>>>>>>> - lintian errors
> >>>>>>>>>>>
> >>>>>>>>>>> For the packages zarafa, zarafa-webaccess and
> >>>>>>>>>>> zarafa-webaccess-mobile, a
> >>>>>>>>> copy right file missing error is given. It's
> >>>>>>>>> unclear why this
> >>>>> happens.
> >>>>>>>>>>>
> >>>>>>>>>>> - build twice in a row requirement
> >>>>>>>>>>>
> >>>>>>>>>>> automake borks things, apparently - 'make
> >>>>>>>>>>> dist*' breaks things when
> >>>>>>>>> using the OSS_ONLY define.
> >>>>>>>>>>>
> >>>>>>>>>>> The current state of the debian directory is
> >>>>>>>>>>> attached.
> >>>>>>>>>>
> >>>>>>>>>> The alioth project has been created:
> >>>>>>>>>>
> >>>>>>>>>> https://alioth.debian.org/projects/pkg-giraffe/
> >>>>>>>>>>
> >>>>>>>>>> Please use the request to join button. The git
> >>>>>>>>>> overview page doesn't list the repositories yet
> >>>>>>>>>> but one there you can pull/push
> >>>>> to:
> >>>>>>>>>>
> >>>>>>>>>> ssh://git.debian.org/git/pkg-giraffe/d-push.git
> >>>>>>>>>> ssh://git.debian.org/git/pkg-giraffe/giraffe.git
> >>>>>>>>>>
> >>>>>>>>>> (the later one is currently empty).
> >>>>>>>>>
> >>>>>>>>> It's now also visible on gitweb:
> >>>>>>>>>
> >>>>>>>>> http://anonscm.debian.org/gitweb/?p=pkg-giraffe/d-push.git
> >>>>>>>>>
> >>>>>>>>>
> >>>>>>>>>
> Giraffe will be here once it has any commits:
> >>>>>>>>>
> >>>>>>>>> http://anonscm.debian.org/gitweb/?p=pkg-giraffe/giraffe.git
> >>>>>>>>>
> >>>>>>>>>
> >>>>>>>>>
> Cheers,
> >>>>>>>>> -- Guido
> >>>>>>>>
> >>>>>>
> >>>>
> >>
>
>
> - --
> Christian Leutloff, Düren, Germany
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAk67ySwACgkQLVfh8xXlDWxnUgCgt4fRSAaF2ebDIhAKcItdtcCP
> 2dgAnj7Cc667tmUVmcWTdfgN3nDHSsV7
> =auf0
> -----END PGP SIGNATURE-----
>
More information about the Pkg-giraffe-discuss
mailing list