From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Claudio Bley Newsgroups: gmane.emacs.devel Subject: Re: [PATCH v2 0/5] fixes for w32 and NetPBM Date: Fri, 01 Nov 2013 11:36:31 +0100 Message-ID: <87d2mkz9w0.wl%claudio.bley@gmail.com> References: <878uxbylo5.wl%claudio.bley@gmail.com> <8338ngcwp3.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Trace: ger.gmane.org 1383302204 21890 80.91.229.3 (1 Nov 2013 10:36:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 Nov 2013 10:36:44 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 01 11:36:50 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VcC5y-00044V-BA for ged-emacs-devel@m.gmane.org; Fri, 01 Nov 2013 11:36:50 +0100 Original-Received: from localhost ([::1]:37055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VcC5x-0001cg-Ot for ged-emacs-devel@m.gmane.org; Fri, 01 Nov 2013 06:36:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VcC5q-0001cZ-ME for emacs-devel@gnu.org; Fri, 01 Nov 2013 06:36:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VcC5l-0005V1-PN for emacs-devel@gnu.org; Fri, 01 Nov 2013 06:36:42 -0400 Original-Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:57625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VcC5g-0005Oq-BH; Fri, 01 Nov 2013 06:36:32 -0400 Original-Received: by mail-ea0-f178.google.com with SMTP id a15so1957572eae.37 for ; Fri, 01 Nov 2013 03:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=date:message-id:from:to:cc:subject:in-reply-to:references :user-agent:mime-version:content-type; bh=xT6ormwRkOR79ZJ2ewuXY6Wij3WPdYkLErBCDxZ8UOE=; b=R3tw8vboOJRUncFKDfu2zKaTTHzuC0Ise+rP5uqhjEIJtNTKR98soGpTC3U31be1eR f0W/QvlOwQTjsbli98e+cPfpM9RW7CG7y+n2p8/vvvFkqTgiDo8osTXKhnjZag16dbtu KnZh8unhDPYWoQ7yYEztwlNHDeU5JeynnfroFtTTPWdf2i2JAF9Clq1SGmyNo6isz2CG fJ+ixZbrBmY9lmIQLPbfRAZzD3K9/lCD5QinvJX4Voh6LhWMDRZVloknIyiIlRYI8CN2 xfw744tpzeJhksmctqvmfmERndv+OZwKFqdt0TZt6JlYleoCsYHLpgrS4uTEj9sNbiVn 4J/A== X-Received: by 10.15.100.198 with SMTP id bn46mr2187102eeb.11.1383302190751; Fri, 01 Nov 2013 03:36:30 -0700 (PDT) Original-Received: from CLAUDIO-PC.localdomain.de (178-24-125-95-dynip.superkabel.de. [178.24.125.95]) by mx.google.com with ESMTPSA id e13sm6083291eeu.4.2013.11.01.03.36.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Nov 2013 03:36:29 -0700 (PDT) In-Reply-To: <8338ngcwp3.fsf@gnu.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3.50 (i686-pc-mingw32) MULE/6.0 (HANACHIRUSATO) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::232 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:164794 Archived-At: At Fri, 01 Nov 2013 11:12:24 +0200, Eli Zaretskii wrote: > > > Date: Wed, 30 Oct 2013 13:42:50 +0100 > > From: Claudio Bley > > > > This is version 2 of > > http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00772.html > > > > Changes since v1: > > > > - reworded commit message of patch #1 stating that different major > > versions of jpeglib are indeed binary incompatible > > > > - simplified logic of patch #2, using the name libpngXY.dll and > > libpngXY-XY.dll for versions >= 1.4.0 as per Eli's request > > Thanks, installed on your behalf. Thank you! > In the future, please also provide ChangeLog entries for your > changes. (I wrote them this time.) OK, will do. But, I'm curious, how do you cope with the merge conflicts popping up for each patch? Do you resolve them manually each time? -- Claudio