diff options
| author | Glenn Morris | 2008-05-09 04:38:17 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-05-09 04:38:17 +0000 |
| commit | 3187ea63b1b6d95d7c6c68ae1e72d152b5b0a45b (patch) | |
| tree | 1d19a9fd51ccda0d6b57ea0989380af2a9b350cd | |
| parent | e1b89931f7b68fa21b66c2125529b822aa4feabd (diff) | |
| download | emacs-3187ea63b1b6d95d7c6c68ae1e72d152b5b0a45b.tar.gz emacs-3187ea63b1b6d95d7c6c68ae1e72d152b5b0a45b.zip | |
Switch to recommended form of GPLv3 permissions notice.
| -rw-r--r-- | mac/ChangeLog | 10 | ||||
| -rw-r--r-- | mac/Emacs.app/Contents/Info.plist | 20 | ||||
| -rw-r--r-- | mac/INSTALL | 10 | ||||
| -rw-r--r-- | mac/README | 10 | ||||
| -rwxr-xr-x | mac/make-package | 23 | ||||
| -rw-r--r-- | mac/src/Emacs.r | 10 | ||||
| -rw-r--r-- | mac/src/chdir.c | 13 |
7 files changed, 42 insertions, 54 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index c1f209aaec3..bc703c903de 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog | |||
| @@ -974,10 +974,10 @@ | |||
| 974 | 974 | ||
| 975 | This file is part of GNU Emacs. | 975 | This file is part of GNU Emacs. |
| 976 | 976 | ||
| 977 | GNU Emacs is free software; you can redistribute it and/or modify | 977 | GNU Emacs is free software: you can redistribute it and/or modify |
| 978 | it under the terms of the GNU General Public License as published by | 978 | it under the terms of the GNU General Public License as published by |
| 979 | the Free Software Foundation; either version 3, or (at your option) | 979 | the Free Software Foundation, either version 3 of the License, or |
| 980 | any later version. | 980 | (at your option) any later version. |
| 981 | 981 | ||
| 982 | GNU Emacs is distributed in the hope that it will be useful, | 982 | GNU Emacs is distributed in the hope that it will be useful, |
| 983 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 983 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -985,8 +985,6 @@ | |||
| 985 | GNU General Public License for more details. | 985 | GNU General Public License for more details. |
| 986 | 986 | ||
| 987 | You should have received a copy of the GNU General Public License | 987 | You should have received a copy of the GNU General Public License |
| 988 | along with GNU Emacs; see the file COPYING. If not, write to the | 988 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 989 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 990 | Boston, MA 02110-1301, USA. | ||
| 991 | 989 | ||
| 992 | ;;; arch-tag: c6fd43f7-0e50-4c0a-ac82-1c8a9e45a9bf | 990 | ;;; arch-tag: c6fd43f7-0e50-4c0a-ac82-1c8a9e45a9bf |
diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist index 625f903a0cf..f8661bca7df 100644 --- a/mac/Emacs.app/Contents/Info.plist +++ b/mac/Emacs.app/Contents/Info.plist | |||
| @@ -4,20 +4,18 @@ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 | |||
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify it | 7 | GNU Emacs is free software: you can redistribute it and/or modify |
| 8 | under the terms of the GNU General Public License as published by the | 8 | it under the terms of the GNU General Public License as published by |
| 9 | Free Software Foundation; either version 3, or (at your option) any | 9 | the Free Software Foundation, either version 3 of the License, or |
| 10 | later version. | 10 | (at your option) any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, but | 12 | GNU Emacs is distributed in the hope that it will be useful, |
| 13 | WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 15 | General Public License for more details. | 15 | GNU General Public License for more details. |
| 16 | 16 | ||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs; see the file COPYING. If not, write to the Free | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 19 | Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| 20 | MA 02110-1301, USA. | ||
| 21 | --> | 19 | --> |
| 22 | 20 | ||
| 23 | <?xml version="1.0" encoding="UTF-8"?> | 21 | <?xml version="1.0" encoding="UTF-8"?> |
diff --git a/mac/INSTALL b/mac/INSTALL index ac581adcdd7..65566b794c9 100644 --- a/mac/INSTALL +++ b/mac/INSTALL | |||
| @@ -182,10 +182,10 @@ Enjoy! | |||
| 182 | 182 | ||
| 183 | This file is part of GNU Emacs. | 183 | This file is part of GNU Emacs. |
| 184 | 184 | ||
| 185 | GNU Emacs is free software; you can redistribute it and/or modify | 185 | GNU Emacs is free software: you can redistribute it and/or modify |
| 186 | it under the terms of the GNU General Public License as published by | 186 | it under the terms of the GNU General Public License as published by |
| 187 | the Free Software Foundation; either version 3, or (at your option) | 187 | the Free Software Foundation, either version 3 of the License, or |
| 188 | any later version. | 188 | (at your option) any later version. |
| 189 | 189 | ||
| 190 | GNU Emacs is distributed in the hope that it will be useful, | 190 | GNU Emacs is distributed in the hope that it will be useful, |
| 191 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 191 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -193,6 +193,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 193 | GNU General Public License for more details. | 193 | GNU General Public License for more details. |
| 194 | 194 | ||
| 195 | You should have received a copy of the GNU General Public License | 195 | You should have received a copy of the GNU General Public License |
| 196 | along with GNU Emacs; see the file COPYING. If not, write to the | 196 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 197 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 198 | Boston, MA 02110-1301, USA. | ||
diff --git a/mac/README b/mac/README index e4110b1b36b..886df66d671 100644 --- a/mac/README +++ b/mac/README | |||
| @@ -38,10 +38,10 @@ Steven | |||
| 38 | 38 | ||
| 39 | This file is part of GNU Emacs. | 39 | This file is part of GNU Emacs. |
| 40 | 40 | ||
| 41 | GNU Emacs is free software; you can redistribute it and/or modify | 41 | GNU Emacs is free software: you can redistribute it and/or modify |
| 42 | it under the terms of the GNU General Public License as published by | 42 | it under the terms of the GNU General Public License as published by |
| 43 | the Free Software Foundation; either version 3, or (at your option) | 43 | the Free Software Foundation, either version 3 of the License, or |
| 44 | any later version. | 44 | (at your option) any later version. |
| 45 | 45 | ||
| 46 | GNU Emacs is distributed in the hope that it will be useful, | 46 | GNU Emacs is distributed in the hope that it will be useful, |
| 47 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 47 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -49,6 +49,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 49 | GNU General Public License for more details. | 49 | GNU General Public License for more details. |
| 50 | 50 | ||
| 51 | You should have received a copy of the GNU General Public License | 51 | You should have received a copy of the GNU General Public License |
| 52 | along with GNU Emacs; see the file COPYING. If not, write to the | 52 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 53 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 54 | Boston, MA 02110-1301, USA. | ||
diff --git a/mac/make-package b/mac/make-package index a37081e8b3f..3bbf7852db9 100755 --- a/mac/make-package +++ b/mac/make-package | |||
| @@ -20,25 +20,24 @@ | |||
| 20 | 20 | ||
| 21 | # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 | 21 | # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
| 22 | # Free Software Foundation, Inc. | 22 | # Free Software Foundation, Inc. |
| 23 | # | 23 | |
| 24 | # Contributed by Steven Tamm (steventamm@mac.com). | ||
| 25 | |||
| 24 | # This file is part of GNU Emacs. | 26 | # This file is part of GNU Emacs. |
| 25 | # | 27 | |
| 26 | # GNU Emacs is free software; you can redistribute it and/or modify | 28 | # GNU Emacs is free software: you can redistribute it and/or modify |
| 27 | # it under the terms of the GNU General Public License as published by | 29 | # it under the terms of the GNU General Public License as published by |
| 28 | # the Free Software Foundation; either version 3, or (at your option) | 30 | # the Free Software Foundation, either version 3 of the License, or |
| 29 | # any later version. | 31 | # (at your option) any later version. |
| 30 | # | 32 | |
| 31 | # GNU Emacs is distributed in the hope that it will be useful, | 33 | # GNU Emacs is distributed in the hope that it will be useful, |
| 32 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 34 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 33 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 35 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 34 | # GNU General Public License for more details. | 36 | # GNU General Public License for more details. |
| 35 | # | 37 | |
| 36 | # You should have received a copy of the GNU General Public License | 38 | # You should have received a copy of the GNU General Public License |
| 37 | # along with GNU Emacs; see the file COPYING. If not, write to the | 39 | # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 38 | # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 40 | |
| 39 | # Boston, MA 02110-1301, USA. | ||
| 40 | # | ||
| 41 | # Contributed by Steven Tamm (steventamm@mac.com). | ||
| 42 | 41 | ||
| 43 | progname="$0" | 42 | progname="$0" |
| 44 | 43 | ||
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index 47746df01d5..621e2da3cdf 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r | |||
| @@ -4,10 +4,10 @@ | |||
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software: you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 3, or (at your option) | 9 | the Free Software Foundation, either version 3 of the License, or |
| 10 | any later version. | 10 | (at your option) any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 15 | GNU General Public License for more details. | 15 | GNU General Public License for more details. |
| 16 | 16 | ||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs; see the file COPYING. If not, write to | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 20 | Boston, MA 02110-1301, USA. */ | ||
| 21 | 19 | ||
| 22 | /* Contributed by Andrew Choi (akochoi@mac.com). */ | 20 | /* Contributed by Andrew Choi (akochoi@mac.com). */ |
| 23 | 21 | ||
diff --git a/mac/src/chdir.c b/mac/src/chdir.c index 010e6d9fa01..73682c4c4cf 100644 --- a/mac/src/chdir.c +++ b/mac/src/chdir.c | |||
| @@ -2,12 +2,14 @@ | |||
| 2 | Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, | 2 | Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, |
| 3 | 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 3 | 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | Contributed by Andrew Choi (akochoi@mac.com). | ||
| 6 | |||
| 5 | This file is part of GNU Emacs. | 7 | This file is part of GNU Emacs. |
| 6 | 8 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 9 | GNU Emacs is free software: you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 3, or (at your option) | 11 | the Free Software Foundation, either version 3 of the License, or |
| 10 | any later version. | 12 | (at your option) any later version. |
| 11 | 13 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 14 | GNU Emacs is distributed in the hope that it will be useful, |
| 13 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -15,11 +17,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 15 | GNU General Public License for more details. | 17 | GNU General Public License for more details. |
| 16 | 18 | ||
| 17 | You should have received a copy of the GNU General Public License | 19 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs; see the file COPYING. If not, write to | 20 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 20 | Boston, MA 02110-1301, USA. */ | ||
| 21 | 21 | ||
| 22 | /* Contributed by Andrew Choi (akochoi@mac.com). */ | ||
| 23 | 22 | ||
| 24 | #include <string.h> | 23 | #include <string.h> |
| 25 | #include <Files.h> | 24 | #include <Files.h> |