From: David Engster <dengste@eml.cc>
Date: Thu, 31 Jan 2013 19:58:56 +0000 (+0100)
Subject: Sync CEDET and EIEIO version numbers with upstream.
X-Git-Tag: emacs-24.2.93~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be798504fa7ba77672bb5cab94f4741593fa7ed6;p=emacs.git

Sync CEDET and EIEIO version numbers with upstream.
---

diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index d876b65303c..e8720bc6624 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -4,7 +4,7 @@
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: Eric M. Ludlam  <zappo@gnu.org>
-;; Version: 1.1
+;; Version: 2.0
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -35,7 +35,7 @@
 
 (declare-function inversion-find-version "inversion")
 
-(defconst cedet-version "1.1"
+(defconst cedet-version "2.0"
   "Current version of CEDET.")
 
 (defconst cedet-packages
@@ -43,12 +43,12 @@
     ;;PACKAGE   MIN-VERSION      INSTALLDIR  DOCDIR
     (cedet         ,cedet-version "common"   "common" 	        )
     (eieio         "1.4"           nil       "eieio"       )
-    (semantic      "2.1"           nil       "semantic/doc")
-    (srecode       "1.1"           nil       "srecode"     )
-    (ede           "1.1"           nil       "ede"         )
+    (semantic      "2.2"           nil       "semantic/doc")
+    (srecode       "1.2"           nil       "srecode"     )
+    (ede           "1.2"           nil       "ede"         )
     (speedbar      "1.0.4"         nil       "speedbar"    )
-    (cogre         "1.1"           nil       "cogre"       )
-    (cedet-contrib "1.1"           "contrib" nil           )
+    (cogre         "1.2"           nil       "cogre"       )
+    (cedet-contrib "1.2"           "contrib" nil           )
     )
   "Table of CEDET packages to install.")
 
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 12b8f558d65..3867f628b93 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
-;; Version: 1.0
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -60,7 +60,7 @@
 (declare-function ede-up-directory "ede/files")
 (declare-function semantic-lex-make-spp-table "semantic/lex-spp")
 
-(defconst ede-version "1.0"
+(defconst ede-version "1.2"
   "Current version of the Emacs EDE.")
 
 ;;; Code:
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index decd3b15812..edf2d0cb21a 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax tools
-;; Version: 2.1beta
+;; Version: 2.2
 
 ;; This file is part of GNU Emacs.
 
@@ -38,7 +38,7 @@
 (require 'semantic/tag)
 (require 'semantic/lex)
 
-(defvar semantic-version "2.1beta"
+(defvar semantic-version "2.2"
   "Current version of Semantic.")
 
 (declare-function inversion-test "inversion")
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 3201374bc92..2e2cb8a3f80 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: codegeneration
-;; Version: 1.0
+;; Version: 1.2
 
 ;; This file is part of GNU Emacs.
 
@@ -41,7 +41,7 @@
 (require 'mode-local)
 (load "srecode/loaddefs" nil 'nomessage)
 
-(defvar srecode-version "1.0"
+(defvar srecode-version "1.2"
   "Current version of the Semantic Recoder.")
 
 ;;; Code:
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 5d0c85fa20a..f112de13253 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -4,7 +4,7 @@
 ;; Copyright (C) 1995-1996, 1998-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 1.3
+;; Version: 1.4
 ;; Keywords: OO, lisp
 
 ;; This file is part of GNU Emacs.
@@ -46,7 +46,7 @@
 
 (eval-when-compile (require 'cl))       ;FIXME: Use cl-lib!
 
-(defvar eieio-version "1.3"
+(defvar eieio-version "1.4"
   "Current version of EIEIO.")
 
 (defun eieio-version ()