{"thread":{"id":"47129","subject":"[PATCH/RFC] Replace Free Software Foundation address in license notices","startedAt":"2017-11-07T05:39:54Z","lastAt":"2017-11-13T19:49:30Z","messageCount":3,"participants":["Todd Zullinger","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"331973","messageId":"20171107053933.23370-1-tmz@pobox.com","threadId":"47129","inReplyTo":null,"subject":"[PATCH/RFC] Replace Free Software Foundation address in license notices","fromName":"Todd Zullinger","fromEmail":"tmz@pobox.com","sentAt":"2017-11-07T05:39:33Z","receivedAt":"2017-11-07T05:39:54Z","isPatch":true,"sender":{"key":"tmz@pobox.com","avatar":"https://avatars.githubusercontent.com/u/806319?v=4"},"body":"The mailing address for the FSF has changed over the years. Rather than\nupdating the address across all files, refer readers to gnu.org, as the\nGNU GPL documentation now suggests for license notices. The mailing\naddress is retained in the full license files (COPYING and LGPL-2.1).\n\nThe old address is still present in t/diff-lib/COPYING. This is\nintentional, as the file is used in tests and the contents are not\nexpected to change.\n\nSigned-off-by: Todd Zullinger \n---\n\nAs further rationale for this change, the package lint checks in Fedora (and\nother distributions) look for installed files which contain references to\noutdated Free Software Foundation mailing addresses. (This occurs mostly for\ninterpreted scripts in the installation.)\n\nIn the interest of ensuring that end-users who may read such files and scripts\nand wish to contact the FSF for a copy of the license file, having a correct\naddress is useful. Of course, changing piles of files anytime an address\nchanges is a bit of relatively useless churn.\n\nUsing the license notice template from the current GPL instructions¹ should\nmake this change easier, as it uses a URL which ought to be more stable than a\npostal address. And, of course, both the git project and distributors of\nbinary packages like Fedora ship the full COPYING file(s) with the respective\ntarballs/packages.\n\nWhile the Fedora package lint checks don't see or care about the old address in\nsource files which will be compiled before installation, it seems best to be\nconsistent. If that's not generally agreeable, I can submit a version of this\npatch which only touches files which are installed as-is and contain the old\nFSF mailing address.\n\n¹ https://www.gnu.org/licenses/gpl-howto.html\n\n compat/obstack.c | 5 ++---\n compat/obstack.h | 5 ++---\n compat/poll/poll.c | 3 +--\n compat/poll/poll.h | 3 +--\n compat/regex/regcomp.c | 5 ++---\n compat/regex/regex.c | 5 ++---\n compat/regex/regex.h | 5 ++---\n compat/regex/regex_internal.c | 5 ++---\n compat/regex/regex_internal.h | 5 ++---\n compat/regex/regexec.c | 5 ++---\n contrib/completion/git-completion.bash | 3 +--\n contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 3 +--\n contrib/credential/libsecret/git-credential-libsecret.c | 3 +--\n contrib/emacs/git-blame.el | 5 ++---\n contrib/emacs/git.el | 5 ++---\n contrib/fast-import/import-directories.perl | 3 +--\n contrib/hg-to-git/hg-to-git.py | 3 +--\n ewah/bitmap.c | 3 +--\n ewah/ewah_bitmap.c | 3 +--\n ewah/ewah_io.c | 3 +--\n ewah/ewah_rlw.c | 3 +--\n ewah/ewok.h | 3 +--\n ewah/ewok_rlw.h | 3 +--\n git-gui/git-gui.sh | 3 +--\n imap-send.c | 3 +--\n kwset.c | 4 +---\n kwset.h | 4 +---\n sh-i18n--envsubst.c | 6 ++----\n t/t9114-git-svn-dcommit-merge.sh | 4 +---\n trace.c | 3 +--\n xdiff/xdiff.h | 4 ++--\n xdiff/xdiffi.c | 4 ++--\n xdiff/xdiffi.h | 4 ++--\n xdiff/xemit.c | 4 ++--\n xdiff/xemit.h | 4 ++--\n xdiff/xinclude.h | 4 ++--\n xdiff/xmacros.h | 4 ++--\n xdiff/xmerge.c | 4 ++--\n xdiff/xpatience.c | 4 ++--\n xdiff/xprepare.c | 4 ++--\n xdiff/xprepare.h | 4 ++--\n xdiff/xtypes.h | 4 ++--\n xdiff/xutils.c | 4 ++--\n xdiff/xutils.h | 4 ++--\n 44 files changed, 69 insertions(+), 103 deletions(-)\n\ndiff --git a/compat/obstack.c b/compat/obstack.c\nindex e276ccd7b3..4d1d95beeb 100644\n--- a/compat/obstack.c\n+++ b/compat/obstack.c\n@@ -14,9 +14,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n- Boston, MA 02110-1301, USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n #include \"git-compat-util.h\"\n #include \ndiff --git a/compat/obstack.h b/compat/obstack.h\nindex ceb4bdbcdd..6bc24b7644 100644\n--- a/compat/obstack.h\n+++ b/compat/obstack.h\n@@ -14,9 +14,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n- Boston, MA 02110-1301, USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n /* Summary:\n \ndiff --git a/compat/poll/poll.c b/compat/poll/poll.c\nindex ae03b74a6f..7ed3fbbea1 100644\n--- a/compat/poll/poll.c\n+++ b/compat/poll/poll.c\n@@ -16,8 +16,7 @@\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License along\n- with this program; if not, write to the Free Software Foundation,\n- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */\n+ with this program; if not, see . */\n \n /* Tell gcc not to warn about the (nfd < 0) tests, below. */\n #if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__\ndiff --git a/compat/poll/poll.h b/compat/poll/poll.h\nindex b7aa59d973..cd1995292a 100644\n--- a/compat/poll/poll.h\n+++ b/compat/poll/poll.h\n@@ -16,8 +16,7 @@\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License along\n- with this program; if not, write to the Free Software Foundation,\n- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */\n+ with this program; if not, see . */\n \n #ifndef _GL_POLL_H\n #define _GL_POLL_H\ndiff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c\nindex d8bde06f1a..51cd60baa3 100644\n--- a/compat/regex/regcomp.c\n+++ b/compat/regex/regcomp.c\n@@ -14,9 +14,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n- 02110-1301 USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,\n \t\t\t\t\t size_t length, reg_syntax_t syntax);\ndiff --git a/compat/regex/regex.c b/compat/regex/regex.c\nindex 5cb23e5d59..f3e03a9eab 100644\n--- a/compat/regex/regex.c\n+++ b/compat/regex/regex.c\n@@ -14,9 +14,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n- 02110-1301 USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n #ifdef HAVE_CONFIG_H\n #include \"config.h\"\ndiff --git a/compat/regex/regex.h b/compat/regex/regex.h\nindex 61c9683872..4d81358a83 100644\n--- a/compat/regex/regex.h\n+++ b/compat/regex/regex.h\n@@ -18,9 +18,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n- 02110-1301 USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n #ifndef _REGEX_H\n #define _REGEX_H 1\ndiff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c\nindex 98342b8316..59bf151336 100644\n--- a/compat/regex/regex_internal.c\n+++ b/compat/regex/regex_internal.c\n@@ -14,9 +14,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n- 02110-1301 USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n static void re_string_construct_common (const char *str, int len,\n \t\t\t\t\tre_string_t *pstr,\ndiff --git a/compat/regex/regex_internal.h b/compat/regex/regex_internal.h\nindex 4184d7f5a6..3ee8aae59d 100644\n--- a/compat/regex/regex_internal.h\n+++ b/compat/regex/regex_internal.h\n@@ -14,9 +14,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA\n- 02111-1307 USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n #ifndef _REGEX_INTERNAL_H\n #define _REGEX_INTERNAL_H 1\ndiff --git a/compat/regex/regexec.c b/compat/regex/regexec.c\nindex 6f2b48a78b..1b5d89fd5e 100644\n--- a/compat/regex/regexec.c\n+++ b/compat/regex/regexec.c\n@@ -14,9 +14,8 @@\n Lesser General Public License for more details.\n \n You should have received a copy of the GNU Lesser General Public\n- License along with the GNU C Library; if not, write to the Free\n- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n- 02110-1301 USA. */\n+ License along with the GNU C Library; if not, see\n+ . */\n \n static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,\n \t\t\t\t int n) internal_function;\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex fdd984d34a..f07f16b28f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -111,8 +111,7 @@ __git ()\n # GNU General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program; if not, write to the Free Software Foundation,\n-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n+# along with this program; if not, see .\n #\n # The latest version of this software can be obtained here:\n #\ndiff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c\nindex 2a317fca44..d389bfadce 100644\n--- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c\n+++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c\n@@ -13,8 +13,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * along with this program; if not, see .\n */\n \n /*\ndiff --git a/contrib/credential/libsecret/git-credential-libsecret.c b/contrib/credential/libsecret/git-credential-libsecret.c\nindex 4c56979d8a..cfe295f36b 100644\n--- a/contrib/credential/libsecret/git-credential-libsecret.c\n+++ b/contrib/credential/libsecret/git-credential-libsecret.c\n@@ -14,8 +14,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * along with this program; if not, see .\n */\n \n /*\ndiff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el\nindex e671f6c1c6..510e0f7103 100644\n--- a/contrib/emacs/git-blame.el\n+++ b/contrib/emacs/git-blame.el\n@@ -25,9 +25,8 @@\n ;; PURPOSE. See the GNU General Public License for more details.\n \n ;; You should have received a copy of the GNU General Public\n-;; License along with this program; if not, write to the Free\n-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n-;; MA 02111-1307 USA\n+;; License along with this program; if not, see\n+;; .\n \n ;; http://www.fsf.org/copyleft/gpl.html\n \ndiff --git a/contrib/emacs/git.el b/contrib/emacs/git.el\nindex 5ffc506f6d..97919f2d73 100644\n--- a/contrib/emacs/git.el\n+++ b/contrib/emacs/git.el\n@@ -15,9 +15,8 @@\n ;; PURPOSE. See the GNU General Public License for more details.\n ;;\n ;; You should have received a copy of the GNU General Public\n-;; License along with this program; if not, write to the Free\n-;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n-;; MA 02111-1307 USA\n+;; License along with this program; if not, see\n+;; .\n \n ;;; Commentary:\n \ndiff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl\nindex 4dec1f18e4..a16f79cfdc 100755\n--- a/contrib/fast-import/import-directories.perl\n+++ b/contrib/fast-import/import-directories.perl\n@@ -14,8 +14,7 @@\n # GNU General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program; if not, write to the Free Software\n-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n+# along with this program; if not, see .\n #\n # ------------------------------------------------------------------------\n \ndiff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py\nindex 60dec86d37..de3f81667e 100755\n--- a/contrib/hg-to-git/hg-to-git.py\n+++ b/contrib/hg-to-git/hg-to-git.py\n@@ -15,8 +15,7 @@\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n- along with this program; if not, write to the Free Software\n- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n+ along with this program; if not, see .\n \"\"\"\n \n import os, os.path, sys\ndiff --git a/ewah/bitmap.c b/ewah/bitmap.c\nindex 7103ceefbf..756bdd050e 100644\n--- a/ewah/bitmap.c\n+++ b/ewah/bitmap.c\n@@ -14,8 +14,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n+ * along with this program; if not, see .\n */\n #include \"cache.h\"\n #include \"ewok.h\"\ndiff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c\nindex 06c479f70a..b9fdda1d3d 100644\n--- a/ewah/ewah_bitmap.c\n+++ b/ewah/ewah_bitmap.c\n@@ -14,8 +14,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n+ * along with this program; if not, see .\n */\n #include \"git-compat-util.h\"\n #include \"ewok.h\"\ndiff --git a/ewah/ewah_io.c b/ewah/ewah_io.c\nindex f73210973f..bed1994551 100644\n--- a/ewah/ewah_io.c\n+++ b/ewah/ewah_io.c\n@@ -14,8 +14,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n+ * along with this program; if not, see .\n */\n #include \"git-compat-util.h\"\n #include \"ewok.h\"\ndiff --git a/ewah/ewah_rlw.c b/ewah/ewah_rlw.c\nindex c723f1aefd..b9643b7d0f 100644\n--- a/ewah/ewah_rlw.c\n+++ b/ewah/ewah_rlw.c\n@@ -14,8 +14,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n+ * along with this program; if not, see .\n */\n #include \"git-compat-util.h\"\n #include \"ewok.h\"\ndiff --git a/ewah/ewok.h b/ewah/ewok.h\nindex 269a1a8706..dc43d05b64 100644\n--- a/ewah/ewok.h\n+++ b/ewah/ewok.h\n@@ -14,8 +14,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n+ * along with this program; if not, see .\n */\n #ifndef __EWOK_BITMAP_H__\n #define __EWOK_BITMAP_H__\ndiff --git a/ewah/ewok_rlw.h b/ewah/ewok_rlw.h\nindex 63efdf9698..bb3c6ff7e0 100644\n--- a/ewah/ewok_rlw.h\n+++ b/ewah/ewok_rlw.h\n@@ -14,8 +14,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n+ * along with this program; if not, see .\n */\n #ifndef __EWOK_RLW_H__\n #define __EWOK_RLW_H__\ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex 5bc21b878d..ed24aa9d2f 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -24,8 +24,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n-along with this program; if not, write to the Free Software\n-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}]\n+along with this program; if not, see .}]\n \n ######################################################################\n ##\ndiff --git a/imap-send.c b/imap-send.c\nindex 8c785f3ca2..e0523d3427 100644\n--- a/imap-send.c\n+++ b/imap-send.c\n@@ -18,8 +18,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * along with this program; if not, see .\n */\n \n #include \"cache.h\"\ndiff --git a/kwset.c b/kwset.c\nindex e6236a0359..4fb6455aca 100644\n--- a/kwset.c\n+++ b/kwset.c\n@@ -18,9 +18,7 @@\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n- along with this program; if not, write to the Free Software\n- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA\n- 02110-1301, USA. */\n+ along with this program; if not, see . */\n \n /* Written August 1989 by Mike Haertel.\n The author may be reached (Email) at the address mike@ai.mit.edu,\ndiff --git a/kwset.h b/kwset.h\nindex 61a134f256..583f6268ef 100644\n--- a/kwset.h\n+++ b/kwset.h\n@@ -17,9 +17,7 @@\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n- along with this program; if not, write to the Free Software\n- Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA\n- 02110-1301, USA. */\n+ along with this program; if not, see . */\n \n /* Written August 1989 by Mike Haertel.\n The author may be reached (Email) at the address mike@ai.mit.edu,\ndiff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c\nindex c3a2b5ad17..09c6b445b9 100644\n--- a/sh-i18n--envsubst.c\n+++ b/sh-i18n--envsubst.c\n@@ -30,8 +30,7 @@\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n- along with this program; if not, write to the Free Software Foundation,\n- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */\n+ along with this program; if not, see . */\n \n /* closeout.c - close standard output and standard error\n Copyright (C) 1998-2007 Free Software Foundation, Inc.\n@@ -47,8 +46,7 @@\n GNU General Public License for more details.\n \n You should have received a copy of the GNU General Public License\n- along with this program; if not, write to the Free Software Foundation,\n- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */\n+ along with this program; if not, see . */\n \n #include \n #include \ndiff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh\nindex a3d388228a..50bca62def 100755\n--- a/t/t9114-git-svn-dcommit-merge.sh\n+++ b/t/t9114-git-svn-dcommit-merge.sh\n@@ -27,9 +27,7 @@ cat << EOF\n # GNU General Public License for more details.\n #\n # You should have received a copy of the GNU General Public License\n-# along with this program; if not, write to the Free Software\n-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,\n-# MA 02111-1307 USA\n+# along with this program; if not, see .\n #\n EOF\n }\ndiff --git a/trace.c b/trace.c\nindex 7508aea028..cb1293ed33 100644\n--- a/trace.c\n+++ b/trace.c\n@@ -18,8 +18,7 @@\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n- * along with this program; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * along with this program; if not, see .\n */\n \n #include \"cache.h\"\ndiff --git a/xdiff/xdiff.h b/xdiff/xdiff.h\nindex b090ad8eac..785ecb0899 100644\n--- a/xdiff/xdiff.h\n+++ b/xdiff/xdiff.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c\nindex 93a65680a1..0de1ef463b 100644\n--- a/xdiff/xdiffi.c\n+++ b/xdiff/xdiffi.c\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h\nindex 8b81206c9a..8f1c7c8b04 100644\n--- a/xdiff/xdiffi.h\n+++ b/xdiff/xdiffi.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xemit.c b/xdiff/xemit.c\nindex 8c88dbde38..6881445e4a 100644\n--- a/xdiff/xemit.c\n+++ b/xdiff/xemit.c\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xemit.h b/xdiff/xemit.h\nindex d29710770c..1b9887e670 100644\n--- a/xdiff/xemit.h\n+++ b/xdiff/xemit.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xinclude.h b/xdiff/xinclude.h\nindex 526ccb344d..f35c4485df 100644\n--- a/xdiff/xinclude.h\n+++ b/xdiff/xinclude.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xmacros.h b/xdiff/xmacros.h\nindex 165a895a93..2809a28ca9 100644\n--- a/xdiff/xmacros.h\n+++ b/xdiff/xmacros.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xmerge.c b/xdiff/xmerge.c\nindex f338ad6c75..1659edb453 100644\n--- a/xdiff/xmerge.c\n+++ b/xdiff/xmerge.c\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xpatience.c b/xdiff/xpatience.c\nindex 9f91702de7..a44e776328 100644\n--- a/xdiff/xpatience.c\n+++ b/xdiff/xpatience.c\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xprepare.c b/xdiff/xprepare.c\nindex 13b55aba74..abeb8fb84e 100644\n--- a/xdiff/xprepare.c\n+++ b/xdiff/xprepare.c\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xprepare.h b/xdiff/xprepare.h\nindex 8fb06a5374..947d9fc1bb 100644\n--- a/xdiff/xprepare.h\n+++ b/xdiff/xprepare.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xtypes.h b/xdiff/xtypes.h\nindex 2511aef8d8..8442bd436e 100644\n--- a/xdiff/xtypes.h\n+++ b/xdiff/xtypes.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xutils.c b/xdiff/xutils.c\nindex 04d7b32e4e..088001db4f 100644\n--- a/xdiff/xutils.c\n+++ b/xdiff/xutils.c\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\ndiff --git a/xdiff/xutils.h b/xdiff/xutils.h\nindex 4646ce5752..fba7bae03c 100644\n--- a/xdiff/xutils.h\n+++ b/xdiff/xutils.h\n@@ -13,8 +13,8 @@\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n- * License along with this library; if not, write to the Free Software\n- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n+ * License along with this library; if not, see\n+ * .\n *\n * Davide Libenzi \n *\n-- \n2.15.0\n\n"},{"id":"332107","messageId":"xmqqmv3wjd66.fsf@gitster.mtv.corp.google.com","threadId":"47129","inReplyTo":"20171107053933.23370-1-tmz@pobox.com","subject":"Re: [PATCH/RFC] Replace Free Software Foundation address in license notices","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-11-09T04:20:33Z","receivedAt":"2017-11-09T04:20:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Todd Zullinger writes:\n\n> The mailing address for the FSF has changed over the years. Rather than\n> updating the address across all files, refer readers to gnu.org, as the\n> GNU GPL documentation now suggests for license notices. The mailing\n> address is retained in the full license files (COPYING and LGPL-2.1).\n>\n> The old address is still present in t/diff-lib/COPYING. This is\n> intentional, as the file is used in tests and the contents are not\n> expected to change.\n>\n> Signed-off-by: Todd Zullinger \n> ---\n\nThis change probably makes sense. From here on after applying the\npatch, we won't have to worry about updating these every time they\nmove---not that they have moved often, though ;-)\n\n> compat/obstack.c | 5 ++---\n> ...\n> ewah/ewok_rlw.h | 3 +--\n> git-gui/git-gui.sh | 3 +--\n> imap-send.c | 3 +--\n> ...\n> 44 files changed, 69 insertions(+), 103 deletions(-)\n\nI've tried hard to keep the git-gui/ part as a separate project (it\nindeed is managed separately). I have been, and am still only\npulling from its \"upstream\" repository (Pat, who is its project\nlead, Cc'ed), refaining from making changes that do not exist there\nat git://repo.or.cz/git-gui.git/ to the tree I publish.\n\nI'll separate the part from this patch that touches git-gui/* and\ntry to arrange the next pull from git-gui repository would have the\nomitted part somehow. Given that the \"upstream\" seems to be inactive\nthese days, we might want to change the way we manage that part of\nthe tree, though.\n\nThanks.\n"},{"id":"332435","messageId":"20171113194921.GP5144@zaya.teonanacatl.net","threadId":"47129","inReplyTo":"xmqqmv3wjd66.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH/RFC] Replace Free Software Foundation address in license notices","fromName":"Todd Zullinger","fromEmail":"tmz@pobox.com","sentAt":"2017-11-13T19:49:21Z","receivedAt":"2017-11-13T19:49:30Z","isPatch":true,"sender":{"key":"tmz@pobox.com","avatar":"https://avatars.githubusercontent.com/u/806319?v=4"},"body":"Junio C Hamano wrote:\n> This change probably makes sense. From here on after applying the \n> patch, we won't have to worry about updating these every time they \n> move---not that they have moved often, though ;-)\n\nIndeed. It's thankfully a rare move. I imagine that's why it's \nsomewhat common to find license text with the previous address long \nafter the last move. (That and how boring licensing details are, in \ngeneral.)\n\n>> compat/obstack.c | 5 ++--- \n>> ... \n>> ewah/ewok_rlw.h | 3 +-- \n>> git-gui/git-gui.sh | 3 +-- \n>> imap-send.c | 3 +-- \n>> ... \n>> 44 files changed, 69 insertions(+), 103 deletions(-)\n>\n> I've tried hard to keep the git-gui/ part as a separate project (it \n> indeed is managed separately). I have been, and am still only \n> pulling from its \"upstream\" repository (Pat, who is its project \n> lead, Cc'ed), refaining from making changes that do not exist there \n> at git://repo.or.cz/git-gui.git/ to the tree I publish.\n>\n> I'll separate the part from this patch that touches git-gui/* and \n> try to arrange the next pull from git-gui repository would have the \n> omitted part somehow. Given that the \"upstream\" seems to be inactive \n> these days, we might want to change the way we manage that part of \n> the tree, though.\n\nD'oh, I should have known that. Thanks for splitting this up. I was \nworried more minor things like legal details or changing code that we \nsynced from another project (compat/regex or xdiff) might require some \nchanges and didn't think enough about git-gui being separate.\n\n> Thanks.\n\nThank you too. It's always impressive to see how well you wear the \nmaintainer hat. :)\n\n-- \nTodd\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\nA common mistake people make when trying to design something\ncompletely foolproof is to underestimate the ingenuity of complete\nfools.\n -- Douglas Adams\n\n"}]}