From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH] gnu: libgcrypt update to 1.7.1
Date: Fri, 17 Jun 2016 15:28:36 -0400
Message-ID: <20160617192836.GA17273@jasmine>
References: <20160615195328.GA13352@khazad-dum> <20160616154047.GC2245@jasmine>
	<20160616162825.GB29687@debian-netbook> <87d1nfvox7.fsf@gnu.org>
	<20160617174302.GA8255@jasmine> <20160617185923.GA24906@khazad-dum>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45907)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bDzRn-0006k2-Jd
	for guix-devel@gnu.org; Fri, 17 Jun 2016 15:28:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bDzRk-0000YL-F1
	for guix-devel@gnu.org; Fri, 17 Jun 2016 15:28:55 -0400
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44597)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bDzRj-0000Wb-12
	for guix-devel@gnu.org; Fri, 17 Jun 2016 15:28:52 -0400
Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148])
	by mail.messagingengine.com (Postfix) with ESMTPA id 6C147F29EE
	for <guix-devel@gnu.org>; Fri, 17 Jun 2016 15:28:41 -0400 (EDT)
Content-Disposition: inline
In-Reply-To: <20160617185923.GA24906@khazad-dum>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: guix-devel@gnu.org

On Fri, Jun 17, 2016 at 06:59:23PM +0000, ng0 wrote:
> On 2016-06-17(01:43:02-0400), Leo Famulari wrote:
> > On Fri, Jun 17, 2016 at 05:02:44PM +0200, Ludovic Courtès wrote:
> > > Efraim Flashner <efraim@flashner.co.il> skribis:
> > >
> > > > On Thu, Jun 16, 2016 at 11:40:47AM -0400, Leo Famulari wrote:
> > > >> On Wed, Jun 15, 2016 at 07:53:28PM +0000, ng0 wrote:
> > > >> > * gnu/packages/gnupg.scm (libgcrypt):  Update to 1.7.1
> > > >>
> > > >> This looks good to me. What branch should it go on?
> > > >>
> > > >
> > > > either core-updates or core-updates-next
> > >
> > > The latter please.  :-)
> >
> > Okay, in that case, can you rebase it on core-updates, ng0? Otherwise is
> > won't apply cleanly due to trying to upgrade from 1.6.5 instad of 1.7.0.
> >
> 
> This should be relatively easy when I have the gnupg branch still around,
> otherwise I'll recreate it.
> 
> With the wording familiar to me yet sometimes not good to comprehend even
> when I hear and parse it correctly when talking:
> I should rebase the commit on the branch
> `core-updates` which currently is at version 1.6.5?

I think your copy of core-updates needs to be updated. I pushed your
patch "gnu: libgcrypt: Update to 1.7.0" as 81068f178 to it in April ;)

All you need to do is get the latest core-updates, and then re-do this
patch on that branch, so that it updates from 1.7.0 instead of 1.6.5.
You don't need to do anything with gnupg.