From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: CEDET merge Date: Tue, 02 Oct 2012 13:05:21 +0800 Message-ID: <87sj9xzcoe.fsf@gnu.org> References: <506A54F7.9040005@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1349154345 9103 80.91.229.3 (2 Oct 2012 05:05:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 2 Oct 2012 05:05:45 +0000 (UTC) Cc: eric@siege-engine.com, deng@randomsample.de, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 02 07:05:50 2012 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 1TIufr-0002P1-W1 for ged-emacs-devel@m.gmane.org; Tue, 02 Oct 2012 07:05:40 +0200 Original-Received: from localhost ([::1]:57010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIufm-0006CA-9w for ged-emacs-devel@m.gmane.org; Tue, 02 Oct 2012 01:05:34 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIufj-0006Bs-1g for emacs-devel@gnu.org; Tue, 02 Oct 2012 01:05:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIufh-0006xP-Bx for emacs-devel@gnu.org; Tue, 02 Oct 2012 01:05:30 -0400 Original-Received: from mail-da0-f41.google.com ([209.85.210.41]:53763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIufh-0006uW-4Y for emacs-devel@gnu.org; Tue, 02 Oct 2012 01:05:29 -0400 Original-Received: by dadi14 with SMTP id i14so1900835dad.0 for ; Mon, 01 Oct 2012 22:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=THy4MSubX2CPouXEYtBV1NZcG4e/iyRr79cAgvILXAo=; b=GPhcE4CA6hEhlVVW7tLIOvl4QHzAv+JuFwMD7UIpFAjPHfA0E+1xvJ5R/9AGvTf7kK dvk3YirB2uj4JxgZwclpZgcUKBukJVjVigxbw7xR6ZUQkSjYD813k3DoutuxCPybA5hN BmWwe9HntcW454CtNTEORYSCLf/FoQZQBa1EmUG2tLzQmU9lOnshn9zyscV9TUK0A5WY Gp+TCa2hW2MN3Dt0oBhwRsHK6jdAcrx2pD4QwnsSq3IANOjg4jwaNX8rh2+ub2c9OFot LqAc5a4ZT/gJniVVnPsK8SzpmpUVTew6PgVM5IpMDseSoB8VIoX/HTUCoJ10E8eIMwD4 Lj2w== Original-Received: by 10.66.85.167 with SMTP id i7mr41540604paz.8.1349154327884; Mon, 01 Oct 2012 22:05:27 -0700 (PDT) Original-Received: from ulysses ([155.69.19.196]) by mx.google.com with ESMTPS id i2sm126170pay.31.2012.10.01.22.05.24 (version=SSLv3 cipher=OTHER); Mon, 01 Oct 2012 22:05:26 -0700 (PDT) In-Reply-To: <506A54F7.9040005@yandex.ru> (Dmitry Gutov's message of "Tue, 02 Oct 2012 06:44:07 +0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.41 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:153887 Archived-At: --=-=-= Content-Type: text/plain Dmitry Gutov writes: > Was removing the "Package-Version" header from eieio.el intentional? > It broke some ELPA packages. > > Warning (emacs): Unable to activate package `pcache'. > Required package `eieio-1.3' is unavailable Thanks for pointing this out. I restored the headers. David, could you restore the Version: headers upstream as well? (These headers are needed by ELPA packages which depend on CEDET components; the ELPA system generates package versions from them.) Patch attached. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=cedet-back.patch === modified file 'lisp/ChangeLog' *** lisp/ChangeLog 2012-10-02 03:49:28 +0000 --- lisp/ChangeLog 2012-10-02 05:02:52 +0000 *************** *** 1,3 **** --- 1,7 ---- + 2012-10-02 Chong Yidong + + * emacs-lisp/eieio.el: Restore Version header. + 2012-10-02 Stefan Monnier * vc/diff-mode.el (diff--auto-refine-data): New var. === modified file 'lisp/cedet/ChangeLog' *** lisp/cedet/ChangeLog 2012-10-01 18:10:29 +0000 --- lisp/cedet/ChangeLog 2012-10-02 05:02:52 +0000 *************** *** 1,3 **** --- 1,7 ---- + 2012-10-02 Chong Yidong + + * srecode.el, ede.el: Restore Version header. + 2012-10-01 Chong Yidong * semantic/bovine/c-by.el: Regenerate. === modified file 'lisp/cedet/ede.el' *** lisp/cedet/ede.el 2012-10-01 18:10:29 +0000 --- lisp/cedet/ede.el 2012-10-02 05:02:52 +0000 *************** *** 4,9 **** --- 4,10 ---- ;; Author: Eric M. Ludlam ;; Keywords: project, make + ;; Version: 1.0 ;; This file is part of GNU Emacs. === modified file 'lisp/cedet/srecode.el' *** lisp/cedet/srecode.el 2012-10-01 18:10:29 +0000 --- lisp/cedet/srecode.el 2012-10-02 05:02:52 +0000 *************** *** 4,9 **** --- 4,10 ---- ;; Author: Eric M. Ludlam ;; Keywords: codegeneration + ;; Version: 1.0 ;; This file is part of GNU Emacs. === modified file 'lisp/emacs-lisp/eieio.el' *** lisp/emacs-lisp/eieio.el 2012-10-01 18:10:29 +0000 --- lisp/emacs-lisp/eieio.el 2012-10-02 05:02:52 +0000 *************** *** 4,9 **** --- 4,10 ---- ;; Copyright (C) 1995-1996, 1998-2012 Free Software Foundation, Inc. ;; Author: Eric M. Ludlam + ;; Version: 1.3 ;; Keywords: OO, lisp ;; This file is part of GNU Emacs. --=-=-=--