[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#833421: jessie-pu: debian-edu-config/1.818+deb8u2]

On Mon, Aug 08, 2016 at 04:54:29PM +0000, Holger Levsen wrote:
> On Mon, Aug 08, 2016 at 04:45:02PM +0000, Holger Levsen wrote:
> > On Mon, Aug 08, 2016 at 06:34:26PM +0200, Wolfgang Schweer wrote:
> > > I've cherry-picked the mentioned commits to a new branch with starting 
> > > point f2810932. Should I push this branch? Needs checking and more work 
> > > is needed…
> but why did you start at f2810932? there were two newer commits since then:
> $ git status
> On branch jessie
> Your branch is up-to-date with 'origin/jessie'.
> nothing to commit, working directory clean
> $ git log -3 --oneline
> 94ec61a Adjust cf.krb5client to ensure that cfengine runs are idempotent. (Closes: #779642) - Patch taken from master branch from Wolfgang.
> 1e087a2 Move code to cleanup /usr/share/pam-configs/krb5 diversion from postinst to preinst to ease upgrades from old wheezy installations. (Closes: #779641)
> f281093 Really resolve conficts in Makefile.
> so please rebase your branch on 94ec61a!

As 1e087a2 modifies the postinst and preinst scripts I assumed it was 
needed to start at f2810932. Now I just cherry-picked 1e087a2 and 94ec61a in 
addition; hope it's ok.


Attachment: signature.asc
Description: Digital signature

Reply to: