Commit f6769186 authored by Matt Mackall's avatar Matt Mackall
Browse files

Update license to GPLv2+

--HG--
branch : stable
parent eb243551cbd8
......@@ -6,7 +6,7 @@
# Thomas Arendsen Hein <thomas@intevation.de>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
"""
hg-ssh - a wrapper for ssh access to a limited set of mercurial repos
......
......@@ -5,8 +5,8 @@
;; Author: Bryan O'Sullivan <bos@serpentine.com>
;; mercurial.el is free software; you can redistribute it and/or
;; modify it under the terms of version 2 of the GNU General Public
;; License as published by the Free Software Foundation.
;; modify it under the terms of the GNU General Public License or any
;; later version.
;; mercurial.el is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
......@@ -784,7 +784,7 @@ Push changes G C-c h > hg-push"
(defun hg-help-overview ()
"This is an overview of the Mercurial SCM mode for Emacs.
You can find the source code, license (GPL v2), and credits for this
You can find the source code, license (GPLv2+), and credits for this
code by typing `M-x find-library mercurial RET'."
(interactive)
(hg-view-output ("Mercurial Help Overview")
......
......@@ -2,7 +2,7 @@ Summary: Mercurial -- a distributed SCM
Name: mercurial
Version: snapshot
Release: 0
License: GPLv2
License: GPLv2+
Group: Development/Tools
URL: http://mercurial.selenic.com/
Source0: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
......
......@@ -5,8 +5,8 @@
;; Author: Bryan O'Sullivan <bos@serpentine.com>
;; mq.el is free software; you can redistribute it and/or modify it
;; under the terms of version 2 of the GNU General Public License as
;; published by the Free Software Foundation.
;; under the terms of the GNU General Public License version 2 or any
;; later version.
;; mq.el is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
......
......@@ -148,8 +148,7 @@ editor = whatever
Mercurial is free software; you can redistribute it and/or
modify it under the terms of the <a
href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt">GNU
General Public License version 2</a> as published by the Free
Software Foundation.
General Public License version 2</a> or any later version.
</p>
<p>
......
......@@ -95,6 +95,6 @@ Copying
-------
Copyright (C) 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2.
Public License version 2 or any later version.
.. include:: common.txt
......@@ -106,6 +106,6 @@ Copying
This manual page is copyright 2006 Vadim Gelfer.
Mercurial is copyright 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2.
Public License version 2 or any later version.
.. include:: common.txt
......@@ -951,6 +951,6 @@ Copying
This manual page is copyright 2005 Bryan O'Sullivan.
Mercurial is copyright 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2.
Public License version 2 or any later version.
.. include:: common.txt
......@@ -5,7 +5,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
# enable importing on demand to reduce startup time
try:
......
......@@ -3,8 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
#
# GNU General Public License version 2 or any later version.
'''hooks for controlling repository access
......
......@@ -3,7 +3,7 @@
# Copyright 2008 David Soria Parra <dsp@php.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
'''track a line of development with movable markers
......
......@@ -3,7 +3,7 @@
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
'''hooks for integrating with the Bugzilla bug tracker
......
......@@ -6,7 +6,7 @@
# Thomas Arendsen Hein <thomas@intevation.de>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
'''command to display child changesets'''
......
......@@ -4,7 +4,7 @@
# Copyright 2008 Alexander Solovyov <piranha@piranha.org.ua>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
'''command to display statistics about repository history'''
......
......@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
'''import revisions from foreign VCS repositories into Mercurial'''
......
......@@ -3,7 +3,7 @@
# Copyright 2008, 2009 Marek Kubica <marek@xivilization.net> and others
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
# This module is for handling 'bzr', that was formerly known as Bazaar-NG;
# it cannot access 'bar' repositories, but they were never used very much
......
......@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
import base64, errno
import os
......
......@@ -3,7 +3,7 @@
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
from common import NoRepo, MissingTool, SKIPREV, mapfile
from cvs import convert_cvs
......
......@@ -3,7 +3,7 @@
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
import os, locale, re, socket, errno
from cStringIO import StringIO
......
#
# Mercurial built-in replacement for cvsps.
#
# Copyright 2008, Frank Kingswood <frank@kingswood-consulting.co.uk>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2, incorporated herein by reference.
# GNU General Public License version 2 or any later version.
import os
import re
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment