Bug#847681: packaging repository and sid diverging? Various fixes needed.

[Daniel Pocock <daniel@pocock.pro>]

On 12/12/16 21:05, Ben Hutchings wrote:
> On Mon, 2016-12-12 at 11:13 +0100, Salvatore Bonaccorso wrote:
>> Hi,
>>
>> On Mon, Dec 12, 2016 at 10:23:49AM +0100, Ferenc Wágner wrote:
>>>>> Daniel Pocock <daniel@pocock.pro> writes:
>>>
>>>> Could either of you comment on this bug?  I saw your names in the
>>>> nfs-utils changelog.  I've seen various problems with NFS under jessie
>>>> and I was hoping to help test if for stretch.
>>>
>>> Hi Daniel,
>>>
>>> I'm not involved in the maintenance of nfs-utils, just reported a
>>> trivial bug that Salvatore kindly fixed in a commit.
>>
>> Same here. Beeing subscribed to the kernel maintainers mailinglist I
>> noticed Ferenc report and didn't want that it get lost and commited to
>> the git repository. Only afterwards noticed some discrepancy between
>> the current version in git, and the one in the archive beeing -9.2. On
>> one side I saw that Ben imported up to -9 the history in git, but the
>> NMU's were never imported.
>>
>> I can very well guess that any help in the maintenance would be
>> welcome.
> 
> I was the one who brought nfs-utils into the kernel team, expecting
> that it would benefit from coordination with kernel maintainers, but
> aside from my contributions in 2009-2011 that hasn't really happened.
> None of the currently listed uploaders has uploaded in the last 2
> years, and the only changes made by regular kernel maintainers have
> been my update to debian/watch and Salvatore's recent addition of
> Ferenc's patch.
> 
> I think it may make more sense to hand over to a new team, rather than
> keeping it with the kernel team.  Daniel apparently wants to be on that
> team.  Who else?
> 
> I notice that the git repository doesn't reflect the package contents
> properly due to the current upstream version being incorrectly
> imported.  The tag names also don't match the current standard format. 
> Here's a repository with those two problems fixed and the recent NMUs
> added:
> 
> https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=summary
> 
> (I haven't pushed these changes to Alioth since this is rewriting
> history.  Also, this doesn't include the oldest branches and tags which
> are entirely detached from the current history.)
> 

Hi Ben,

Thanks for providing this feedback

I've done the following:
- forked the upstream repository
- created a debian/sid branch
- copied debian/* from jessie into that branch and committed
- copied debian/* from sid into that branch and committed
- used "git format-patch" and "git am" to copy in changes from your repo
- merged upstream's 1.3.4 tag into debian/sid
- updated patches (many could be dropped)
- other small updates (home page, VCS fields)
- pushed my repo into a new location, collab-maint/nfs-utils

Please have a look at my repository structure and tell me if you feel it
is useful for this project.  If not, my changes could be extracted
easily enough with git format-patch and applied into your repository
with git am and then we could start the collab-maint/nfs-utils
repository over again.

Are you happy for this to live in collab-maint now?  Maybe that will
encourage more collaborators.  I've added a README.source inviting
contributions too.

Regards,

Daniel