X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a971635315e259c076de020b3676c04d1dcc415e..f034e1762ba3824627494e479a47189ec62db6d1:/admin/admin.el

diff --git a/admin/admin.el b/admin/admin.el
index d30583cd07..984f3649b2 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,6 +1,6 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -145,8 +145,8 @@ Root must be the root of an Emacs source tree."
                     (submatch (1+ (in "0-9."))))))
   (set-version-in-file
    root "nextstep/Cocoa/Emacs.base/Contents/Info.plist"
-   version (rx (and "CFBundleShortVersionString" (1+ anything)
-                    "Version" (1+ space)
+   version (rx (and "CFBundleShortVersionString" (1+ not-newline) ?\n
+                    (0+ not-newline) "<string>" (0+ space)
                     (submatch (1+ (in "0-9."))))))
   (set-version-in-file
    root "nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
@@ -158,11 +158,18 @@ Root must be the root of an Emacs source tree."
    version (rx (and "CFBundleGetInfoString" (0+ space) ?= (0+ space)
                     ?\" (0+ space) "Emacs version" (1+ space)
                     (submatch (1+ (in "0-9."))))))
+  (set-version-in-file
+   root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
+   version (rx (and "ApplicationRelease" (0+ space) ?= (0+ space)
+                    ?\" (0+ space) (submatch (1+ (in "0-9."))))))
   (set-version-in-file
    root "nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist"
    version (rx (and "FullVersionID" (0+ space) ?= (0+ space)
                     ?\" (0+ space) "Emacs" (1+ space)
-                    (submatch (1+ (in "0-9.")))))))
+                    (submatch (1+ (in "0-9."))))))
+  (set-version-in-file
+   root "nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop"
+   version (rx (and "Version=" (submatch (1+ (in "0-9.")))))))
 
 ;; Note this makes some assumptions about form of short copyright.
 ;; FIXME add the \year in the refcards/*.tex files.