From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: Remove trademark acknowledgements. Date: Mon, 22 Aug 2016 15:30:21 -0400 Message-ID: <20160822193021.GA24639@jasmine> References: <1471890295-25249-1-git-send-email-jmd@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bbuvl-000665-3J for guix-devel@gnu.org; Mon, 22 Aug 2016 15:30:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bbuvf-0004rq-2v for guix-devel@gnu.org; Mon, 22 Aug 2016 15:30:44 -0400 Content-Disposition: inline In-Reply-To: <1471890295-25249-1-git-send-email-jmd@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: John Darrington Cc: guix-devel@gnu.org On Mon, Aug 22, 2016 at 08:24:55PM +0200, John Darrington wrote: > * gnu/packages/imagemagick.scm (imagemagick), gnu/packages/python.scm > (python-2.7), gnu/packages/wordnet.scm (wordnet) [description]: > Remove trademark acknowledgements. Thanks! The second two lines of the changelog should begin in the first column, with no indentation. > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 15c957e..eb949fa 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -5732,7 +5732,7 @@ object to help create WSGI responses.") > (home-page "http://www.python-excel.org/") > (synopsis "Library for extracting data from Excel files") > (description "This packages provides a library to extract data from > -spreadsheets using Microsoft ExcelŽ proprietary file formats @samp{.xls} and > +spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and > @samp{.xlsx} (versions 2.0 onwards). It has support for Excel dates and is > Unicode-aware. It is not intended as an end-user tool.") > (license bsd-3))) Please make the changelog reflect that this change is not in the python-2.7 variable, but rather in the python-xlrd variable.