procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump trunk version to 24.1.50.

Browse source 
* README, configure.in (AC_INIT): Bump version to 24.1.50.

* doc/emacs/emacsver.texi (EMACSVER): Bump version to 24.1.50.

* doc/man/emacs.1: Bump version to 24.1.50.

* msdos/sed2v2.inp: Bump version to 24.1.50.

* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:
Bump version to 24.1.50.

* nt/config.nt, nt/makefile.w32-in, nt/emacs.rc, nt/emacsclient.rc:
Bump version to 24.1.50.
This commit is contained in:
Glenn Morris 2012-04-07 13:00:16 -07:00
parent a1ed8b05ee
commit f3774f20c3
19 changed files with 52 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-07 Glenn Morris <rgm@gnu.org>
* README, configure.in (AC_INIT): Bump version to 24.1.50.
2012-04-07 Eli Zaretskii <eliz@gnu.org>
* lib/makefile.w32-in (gnulib, all): Don't depend on stamp_BLD.

2
README
View file

@ -2,7 +2,7 @@ Copyright (C) 2001-2012 Free Software Foundation, Inc.
See the end of the file for license conditions.
This directory tree holds version 24.0.95 of GNU Emacs, the extensible,
This directory tree holds version 24.1.50 of GNU Emacs, the extensible,
customizable, self-documenting real-time display editor.
The file INSTALL in this directory says how to build and install GNU

4
configure.in
View file

@ -4,7 +4,7 @@ dnl autoconf
dnl in the directory containing this script.
dnl If you changed any AC_DEFINES, also run autoheader.
dnl
dnl Copyright (C) 1994-1996, 1999-2012 Free Software Foundation, Inc.
dnl Copyright (C) 1994-1996, 1999-2012 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Emacs.
dnl
@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.65)
AC_INIT(emacs, 24.0.95)
AC_INIT(emacs, 24.1.50)
AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h)
AC_CONFIG_AUX_DIR(build-aux)

4
doc/emacs/ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-07 Glenn Morris <rgm@gnu.org>
* emacsver.texi (EMACSVER): Bump version to 24.1.50.
2012-04-05 Glenn Morris <rgm@gnu.org>
* glossary.texi (Glossary): Use anchors for internal cross-references.

2
doc/emacs/emacsver.texi
View file

@ -1,4 +1,4 @@
@c It would be nicer to generate this using configure and @version@.
@c However, that would mean emacsver.texi would always be newer
@c then the info files in release tarfiles.
@set EMACSVER 24.0.95
@set EMACSVER 24.1.50

4
doc/man/ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-07 Glenn Morris <rgm@gnu.org>
* emacs.1: Bump version to 24.1.50.
2011-11-16 Juanma Barranquero <lekktu@gmail.com>
* etags.1: Fix typo.

2
doc/man/emacs.1
View file

@ -1,5 +1,5 @@
.\" See section COPYING for copyright and redistribution information.
.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.95"
.TH EMACS 1 "2007 April 13" "GNU Emacs 24.1.50"
.
.
.SH NAME

4
msdos/ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-07 Glenn Morris <rgm@gnu.org>
* sed2v2.inp: Bump version to 24.1.50.
2012-02-04 Eli Zaretskii <eliz@gnu.org>
* sed3v2.inp (insrcdir): Use $(<F) rather than $<, as

2
msdos/sed2v2.inp
View file

@ -59,7 +59,7 @@
/^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
/^#undef VERSION/s/^.*$/#define VERSION "24.0.95"/
/^#undef VERSION/s/^.*$/#define VERSION "24.1.50"/
/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
/^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/

8
nextstep/ChangeLog
View file

@ -1,3 +1,11 @@
2012-04-07 Glenn Morris <rgm@gnu.org>
* Cocoa/Emacs.base/Contents/Info.plist:
* Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* GNUstep/Emacs.base/Resources/Emacs.desktop:
Bump version to 24.1.50.
2012-01-05 Glenn Morris <rgm@gnu.org>
* Cocoa/Emacs.base/Contents/Info.plist:

4
nextstep/Cocoa/Emacs.base/Contents/Info.plist
View file

