From d67edd7c3c338d83388730bee7e237b6c9db4936 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Mon, 20 Dec 2010 01:19:09 +0200 Subject: [PATCH] Relicense the code in this branch to ISC --- debian/copyright | 5 ++++- doc/ubuntu-dev-tools.5 | 23 +++++++++++------------ ubuntutools/common.py | 31 +++++++++++-------------------- ubuntutools/config.py | 23 +++++++++++------------ 4 files changed, 37 insertions(+), 45 deletions(-) diff --git a/debian/copyright b/debian/copyright index e56b1ef..ea32b6a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -185,16 +185,19 @@ License: GPL-3+ Files: doc/sponsor-patch.1, doc/suspicious-source.1, + doc/ubuntu-dev-tools.5, doc/wrap-and-sort.1, sponsor-patch, suspicious-source, ubuntutools/builder.py, + ubuntutools/common.py, + ubuntutools/config.py, ubuntutools/logger.py, ubuntutools/question.py, ubuntutools/sponsor_patch/bugtask.py, ubuntutools/sponsor_patch/main.py, ubuntutools/sponsor_patch/patch.py, - wrap-and-sort, + wrap-and-sort Copyright: 2010, Benjamin Drung 2010, Evan Broder diff --git a/doc/ubuntu-dev-tools.5 b/doc/ubuntu-dev-tools.5 index 2174b45..3e709f4 100644 --- a/doc/ubuntu-dev-tools.5 +++ b/doc/ubuntu-dev-tools.5 @@ -1,17 +1,16 @@ -.\" Copyright (C) 2010 Stefano Rivera +.\" Copyright (C) 2010, Stefano Rivera .\" -.\" This program is free software; you can redistribute it and/or -.\" modify it under the terms of the GNU General Public License -.\" as published by the Free Software Foundation; either version 2 -.\" of the License, or (at your option) any later version. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" See file /usr/share/common-licenses/GPL-2 for more details. +.\" Permission to use, copy, modify, and/or distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. .\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +.\" AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +.\" OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +.\" PERFORMANCE OF THIS SOFTWARE. .TH ubuntu\-dev\-tools "5" "December 19 2010" "ubuntu\-dev\-tools" .SH NAME ubuntu\-dev\-tools \- Configuration for the ubuntu\-dev\-tools package. diff --git a/ubuntutools/common.py b/ubuntutools/common.py index 490a518..571c403 100644 --- a/ubuntutools/common.py +++ b/ubuntutools/common.py @@ -1,28 +1,19 @@ -# # common.py - provides functions which are commonly used by the # ubuntu-dev-tools package. # -# Copyright (C) 2008 Jonathan Davies -# Copyright (C) 2008 Siegfried-Angel Gevatter Pujals +# Copyright (C) 2010, Stefano Rivera # -# Some of the functions are based upon code written by Martin Pitt -# and Kees Cook . +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # -# ################################################################## -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# See file /usr/share/common-licenses/GPL for more details. -# -# ################################################################## +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. import os import sys diff --git a/ubuntutools/config.py b/ubuntutools/config.py index e4c4d2a..f5fcb0a 100644 --- a/ubuntutools/config.py +++ b/ubuntutools/config.py @@ -1,20 +1,19 @@ # config.py - Common configuration file and environment variable handling for # the ubuntu-dev-tools package. # -# Copyright (C) 2010 Stefano Rivera +# Copyright (C) 2010, Stefano Rivera # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# See file /usr/share/common-licenses/GPL-2 for more details. +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. import os import os.path