[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107791: Bump trunk version to 24.
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107791: Bump trunk version to 24.1.50. |
|
Date: |
Fri, 02 Nov 2012 01:17:45 -0000 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 107791
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-04-07 13:00:16 -0700
message:
Bump trunk version to 24.1.50.
* 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.
modified:
ChangeLog
README
configure.in
doc/emacs/ChangeLog
doc/emacs/emacsver.texi
doc/man/ChangeLog
doc/man/emacs.1
msdos/ChangeLog
msdos/sed2v2.inp
nextstep/ChangeLog
nextstep/Cocoa/Emacs.base/Contents/Info.plist
nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
nt/ChangeLog
nt/config.nt
nt/emacs.rc
nt/emacsclient.rc
nt/makefile.w32-in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-07 10:19:22 +0000
+++ b/ChangeLog 2012-04-07 20:00:16 +0000
@@ -1,3 +1,7 @@
+2012-04-07 Glenn Morris <address@hidden>
+
+ * README, configure.in (AC_INIT): Bump version to 24.1.50.
+
2012-04-07 Eli Zaretskii <address@hidden>
* lib/makefile.w32-in (gnulib, all): Don't depend on stamp_BLD.
=== modified file 'README'
--- a/README 2012-04-02 04:38:31 +0000
+++ b/README 2012-04-07 20:00:16 +0000
@@ -2,7 +2,7 @@
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
=== modified file 'configure.in'
--- a/configure.in 2012-04-02 04:38:31 +0000
+++ b/configure.in 2012-04-07 20:00:16 +0000
@@ -4,7 +4,7 @@
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 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)
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2012-04-05 00:14:04 +0000
+++ b/doc/emacs/ChangeLog 2012-04-07 20:00:16 +0000
@@ -1,3 +1,7 @@
+2012-04-07 Glenn Morris <address@hidden>
+
+ * emacsver.texi (EMACSVER): Bump version to 24.1.50.
+
2012-04-05 Glenn Morris <address@hidden>
* glossary.texi (Glossary): Use anchors for internal cross-references.
=== modified file 'doc/emacs/emacsver.texi'
--- a/doc/emacs/emacsver.texi 2012-04-02 04:38:31 +0000
+++ b/doc/emacs/emacsver.texi 2012-04-07 20:00:16 +0000
@@ -1,4 +1,4 @@
@c It would be nicer to generate this using configure and @address@hidden
@c However, that would mean emacsver.texi would always be newer
@c then the info files in release tarfiles.
address@hidden EMACSVER 24.0.95
address@hidden EMACSVER 24.1.50
=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2012-02-09 07:48:22 +0000
+++ b/doc/man/ChangeLog 2012-04-07 20:00:16 +0000
@@ -1,3 +1,7 @@
+2012-04-07 Glenn Morris <address@hidden>
+
+ * emacs.1: Bump version to 24.1.50.
+
2011-11-16 Juanma Barranquero <address@hidden>
* etags.1: Fix typo.
=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1 2012-04-02 04:38:31 +0000
+++ b/doc/man/emacs.1 2012-04-07 20:00:16 +0000
@@ -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
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2012-02-09 07:48:22 +0000
+++ b/msdos/ChangeLog 2012-04-07 20:00:16 +0000
@@ -1,3 +1,7 @@
+2012-04-07 Glenn Morris <address@hidden>
+
+ * sed2v2.inp: Bump version to 24.1.50.
+
2012-02-04 Eli Zaretskii <address@hidden>
* sed3v2.inp (insrcdir): Use $(<F) rather than $<, as
=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp 2012-04-02 04:38:31 +0000
+++ b/msdos/sed2v2.inp 2012-04-07 20:00:16 +0000
@@ -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/
=== modified file 'nextstep/ChangeLog'
--- a/nextstep/ChangeLog 2012-02-09 07:48:22 +0000
+++ b/nextstep/ChangeLog 2012-04-07 20:00:16 +0000
@@ -1,3 +1,11 @@
+2012-04-07 Glenn Morris <address@hidden>
+
+ * 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 <address@hidden>
* Cocoa/Emacs.base/Contents/Info.plist:
=== modified file 'nextstep/Cocoa/Emacs.base/Contents/Info.plist'
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist 2012-04-02 04:38:31
+0000
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist 2012-04-07 20:00:16
+0000
@@ -553,7 +553,7 @@
<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 @@
<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. -->
=== modified file
'nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings'
---
a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
2012-04-02 04:38:31 +0000
+++
b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
2012-04-07 20:00:16 +0000
@@ -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.";
=== modified file 'nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop'
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop 2012-04-02
04:38:31 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop 2012-04-07
20:00:16 +0000
@@ -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
=== modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist'
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2012-04-02
04:38:31 +0000
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2012-04-07
20:00:16 +0000
@@ -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;
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2012-04-07 13:57:36 +0000
+++ b/nt/ChangeLog 2012-04-07 20:00:16 +0000
@@ -1,3 +1,8 @@
+2012-04-07 Glenn Morris <address@hidden>
+
+ * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc:
+ Bump version to 24.1.50.
+
2012-04-07 Eli Zaretskii <address@hidden>
* configure.bat: Support building with libxml2.
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2012-04-02 04:38:31 +0000
+++ b/nt/config.nt 2012-04-07 20:00:16 +0000
@@ -331,7 +331,7 @@
#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. */
=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc 2012-04-02 04:38:31 +0000
+++ b/nt/emacs.rc 2012-04-07 20:00:16 +0000
@@ -7,8 +7,8 @@
#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
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
=== modified file 'nt/emacsclient.rc'
--- a/nt/emacsclient.rc 2012-04-02 04:38:31 +0000
+++ b/nt/emacsclient.rc 2012-04-07 20:00:16 +0000
@@ -5,8 +5,8 @@
#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
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
=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in 2012-04-07 10:19:22 +0000
+++ b/nt/makefile.w32-in 2012-04-07 20:00:16 +0000
@@ -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)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r107791: Bump trunk version to 24.1.50.,
Glenn Morris <=