@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<key>CFBundleExecutable</key>
<string>Emacs</string>
<key>CFBundleGetInfoString</key>
<string>Emacs 24.0.95 Copyright (C) 2012 Free Software Foundation, Inc.</string>
<string>Emacs 24.1.50 Copyright (C) 2012 Free Software Foundation, Inc.</string>
<key>CFBundleIconFile</key>
<string>Emacs.icns</string>
<key>CFBundleIdentifier</key>
@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<string>APPL</string>
<!-- This should be the emacs version number. -->
<key>CFBundleShortVersionString</key>
<string>24.0.95</string>
<string>24.1.50</string>
<key>CFBundleSignature</key>
<string>EMAx</string>
<!-- This SHOULD be a build number. -->

4
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
View file

@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Emacs";
CFBundleShortVersionString = "Version 24.0.95";
CFBundleGetInfoString = "Emacs version 24.0.95, NS Windowing";
CFBundleShortVersionString = "Version 24.1.50";
CFBundleGetInfoString = "Emacs version 24.1.50, NS Windowing";
NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc.";

2
nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
View file

@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Version=24.0.95
Version=24.1.50
Categories=GNUstep
Name=Emacs
Comment=GNU Emacs for NeXT/Open/GNUstep and OS X

4
nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
View file

@ -2,7 +2,7 @@
ApplicationDescription = "GNU Emacs for GNUstep / OS X";
ApplicationIcon = emacs.tiff;
ApplicationName = Emacs;
ApplicationRelease = "24.0.95";
ApplicationRelease = "24.1.50";
Authors = (
"Adrian Robert (GNUstep)",
"Christophe de Dinechin (MacOS X)",
@ -13,7 +13,7 @@
);
Copyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
FullVersionID = "Emacs 24.0.95, NS Windowing";
FullVersionID = "Emacs 24.1.50, NS Windowing";
NSExecutable = Emacs;
NSIcon = emacs.tiff;
NSPrincipalClass = NSApplication;

5
nt/ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-07 Glenn Morris <rgm@gnu.org>
* config.nt, makefile.w32-in, emacs.rc, emacsclient.rc:
Bump version to 24.1.50.
2012-04-07 Eli Zaretskii <eliz@gnu.org>
* configure.bat: Support building with libxml2.

2
nt/config.nt
View file

@ -331,7 +331,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define PACKAGE "emacs"
/* Version number of package */
#define VERSION "24.0.95"
#define VERSION "24.1.50"
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */

8
nt/emacs.rc
View file

@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 24,0,95,0
PRODUCTVERSION 24,0,95,0
FILEVERSION 24,1,50,0
PRODUCTVERSION 24,1,50,0
FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG
FILEFLAGS 0x1L
@ -25,12 +25,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
VALUE "FileVersion", "24, 0, 95, 0\0"
VALUE "FileVersion", "24, 1, 50, 0\0"
VALUE "InternalName", "Emacs\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs\0"
VALUE "ProductVersion", "24, 0, 95, 0\0"
VALUE "ProductVersion", "24, 1, 50, 0\0"
VALUE "OLESelfRegister", "\0"
END
END

8
nt/emacsclient.rc
View file

@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 24,0,95,0
PRODUCTVERSION 24,0,95,0
FILEVERSION 24,1,50,0
PRODUCTVERSION 24,1,50,0
FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG
FILEFLAGS 0x1L
@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
VALUE "FileVersion", "24, 0, 95, 0\0"
VALUE "FileVersion", "24, 1, 50, 0\0"
VALUE "InternalName", "EmacsClient\0"
VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
VALUE "OriginalFilename", "emacsclientw.exe"
VALUE "ProductName", "EmacsClient\0"
VALUE "ProductVersion", "24, 0, 95, 0\0"
VALUE "ProductVersion", "24, 1, 50, 0\0"
VALUE "OLESelfRegister", "\0"
END
END

2
nt/makefile.w32-in
View file

@ -22,7 +22,7 @@
# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
# (and remove or replace this comment).
VERSION = 24.0.95
VERSION = 24.1.50
TMP_DIST_DIR = emacs-$(VERSION)