changeset 15782:7de7630053cb

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+.
author Martin Geisler <mg@aragost.com>
date Fri, 06 Jan 2012 16:27:13 +0100
parents cc2da4a5ed9a
children 927712d9853b
files contrib/mercurial.el contrib/mq.el contrib/wix/COPYING.rtf hgext/convert/transport.py hgext/purge.py hgext/zeroconf/Zeroconf.py mercurial/byterange.py mercurial/keepalive.py mercurial/simplemerge.py tests/test-simplemerge.py
diffstat 10 files changed, 12 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- 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 <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
--- 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 <http://www.gnu.org/licenses/>.
 
 (eval-when-compile (require 'cl))
 (require 'mercurial)
Binary file contrib/wix/COPYING.rtf has changed
--- 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 <http://www.gnu.org/licenses/>.
 
 from mercurial import util
 from svn.core import SubversionException, Pool
--- 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 <http://www.gnu.org/licenses/>.
 
 '''command to delete untracked files from the working directory'''
 
--- 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
+    <http://www.gnu.org/licenses/>.
 
 """
 
--- 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
+#   <http://www.gnu.org/licenses/>.
 
 # This file is part of urlgrabber, a high-level cross-protocol url-grabber
 # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko
--- 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
+#   <http://www.gnu.org/licenses/>.
 
 # This file is part of urlgrabber, a high-level cross-protocol url-grabber
 # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko
--- 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 <http://www.gnu.org/licenses/>.
 
 # mbp: "you know that thing where cvs gives you conflict markers?"
 # s: "i hate that."
--- 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 <http://www.gnu.org/licenses/>.
 
 import unittest
 from unittest import TestCase