diff options
author | Karoly Lorentey <[email protected]> | 2007-04-22 12:42:47 +0000 |
---|---|---|
committer | Karoly Lorentey <[email protected]> | 2007-04-22 12:42:47 +0000 |
commit | 9d0799072a0d09bc14a99eaf372b262d1ba61399 (patch) | |
tree | 76acd4ae0559776a5ec27fbd5c25598285ec71d1 /mac | |
parent | e18c709364b095ea0be8ecabe458ac9a642a252f (diff) | |
parent | a20becf321f023c6dc1831595712576d64e2ef4b (diff) |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-674
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-675
Update from CVS
* [email protected]/emacs--devo--0--patch-676
Update from CVS
* [email protected]/emacs--devo--0--patch-677
Update from CVS
* [email protected]/emacs--devo--0--patch-678
Update from CVS
* [email protected]/emacs--devo--0--patch-679
Update from CVS
* [email protected]/emacs--devo--0--patch-680
Update from CVS
* [email protected]/emacs--devo--0--patch-681
Update from CVS
* [email protected]/emacs--devo--0--patch-682
Update from CVS
* [email protected]/emacs--devo--0--patch-683
Update from CVS
* [email protected]/emacs--devo--0--patch-684
Update from CVS
* [email protected]/emacs--devo--0--patch-685
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-686
Update from CVS
* [email protected]/emacs--devo--0--patch-687
Release ERC 5.2.
* [email protected]/emacs--devo--0--patch-688
Update from CVS
* [email protected]/emacs--devo--0--patch-689
Update from CVS
* [email protected]/emacs--devo--0--patch-690
Update from CVS
* [email protected]/emacs--devo--0--patch-691
Update from CVS
* [email protected]/emacs--devo--0--patch-692
Update from CVS
* [email protected]/emacs--devo--0--patch-693
Update from CVS
* [email protected]/emacs--devo--0--patch-694
Update from CVS
* [email protected]/emacs--devo--0--patch-695
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-696
Update from CVS
* [email protected]/emacs--devo--0--patch-697
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-698
Update from CVS
* [email protected]/emacs--devo--0--patch-699
Update from CVS
* [email protected]/emacs--devo--0--patch-700
Update from CVS
* [email protected]/emacs--devo--0--patch-701
Update from CVS
* [email protected]/gnus--rel--5.10--patch-209
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-210
Update from CVS
* [email protected]/gnus--rel--5.10--patch-211
Update from CVS
* [email protected]/gnus--rel--5.10--patch-212
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-213
Update from CVS
* [email protected]/gnus--rel--5.10--patch-214
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-215
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-601
Diffstat (limited to 'mac')
-rw-r--r-- | mac/ChangeLog | 4 | ||||
-rw-r--r-- | mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings | 4 | ||||
-rwxr-xr-x | mac/make-package | 2 | ||||
-rw-r--r-- | mac/src/Emacs.r | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index c128ae837e..d427a71e5c 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,7 @@ +2007-04-09 YAMAMOTO Mitsuharu <[email protected]> + + * make-package (compver): Don't hardcode processor type. + 2007-03-20 YAMAMOTO Mitsuharu <[email protected]> * makefile.MPW (dired.c.x, editfns.c.x, fileio.c.x, lread.c.x) diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index c84e392b17..c9f8190c88 100644 --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.0.96"; -CFBundleGetInfoString = "22.0.96, Copyright (C) 2007 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.0.98"; +CFBundleGetInfoString = "22.0.98, Copyright (C) 2007 Free Software Foundation, Inc."; diff --git a/mac/make-package b/mac/make-package index a783ef40a5..1db34d2046 100755 --- a/mac/make-package +++ b/mac/make-package @@ -325,7 +325,7 @@ if test "$with_app" == "yes"; then fi fi -compver=powerpc-apple-darwin`uname -r` +compver=`uname -p`-apple-darwin`uname -r` if test "$self_contained" = "yes"; then # Move shared files down to Resources directory diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index f48652dd08..0a17e37916 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r @@ -221,10 +221,10 @@ resource 'vers' (1) { 0x22, /* Major revision in BCD */ 0x0, /* Minor revision in BCD */ alpha, /* development, alpha, beta, or final (release) */ - 96, /* Non-final release # */ + 98, /* Non-final release # */ 0, /* Region code */ - "22.0.96", /* Short version number */ - "22.0.96, Copyright \0xa9 2007 " + "22.0.98", /* Short version number */ + "22.0.98, Copyright \0xa9 2007 " "Free Software Foundation, Inc." /* Long version number */ }; |