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

[Florian Schlichting]

Hi kaliko,

On Sun, Jan 06, 2019 at 02:39:22PM +0100, kaliko wrote:
> On 05/01/2019 21:12, Florian Schlichting wrote:> On Tue, Dec 18, 2018 at 04:10:20PM
> > The result is currently here: https://salsa.debian.org/fsfs/libmpdclient
> 
> Alright, that looks easier than I though, thanks for getting around this :)
> 
> A small detail though, I just noticed you also pushed upstream tags to your repo. Not
> sure this is usefull, maybe we should only keep packaging related tags in the repo and
> not tags from upstream remote. It'll keep the salsa repo more concise.
> 
> This is mentioned in the doc, last warning box of the page:
> https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.upstream-git.html

no, that applies to the "Upstream tarballs and separate upstream
history" case. The idea is that the upstream git history is only visible
locally (e.g. for cherry-picking), but not pushed to salsa. When you do
a 'git push --tags' in that case, as one usually does after importing /
uploading / tagging a new upstream version, the upstream git history
suddenly is no longer local...

But here we're using "Upstream tarballs and linked upstream history", so
the upstream history is an ancestor of the Debian packaging branch and
pushed to salsa anyway and on purpose. And my feeling is that even if
you don't, when someone else from the team does an update to a new
upstream version, all the upstream tags will end up on salsa. So I
wouldn't bother :-)

> > 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
> 
> Great, I have no experience packaging libraries, thanks for your changes :)

OK, then I'll go ahead with libmpdclient tomorrow, and perhaps a day
later with ncmpc so that it picks up the new libmpdclient on the
buildd's

> > 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...
> 
> I gave it a try, please review. I pushed only packaging relevant tags (as I mentioned
> above) and renamed previous tags to fit gbp nomenclature (ie. ncmpc-0.17-1 → debian/1.17-1).
> 
> Here it is:
>   https://salsa.debian.org/kaliko-guest/ncmpc-gbp-upstream
>   git at salsa.debian.org:kaliko-guest/ncmpc-gbp-upstream.git

Apart from what I said about upstream tags (which you can do as you
like), I see one major issue and a few smaller ones:

- building a new binary package ncmpc-doc will cause the upload to go to
  NEW for ftp-master approval. This may take several weeks and carries a
  high risk of missing buster. My advice is to not split off the
  documentation - not now because of release timing, but also more
  generally because it's not actually that big (123k installed). In fact
  I think the ncmpc-lyrics package should be re-integrated with ncmpc
  (the additional changelog.Debian.gz is twice the size of all the
  plugins together) but I suggest to do this after the buster release.

The smaller ones are from lintian:

P: ncmpc source: package-uses-old-debhelper-compat-version 11
I: ncmpc source: out-of-date-standards-version 4.2.1 (released 2018-08-25) (current is 4.3.0)
I: ncmpc-doc: possible-documentation-but-no-doc-base-registration
W: ncmpc: duplicate-changelog-files usr/share/doc/ncmpc/NEWS.gz usr/share/doc/ncmpc/changelog.gz
I: ncmpc: spelling-error-in-manpage usr/share/man/man1/ncmpc.1.gz interger integer

In d/copyright you should merge the paragraphs that have (almost)
identical Copyright and License, i.e. one for "Files: *" / MPD project /
GPL-2+ and then another one for the BSD-2-clause licensed files (and
then debian/)

And then there's

I: ncmpc source: vcs-field-uses-insecure-uri vcs-git git://git.tokkee.org/pkg-ncmpc.git
I: ncmpc source: vcs-field-uses-insecure-uri vcs-browser http://git.tokkee.org/?p=pkg-ncmpc.git

which I can fix when creating the repo on salsa/mpd-team, but you can
already update that to https://salsa.debian.org/mpd-team/ncmpc(.git) as
well.

Since the repo is in your personal namespace, I'd say don't be afraid to
rewrite history, split up the "New upstream release." commit a bit and
merge in "Strip install dir "debian/tmp" in dh install files" etc. where
appropriate. It is only when the repo has been moved to the team
namespace that it is "official" and history must stay immutable.

> PS: Working on ncmpc I noticed I forgot to add myself to d/copyright for MPD packaging.
> We'll fix it for the next release.

Better push that commit right away, while you still remember wanting to
do that :-)

Florian