[Pkg-samba-maint] Started on a 4.4 package

[Andrew Bartlett]

On Wed, 2016-04-06 at 16:24 +1200, Andrew Bartlett wrote:
> On Tue, 2016-04-05 at 22:06 +1200, Andrew Bartlett wrote:
> > 
> > On Tue, 2016-04-05 at 14:38 +1200, Andrew Bartlett wrote:
> > > 
> > > 
> > > On Fri, 2016-04-01 at 18:44 +1300, Andrew Bartlett wrote:
> > > > 
> > > > 
> > > > Just to let folks know that I've started on a 4.4 package.  I
> > > > don't
> > > > promise to get it finished instantly, but I'll find somewhere
> > > > for
> > > > a
> > > > work in progress once I get it to build.  
> > > > 
> > > > Packaging current talloc is done, but with an odd symbol
> > > > version
> > > > issue
> > > > with the (rarely used) python3 bindings.
> > > My plans from here are to upload the experimental talloc with
> > > python3
> > > bindings, and and then propose a experimental 4.4.0 re-based on
> > > the
> > > work of the past few days.  Hopefully that puts us in a good spot
> > > to
> > > deal with whatever comes out way for security releases on
> > > Tuesday,
> > > for
> > > unstable at least.
> > > 
> > > The primary challenge I see is getting the git tree done right.
> > I've built packages that I think are ready.   However, the git
> > branch
> > is still a mess with the merge in of Samba 4.4.0, so here is the
> > diff
> > of debian/ since current master.
> > Andrew Bartlett
> I think I finally got the git stuff sorted, so I've pushed that to
> git
> branch experimental.  If that is OK, I'll do my first push out of the
> package shortly!

The magic command I needed, that unblocked the log-jam was:

gbp import-orig /data/debian/samba-4.4.0.tar.gz --merge-mode=replace --
upstream-branch=upstream_4.4 -u 4.4.0+dfsg --debian-branch=experimental

I did this after merging in the new upstream_4.4 branch from the samba-
4.0.0 tag.

This seemed to work well as we are based on the signed upstream
tarball, but get the git history, which I seemed to manage to merge in
OK.

I think this all looks OK, so I'm going to aim this at experimental
shortly.  I hope that's OK.

Andrew Bartlett

-- 
Andrew Bartlett
https://samba.org/~abartlet/
Authentication Developer, Samba Team         https://samba.org
Samba Development and Support, Catalyst IT   
https://catalyst.net.nz/services/samba