Re: CEDET merge

[Chong Yidong]

Dmitry Gutov <address@hidden> 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.

=== 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  <address@hidden>
+ 
+       * emacs-lisp/eieio.el: Restore Version header.
+ 
  2012-10-02  Stefan Monnier  <address@hidden>
  
        * 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  <address@hidden>
+ 
+       * srecode.el, ede.el: Restore Version header.
+ 
  2012-10-01  Chong Yidong  <address@hidden>
  
        * 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 <address@hidden>
  ;; 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 <address@hidden>
  ;; 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 <address@hidden>
+ ;; Version: 1.3
  ;; Keywords: OO, lisp
  
  ;; This file is part of GNU Emacs.