summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2015-06-22 18:52:20 +0200
committerGuido Günther <agx@sigxcpu.org>2015-06-22 18:52:20 +0200
commitb3341e5effe54b3f1bf9891857d537cb8501306b (patch)
treee581bc39ce6c851ce3236344d71bf84e02d608fd
parent64e6fff5be977ef6f22bfa4d6daf5379397a2ef4 (diff)
Fix FSF address - thanks rpmlint
use gnu.org/licences instead of a postal address, as suggested by Guido
-rw-r--r--docs/copyright.sgml4
-rwxr-xr-xexamples/gbp-add-patch4
-rwxr-xr-xexamples/zeitgeist-git.py4
-rwxr-xr-xgbp/__init__.py4
-rw-r--r--gbp/command_wrappers.py4
-rw-r--r--gbp/config.py4
-rw-r--r--gbp/dch.py4
-rw-r--r--gbp/deb/__init__.py4
-rw-r--r--gbp/deb/changelog.py4
-rw-r--r--gbp/deb/control.py4
-rw-r--r--gbp/deb/dscfile.py4
-rw-r--r--gbp/deb/format.py4
-rw-r--r--gbp/deb/git.py4
-rw-r--r--gbp/deb/policy.py4
-rw-r--r--gbp/deb/pristinetar.py4
-rw-r--r--gbp/deb/source.py4
-rw-r--r--gbp/deb/upstreamsource.py4
-rw-r--r--gbp/deb/uscan.py4
-rw-r--r--gbp/errors.py4
-rw-r--r--gbp/format.py4
-rw-r--r--gbp/git/__init__.py4
-rw-r--r--gbp/git/args.py4
-rw-r--r--gbp/git/commit.py4
-rw-r--r--gbp/git/errors.py4
-rw-r--r--gbp/git/fastimport.py4
-rw-r--r--gbp/git/modifier.py4
-rw-r--r--gbp/git/repository.py4
-rw-r--r--gbp/git/vfs.py4
-rw-r--r--gbp/log.py4
-rw-r--r--gbp/notifications.py4
-rw-r--r--gbp/patch_series.py4
-rw-r--r--gbp/pkg/__init__.py4
-rw-r--r--gbp/pkg/pristinetar.py4
-rw-r--r--gbp/rpm/__init__.py4
-rw-r--r--gbp/rpm/git.py4
-rw-r--r--gbp/rpm/lib_rpm.py4
-rw-r--r--gbp/rpm/linkedlist.py4
-rw-r--r--gbp/rpm/policy.py4
-rw-r--r--gbp/scripts/__init__.py4
-rwxr-xr-xgbp/scripts/buildpackage.py4
-rwxr-xr-xgbp/scripts/clone.py4
-rw-r--r--gbp/scripts/common/__init__.py4
-rw-r--r--gbp/scripts/common/buildpackage.py4
-rw-r--r--gbp/scripts/common/import_orig.py4
-rw-r--r--gbp/scripts/common/pq.py4
-rwxr-xr-xgbp/scripts/config.py4
-rw-r--r--gbp/scripts/create_remote_repo.py4
-rw-r--r--gbp/scripts/dch.py4
-rw-r--r--gbp/scripts/import_dsc.py4
-rw-r--r--gbp/scripts/import_dscs.py4
-rw-r--r--gbp/scripts/import_orig.py4
-rwxr-xr-xgbp/scripts/import_srpm.py4
-rwxr-xr-xgbp/scripts/pq.py4
-rwxr-xr-xgbp/scripts/pq_rpm.py4
-rwxr-xr-xgbp/scripts/pull.py4
-rw-r--r--gbp/scripts/supercommand.py4
-rw-r--r--gbp/tmpfile.py4
-rw-r--r--gbp/tristate.py4
-rw-r--r--setup.py4
-rw-r--r--tests/13_test_gbp_pq.py4
-rw-r--r--tests/14_test_gbp_import_dscs.py4
-rw-r--r--tests/15_test_DebianSource.py4
-rw-r--r--tests/16_test_supercommand.py4
-rw-r--r--tests/19_test_gbp_scripts_config.py4
-rw-r--r--tests/20_test_rpm.py4
-rw-r--r--tests/__init__.py4
-rw-r--r--tests/component/__init__.py4
-rw-r--r--tests/component/deb/__init__.py4
-rw-r--r--tests/component/deb/test_import_dsc.py4
-rw-r--r--tests/component/rpm/__init__.py4
-rw-r--r--tests/component/rpm/test_import_srpm.py4
-rw-r--r--tests/component/rpm/test_pq_rpm.py4
72 files changed, 144 insertions, 144 deletions
diff --git a/docs/copyright.sgml b/docs/copyright.sgml
index f2a9148c..f3065333 100644
--- a/docs/copyright.sgml
+++ b/docs/copyright.sgml
@@ -17,6 +17,6 @@
<para>
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, please see
+ <http://www.gnu.org/licenses/>
</para>
diff --git a/examples/gbp-add-patch b/examples/gbp-add-patch
index b635bb7b..4ccd1fa7 100755
--- a/examples/gbp-add-patch
+++ b/examples/gbp-add-patch
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Add a patch from debian/patches and autocreate the commit message from the
patch info
diff --git a/examples/zeitgeist-git.py b/examples/zeitgeist-git.py
index 33114cde..dae1dbc5 100755
--- a/examples/zeitgeist-git.py
+++ b/examples/zeitgeist-git.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
# Simple Zeitgeist Git data source
diff --git a/gbp/__init__.py b/gbp/__init__.py
index 4b31a851..800dbaef 100755
--- a/gbp/__init__.py
+++ b/gbp/__init__.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""The various things needed by git-buildpackage and friends"""
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py
index ce583cd1..80686662 100644
--- a/gbp/command_wrappers.py
+++ b/gbp/command_wrappers.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""
Simple class wrappers for the various external commands needed by
git-buildpackage and friends
diff --git a/gbp/config.py b/gbp/config.py
index dbe56907..8116ec9a 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""handles command line and config file option parsing for the gbp commands"""
from optparse import OptionParser, OptionGroup, Option, OptionValueError
diff --git a/gbp/dch.py b/gbp/dch.py
index d6385ef3..49b1020c 100644
--- a/gbp/dch.py
+++ b/gbp/dch.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""provides git-dch helpers"""
import re
diff --git a/gbp/deb/__init__.py b/gbp/deb/__init__.py
index 00828cdf..bf323480 100644
--- a/gbp/deb/__init__.py
+++ b/gbp/deb/__init__.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""provides some debian source package related helpers"""
import os
diff --git a/gbp/deb/changelog.py b/gbp/deb/changelog.py
index 1866368f..5fe81aec 100644
--- a/gbp/deb/changelog.py
+++ b/gbp/deb/changelog.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""A Debian Changelog"""
from __future__ import print_function
diff --git a/gbp/deb/control.py b/gbp/deb/control.py
index a4cef2fa..485d677b 100644
--- a/gbp/deb/control.py
+++ b/gbp/deb/control.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""A Debian Control file"""
import email
diff --git a/gbp/deb/dscfile.py b/gbp/deb/dscfile.py
index 06713288..98b785c8 100644
--- a/gbp/deb/dscfile.py
+++ b/gbp/deb/dscfile.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""provides some debian source package related helpers"""
import os
diff --git a/gbp/deb/format.py b/gbp/deb/format.py
index cdfa7464..b9c4eb0f 100644
--- a/gbp/deb/format.py
+++ b/gbp/deb/format.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Parse debian/source/format"""
class DebianSourceFormatError(Exception):
diff --git a/gbp/deb/git.py b/gbp/deb/git.py
index 28177eb3..6d46dec0 100644
--- a/gbp/deb/git.py
+++ b/gbp/deb/git.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""A Git Repository that keeps a Debian Package"""
import re
diff --git a/gbp/deb/policy.py b/gbp/deb/policy.py
index 006dbb21..32c51760 100644
--- a/gbp/deb/policy.py
+++ b/gbp/deb/policy.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""
Debian Packaging policies
diff --git a/gbp/deb/pristinetar.py b/gbp/deb/pristinetar.py
index b3cf2373..fa4cd906 100644
--- a/gbp/deb/pristinetar.py
+++ b/gbp/deb/pristinetar.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Handle checkin and checkout of archives from the pristine-tar branch"""
from gbp.pkg import compressor_opts
diff --git a/gbp/deb/source.py b/gbp/deb/source.py
index e523fd57..2466ab90 100644
--- a/gbp/deb/source.py
+++ b/gbp/deb/source.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""provides some debian source package related helpers"""
import os
diff --git a/gbp/deb/upstreamsource.py b/gbp/deb/upstreamsource.py
index 7eb555ae..ca235ef9 100644
--- a/gbp/deb/upstreamsource.py
+++ b/gbp/deb/upstreamsource.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Debian-specific upstream sources"""
from gbp.pkg import UpstreamSource
diff --git a/gbp/deb/uscan.py b/gbp/deb/uscan.py
index 731ea78b..97e02ea6 100644
--- a/gbp/deb/uscan.py
+++ b/gbp/deb/uscan.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Interface to uscan"""
import os, re, subprocess
diff --git a/gbp/errors.py b/gbp/errors.py
index fd894046..12627d87 100644
--- a/gbp/errors.py
+++ b/gbp/errors.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Errors raised in gbp commands"""
class GbpError(Exception):
diff --git a/gbp/format.py b/gbp/format.py
index c367dc59..f35f7c6e 100644
--- a/gbp/format.py
+++ b/gbp/format.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Format a message"""
from gbp.errors import GbpError
diff --git a/gbp/git/__init__.py b/gbp/git/__init__.py
index 55dc3a82..81e1422d 100644
--- a/gbp/git/__init__.py
+++ b/gbp/git/__init__.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Accessing Git from python"""
import calendar
diff --git a/gbp/git/args.py b/gbp/git/args.py
index 6f3dfd0f..197097f4 100644
--- a/gbp/git/args.py
+++ b/gbp/git/args.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""
Git command argument handling helpers
"""
diff --git a/gbp/git/commit.py b/gbp/git/commit.py
index 699f1a21..cfc5d0c7 100644
--- a/gbp/git/commit.py
+++ b/gbp/git/commit.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Git commit class and helpers"""
import re
diff --git a/gbp/git/errors.py b/gbp/git/errors.py
index d955a612..47122b8e 100644
--- a/gbp/git/errors.py
+++ b/gbp/git/errors.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Git base error exception"""
class GitError(Exception):
diff --git a/gbp/git/fastimport.py b/gbp/git/fastimport.py
index 435d5e0e..1195fee6 100644
--- a/gbp/git/fastimport.py
+++ b/gbp/git/fastimport.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Git fast import class"""
import subprocess
diff --git a/gbp/git/modifier.py b/gbp/git/modifier.py
index 7aede7a1..fd25d93d 100644
--- a/gbp/git/modifier.py
+++ b/gbp/git/modifier.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""
Someone who modifiers something in git
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index f7cda80d..2fa4fdd6 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""A Git repository"""
import six
diff --git a/gbp/git/vfs.py b/gbp/git/vfs.py
index b2c0f454..b34e5736 100644
--- a/gbp/git/vfs.py
+++ b/gbp/git/vfs.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Make blobs in a git repository accessible as file like objects"""
from six import StringIO
diff --git a/gbp/log.py b/gbp/log.py
index 27dc23d9..9248ec94 100644
--- a/gbp/log.py
+++ b/gbp/log.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Simple colored logging classes"""
diff --git a/gbp/notifications.py b/gbp/notifications.py
index d628b269..8ed60a8f 100644
--- a/gbp/notifications.py
+++ b/gbp/notifications.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
import warnings
diff --git a/gbp/patch_series.py b/gbp/patch_series.py
index b50042f7..62065f7b 100644
--- a/gbp/patch_series.py
+++ b/gbp/patch_series.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Handle Patches and Patch Series"""
import os
diff --git a/gbp/pkg/__init__.py b/gbp/pkg/__init__.py
index a8a7ebd9..f08ed3a8 100644
--- a/gbp/pkg/__init__.py
+++ b/gbp/pkg/__init__.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Common functionality of the Debian/RPM package helpers"""
import os
diff --git a/gbp/pkg/pristinetar.py b/gbp/pkg/pristinetar.py
index 0f4ee466..91977897 100644
--- a/gbp/pkg/pristinetar.py
+++ b/gbp/pkg/pristinetar.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Handle checkin and checkout of archives from the pristine-tar branch"""
import os
diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py
index 51d2fa8f..94daf3b0 100644
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""provides some rpm source package related helpers"""
import os
diff --git a/gbp/rpm/git.py b/gbp/rpm/git.py
index bc9e020c..801306e2 100644
--- a/gbp/rpm/git.py
+++ b/gbp/rpm/git.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
import re
from gbp.format import format_str
diff --git a/gbp/rpm/lib_rpm.py b/gbp/rpm/lib_rpm.py
index 4bad44e7..4abc6665 100644
--- a/gbp/rpm/lib_rpm.py
+++ b/gbp/rpm/lib_rpm.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Wrapper module for librpm"""
import tempfile
diff --git a/gbp/rpm/linkedlist.py b/gbp/rpm/linkedlist.py
index 3f619386..73eb35e1 100644
--- a/gbp/rpm/linkedlist.py
+++ b/gbp/rpm/linkedlist.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Simple implementation of a doubly linked list"""
import collections
diff --git a/gbp/rpm/policy.py b/gbp/rpm/policy.py
index f8cb8630..80e0abde 100644
--- a/gbp/rpm/policy.py
+++ b/gbp/rpm/policy.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Default packaging policy for RPM"""
import re
diff --git a/gbp/scripts/__init__.py b/gbp/scripts/__init__.py
index fde82674..10122c24 100644
--- a/gbp/scripts/__init__.py
+++ b/gbp/scripts/__init__.py
@@ -12,6 +12,6 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""The gbp commands"""
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index e8740bf3..c9a0403f 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Build a Debian package out of a Git repository"""
diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py
index 056092b9..1c7f4a93 100755
--- a/gbp/scripts/clone.py
+++ b/gbp/scripts/clone.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
# inspired by dom-git-checkout
#
diff --git a/gbp/scripts/common/__init__.py b/gbp/scripts/common/__init__.py
index 14464836..a24bb628 100644
--- a/gbp/scripts/common/__init__.py
+++ b/gbp/scripts/common/__init__.py
@@ -12,6 +12,6 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Parts shared between the deb and rpm commands"""
diff --git a/gbp/scripts/common/buildpackage.py b/gbp/scripts/common/buildpackage.py
index 2e53b782..71e4daa9 100644
--- a/gbp/scripts/common/buildpackage.py
+++ b/gbp/scripts/common/buildpackage.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Common functionality for Debian and RPM buildpackage scripts"""
diff --git a/gbp/scripts/common/import_orig.py b/gbp/scripts/common/import_orig.py
index d36804f3..b2f45bb6 100644
--- a/gbp/scripts/common/import_orig.py
+++ b/gbp/scripts/common/import_orig.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Common functionality for import-orig scripts"""
import contextlib
diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py
index a4412184..29ad693a 100644
--- a/gbp/scripts/common/pq.py
+++ b/gbp/scripts/common/pq.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Common functionality for Debian and RPM patchqueue management"""
diff --git a/gbp/scripts/config.py b/gbp/scripts/config.py
index cb5d82dc..a5c81299 100755
--- a/gbp/scripts/config.py
+++ b/gbp/scripts/config.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Query and display config file values"""
diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py
index a6c62d8e..cbbf2e17 100644
--- a/gbp/scripts/create_remote_repo.py
+++ b/gbp/scripts/create_remote_repo.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
# Based on the aa-create-git-repo and dom-new-git-repo shell scripts
"""Create a remote Git repository based on the current one"""
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index bc223f93..e3f7c7c0 100644
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Generate Debian changelog entries from Git commit messages"""
diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index f0c2a5e9..b3e1b1b2 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Import a Debian source package into a Git repository"""
from six.moves import configparser
diff --git a/gbp/scripts/import_dscs.py b/gbp/scripts/import_dscs.py
index 30451ce2..1f98cce6 100644
--- a/gbp/scripts/import_dscs.py
+++ b/gbp/scripts/import_dscs.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Import multiple dsc files into Git in one go"""
import glob
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index ca98459c..3bafd41f 100644
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Import a new upstream version into a Git repository"""
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index 5f9b738b..646b698e 100755
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Import an RPM source package into a Git repository"""
from six.moves import configparser
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index c4193163..93f0960f 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""Manage Debian patches on a patch queue branch"""
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index f84e76d1..fe8b2a1b 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
"""manage patches in a patch queue"""
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index 15e4201a..e0063940 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
#
# heavily inspired by dom-safe-pull which is © 2009 Stéphane Glondu <steph@glondu.net>
#
diff --git a/gbp/scripts/supercommand.py b/gbp/scripts/supercommand.py
index a120ae5c..e0c46716 100644
--- a/gbp/scripts/supercommand.py
+++ b/gbp/scripts/supercommand.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Supercommand for all gbp commands"""
from __future__ import print_function
diff --git a/gbp/tmpfile.py b/gbp/tmpfile.py
index e1ad3084..5cceada3 100644
--- a/gbp/tmpfile.py
+++ b/gbp/tmpfile.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Temporary directory handling"""
import os
diff --git a/gbp/tristate.py b/gbp/tristate.py
index 0a800ecd..46300298 100644
--- a/gbp/tristate.py
+++ b/gbp/tristate.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""
A switch with three states: on|off|auto
diff --git a/setup.py b/setup.py
index 9216805a..355b1487 100644
--- a/setup.py
+++ b/setup.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
# END OF COPYRIGHT #
import subprocess
diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py
index 4e729cae..fc7394e1 100644
--- a/tests/13_test_gbp_pq.py
+++ b/tests/13_test_gbp_pq.py
@@ -11,8 +11,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Test L{gbp.pq}"""
from . import context
diff --git a/tests/14_test_gbp_import_dscs.py b/tests/14_test_gbp_import_dscs.py
index b5569a85..b646f5c2 100644
--- a/tests/14_test_gbp_import_dscs.py
+++ b/tests/14_test_gbp_import_dscs.py
@@ -11,8 +11,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Test L{gbp.pq}"""
from . import context
diff --git a/tests/15_test_DebianSource.py b/tests/15_test_DebianSource.py
index c1114e6c..8cfe5852 100644
--- a/tests/15_test_DebianSource.py
+++ b/tests/15_test_DebianSource.py
@@ -11,8 +11,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Test L{gbp.pq}"""
from . import context
diff --git a/tests/16_test_supercommand.py b/tests/16_test_supercommand.py
index f72bb562..25529777 100644
--- a/tests/16_test_supercommand.py
+++ b/tests/16_test_supercommand.py
@@ -11,8 +11,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Test L{gbp} command wrapper"""
import sys
diff --git a/tests/19_test_gbp_scripts_config.py b/tests/19_test_gbp_scripts_config.py
index 528cc01d..13e84669 100644
--- a/tests/19_test_gbp_scripts_config.py
+++ b/tests/19_test_gbp_scripts_config.py
@@ -11,8 +11,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Test the L{gbp} config command"""
import os
diff --git a/tests/20_test_rpm.py b/tests/20_test_rpm.py
index d01192db..8850bc69 100644
--- a/tests/20_test_rpm.py
+++ b/tests/20_test_rpm.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Test the classes under L{gbp.rpm}"""
import filecmp
diff --git a/tests/__init__.py b/tests/__init__.py
index 22e1fc5f..a9309b58 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Unit tests for git-buildpackage"""
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
diff --git a/tests/component/__init__.py b/tests/component/__init__.py
index b0376c10..2674c415 100644
--- a/tests/component/__init__.py
+++ b/tests/component/__init__.py
@@ -14,8 +14,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""
Module for testing individual command line tools of the git-buildpackage suite
"""
diff --git a/tests/component/deb/__init__.py b/tests/component/deb/__init__.py
index 33a8ee1a..8e91ce21 100644
--- a/tests/component/deb/__init__.py
+++ b/tests/component/deb/__init__.py
@@ -14,8 +14,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
import os
diff --git a/tests/component/deb/test_import_dsc.py b/tests/component/deb/test_import_dsc.py
index 41d081e5..e45db22b 100644
--- a/tests/component/deb/test_import_dsc.py
+++ b/tests/component/deb/test_import_dsc.py
@@ -13,8 +13,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
import os
diff --git a/tests/component/rpm/__init__.py b/tests/component/rpm/__init__.py
index 7353c272..47b23e86 100644
--- a/tests/component/rpm/__init__.py
+++ b/tests/component/rpm/__init__.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Test module for RPM command line tools of the git-buildpackage suite"""
from nose.tools import nottest
diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py
index acd8443b..5604f91c 100644
--- a/tests/component/rpm/test_import_srpm.py
+++ b/tests/component/rpm/test_import_srpm.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Basic tests for the git-import-srpm tool"""
import os
diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py
index 0ebaaa22..99ec8d38 100644
--- a/tests/component/rpm/test_pq_rpm.py
+++ b/tests/component/rpm/test_pq_rpm.py
@@ -12,8 +12,8 @@
# 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, please see
+# <http://www.gnu.org/licenses/>
"""Tests for the gbp pq-rpm tool"""
import os