[Pkg-mpd-maintainers] libmpdclient/ncmpc in debian (was "MPD 0.21 in buster")

[Florian Schlichting]

Hi kaliko,

On Tue, Dec 18, 2018 at 04:10:20PM +0100, kaliko wrote:
> > and I would prefer to have upstream and pristine-tar branches (along
> > with the complete upstream source, not just the debian directory) in
> > git - and possibly also the upstream git history: git-buildpackage
> > has options to specify an upstream tag that gets merged into master
> > along with the contents of the 'upstream' branch created from the
> > tar.xz...
> 
> Alright, but I don't know how to convert the current git repo, adding gbp
> branches (upstream, pristine, etc).
> I'm not even sure it is feasible:
> 
> “There's currently no easy way to create the upstream-branch if you never had
> the upstream sources as a single commit. Using gbp import-orig on such
> repositories might lead to unexpected merge results.”
> src:
> https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.convert.html
> 
> Would you like to keep the current history or start from scratch a brand new,
> well formated git-buildpackage repository?

actually, both :-)
I think it's the last description on that page that most closely
describes how I thought it should work.

For libmpdclient, I started from your repo, added upstream and
pristine-tar branches, added an upstream-repo remote pointing to Github,
and manufactured all that into a common history that I trust gbp can
understand. To test this, I imported 2.16 using gbp. The steps for
future upgrades are:

    # this is only needed the first time after cloning
    git add remote upstream-repo https://github.com/MusicPlayerDaemon/libmpdclient.git
    git fetch upstream-repo
    # look at history, determine vcs-tag to use, then
    gbp import-orig --uscan --pristine-tar --upstream-vcs-tag=v2.16

The result is currently here: https://salsa.debian.org/fsfs/libmpdclient

What do you think? I took some liberty adjusting your commits here and
there, where I felt that might improve things. If you agree I'll move
the repo to mpd-team and upload the resulting package on Monday to
DELAYED/7

I can do the same for ncmpc, but haven't had a look yet; and I'm not
using that myself, so will try to my hands off things...

Florian