[Pkg-running-devel] forerunner 310xt support for garmin-ant-downlaoder

[Kristof Ralovich]

On Fri, Oct 11, 2013 at 1:57 AM, Ralf Treinen <treinen at free.fr> wrote:

> Kristof,
>
> On Thu, Oct 10, 2013 at 11:35:31PM +0200, Kristof Ralovich wrote:
>
> > I started working on the upstream branch, as g-a-d doesn't have a real
> upstream
> > project any more. This is what I was trying to ask in my original email.
> What
> > is the preferred way of development (providing patches)? I assumed the
> implicit
> > answer of working on the upstream branch.
>
> Yes I understand now that you are taking over upstream. According to what
> you
> wrote in your previous mails the new upstream is
> https://github.com/ralovich/garmin-ant-downloader/tree/antpm-integration1.
> Isn't that the case any more?
>
> > My software is already released independently from debian, see https://
> > code.google.com/p/antpm . The second reason I started working on the
> upstream
> > branch was that I would like to merge antpm in there, that is fuse antpm
> into
> > g-a-d.
>
> Very well, but I thought that this fusion is happening upstream (that is
> in your github repository mentioned above). That would be the normal
> workflow. Once you have done that you would publish an upstream
> g-a-d tarball, version 1.0 or whatever.
>
> Then you go over to debian and do an git-import-orig of that package
> to integrate your new upstream release into the "upstream" branch
> of the git repo on alioth.
>
> > The third reason I started working on the upstream branch was to e.g.
> close
> > bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690068, for that I
> > basically needed to figure out a way to commit fixes in the upstream
> branch, so
> > i could still test-build a working .deb package from master afterwards.
>
> Two ways to do that:
> - integrate the documentation in your new upstream release, in that
> case the bug gets closed once you update the debian package to your new
> upstream release. And everybody else who uses your upstream repo
> (people who download your source code directly, other distros ...)
> do also profit from your improvements.
> - Do a fix that exists only in the debian package, in that case the
> necessary changes would go into the master branch on alioth (or into
> some other branch that we could later merge into master).
>
> > If you would like me to, I can host the new "upstream repository" on
> github or
> > somewhere else (and it will be based on the current upstream branch in
> debian,
> > as that is the latest code). Please let me know if i should do that!
>
> yes, that would be the usual workflow. The "upstream" branch is usually
> used just to integrate an upstream development that has been published
> elsewhere. The debian developer then does his thing in the "master"
> branch. The "upstream" branch is not meant to do upstream development.
>
> Cheers -Ralf.
>
> Ralf,

You're right, it is probably better to follow the usual workflow, that is
to maintain the upstream repository independent from the debian repository.

In this spirit, I've decided to keep the upstream project and repository
under the name antpm, and merge g-a-d into there, instead of the other way
around I suggested in my first email. Thus, the merge happened in the
"gant-integration" branch of
https://github.com/ralovich/antpm/tree/gant-integration. After that I've
added the man page for g-a-d, merged the build system into antpm's cmake
framework, and fixed a few build time warnings (you can see these in detail
in the commits). Through this harmonization, g-a-d now builds as part of
antpm, and we have retained the intact development history of both
projects. I would like to call this, the base-line, effectively a loose
coupling, as the functionality of neither g-a-d nor antpm was effected, but
their sources are integrated already.

As a side note, afterwards I've released a new version of antpm, to mark
the same first round of integration, but this is independent of the debian
packaging.

If you agree with me, then I would push the above mentioned
"gant-integration" branch (through antpm's master) into the "upstream"
branch of git+ssh://git.debian.org/git/pkg-running/garmin-ant-downloader.git.
As previously underlined, this would keep the existing histories intact!

Afterwards, I would like to tag "upstream/20131011", create/update
pristine-tar accordingly, merge the new tag into master, and later prepare
in master to release a "0:20131011-1" version of the debian package.

What do you think?

Thanks,
Kristof
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-running-devel/attachments/20131012/80b80f46/attachment.html>