# HG changeset patch # User Martin Geisler # Date 1325863633 -3600 # Node ID 7de7630053cb492c1d2cf53d6b36cc22d20f8c6b # Parent cc2da4a5ed9a0abaa030914d1e335d57d7b7c11a Remove FSF mailing address from GPL headers The GPLv3 FAQ suggests to upgrade by [...] replace all your existing v2 license notices (usually at the top of each file) with the new recommended text available on the GNU licenses howto. It's more future-proof because it no longer includes the FSF's postal mailing address. This removes the postal address, but leaves the version number at 2+. diff -r cc2da4a5ed9a -r 7de7630053cb contrib/mercurial.el --- a/contrib/mercurial.el Fri Jan 06 16:16:58 2012 +0100 +++ b/contrib/mercurial.el Fri Jan 06 16:27:13 2012 +0100 @@ -15,8 +15,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with mercurial.el, GNU Emacs, or XEmacs; see the file COPYING -;; (`C-h C-l'). If not, write to the Free Software Foundation, Inc., -;; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +;; (`C-h C-l'). If not, see . ;;; Commentary: diff -r cc2da4a5ed9a -r 7de7630053cb contrib/mq.el --- a/contrib/mq.el Fri Jan 06 16:16:58 2012 +0100 +++ b/contrib/mq.el Fri Jan 06 16:27:13 2012 +0100 @@ -15,8 +15,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with mq.el, GNU Emacs, or XEmacs; see the file COPYING (`C-h -;; C-l'). If not, write to the Free Software Foundation, Inc., 59 -;; Temple Place - Suite 330, Boston, MA 02111-1307, USA. +;; C-l'). If not, see . (eval-when-compile (require 'cl)) (require 'mercurial) diff -r cc2da4a5ed9a -r 7de7630053cb contrib/wix/COPYING.rtf Binary file contrib/wix/COPYING.rtf has changed diff -r cc2da4a5ed9a -r 7de7630053cb hgext/convert/transport.py --- a/hgext/convert/transport.py Fri Jan 06 16:16:58 2012 +0100 +++ b/hgext/convert/transport.py Fri Jan 06 16:27:13 2012 +0100 @@ -15,8 +15,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with this program; if not, see . from mercurial import util from svn.core import SubversionException, Pool diff -r cc2da4a5ed9a -r 7de7630053cb hgext/purge.py --- a/hgext/purge.py Fri Jan 06 16:16:58 2012 +0100 +++ b/hgext/purge.py Fri Jan 06 16:27:13 2012 +0100 @@ -20,8 +20,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# along with this program; if not, see . '''command to delete untracked files from the working directory''' diff -r cc2da4a5ed9a -r 7de7630053cb hgext/zeroconf/Zeroconf.py --- a/hgext/zeroconf/Zeroconf.py Fri Jan 06 16:16:58 2012 +0100 +++ b/hgext/zeroconf/Zeroconf.py Fri Jan 06 16:27:13 2012 +0100 @@ -17,8 +17,8 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; if not, see + . """ diff -r cc2da4a5ed9a -r 7de7630053cb mercurial/byterange.py --- a/mercurial/byterange.py Fri Jan 06 16:16:58 2012 +0100 +++ b/mercurial/byterange.py Fri Jan 06 16:27:13 2012 +0100 @@ -9,10 +9,8 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., -# 59 Temple Place, Suite 330, -# Boston, MA 02111-1307 USA +# License along with this library; if not, see +# . # This file is part of urlgrabber, a high-level cross-protocol url-grabber # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko diff -r cc2da4a5ed9a -r 7de7630053cb mercurial/keepalive.py --- a/mercurial/keepalive.py Fri Jan 06 16:16:58 2012 +0100 +++ b/mercurial/keepalive.py Fri Jan 06 16:27:13 2012 +0100 @@ -9,10 +9,8 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., -# 59 Temple Place, Suite 330, -# Boston, MA 02111-1307 USA +# License along with this library; if not, see +# . # This file is part of urlgrabber, a high-level cross-protocol url-grabber # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko diff -r cc2da4a5ed9a -r 7de7630053cb mercurial/simplemerge.py --- a/mercurial/simplemerge.py Fri Jan 06 16:16:58 2012 +0100 +++ b/mercurial/simplemerge.py Fri Jan 06 16:27:13 2012 +0100 @@ -11,8 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with this program; if not, see . # mbp: "you know that thing where cvs gives you conflict markers?" # s: "i hate that." diff -r cc2da4a5ed9a -r 7de7630053cb tests/test-simplemerge.py --- a/tests/test-simplemerge.py Fri Jan 06 16:16:58 2012 +0100 +++ b/tests/test-simplemerge.py Fri Jan 06 16:27:13 2012 +0100 @@ -11,8 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with this program; if not, see . import unittest from unittest import TestCase