[Pkg-samba-maint] [samba] 01/20: Update instructions to reference upstream VCS tag.
jelmer at samba.org
Fri Dec 6 01:24:22 UTC 2013
On Tue, Dec 03, 2013 at 06:58:29PM -0600, Steve Langasek wrote:
> On Wed, Dec 04, 2013 at 12:39:54AM +0000, Jelmer Vernooij wrote:
> > This is an automated email from the git hooks/post-receive script.
> > jelmer pushed a commit to branch samba_4.1
> > in repository samba.
> Why are these commits all going to the samba_4.1 branch? Could you please
> put packaging changes on the master branch? (I noticed this was the case
> with your previous changes to the update-alternatives handling... which on
> the master branch has been fixed to be done in postinst instead of in
> prerm. So there may be conflicts between the two branches to be fixed
I tend do my development on one branch at the same time (rather than switching back
and forth) so I fixed the issue here first. I think the update-alternatives fix
is the only one that would also apply to master, so I'll just revert that.
The other changes are all specific to the 4.1 branch. I don't think starting
to import full upstream history now for the 4.0 branch makes sense.
More information about the Pkg-samba-maint