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

Ralf Treinen treinen at free.fr
Thu Oct 10 23:57:04 UTC 2013


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.



More information about the Pkg-running-devel mailing list