From 0faf0bc3e59e2fe3bd425e7ef762caf7df616b5d Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Tue, 12 Aug 2008 20:15:15 +0200 Subject: [PATCH] Relicense Kees' scripts to GPLv3+. Add sbuild as alternative recommend to pbuilder. --- common.py | 35 ++++++++++++++++++----------------- dch-repeat | 5 +++-- debian/changelog | 10 +++++++++- debian/control | 2 +- debian/copyright | 17 +++++++++-------- mk-sbuild-lv | 5 +++-- pull-debian-debdiff | 5 +++-- what-patch | 5 +++-- 8 files changed, 49 insertions(+), 35 deletions(-) diff --git a/common.py b/common.py index 2cd3aa5..521026c 100644 --- a/common.py +++ b/common.py @@ -1,27 +1,28 @@ # -# common.py - provides functions which are commonly used by the -# ubuntu-dev-tools package. +# common.py - provides functions which are commonly used by the +# ubuntu-dev-tools package. # -# Copyright (C) 2008 Jonathan Patrick Davies +# Copyright (C) 2008 Jonathan Patrick Davies # -# 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. +# Some of the functions are based upon code written by Martin Pitt +# and Kees Cook . # -# 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. +# ################################################################## # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# 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. +# +# ################################################################## -# Based on code written by Martin Pitt and -# Kees Cook . - -""" Necessary modules. """ import cookielib import glob import os.path diff --git a/dch-repeat b/dch-repeat index c32938e..47e870c 100755 --- a/dch-repeat +++ b/dch-repeat @@ -7,14 +7,15 @@ # # 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; version 2. +# 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-2 for more details. +# See file /usr/share/common-licenses/GPL for more details. # # ################################################################## # diff --git a/debian/changelog b/debian/changelog index 0d58ec2..07b2d0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,15 @@ ubuntu-dev-tools (0.39ubuntu1) intrepid; urgency=low [ Jonathan Patrick Davies ] * common.py: Use os.path.expanduser() instead of os.environ. - -- Jonathan Patrick Davies Tue, 12 Aug 2008 18:32:05 +0100 + [ Siegfried-Angel Gevatter Pujals ] + * debian/control: + - Add sbuild as an alternative recommends to pbuilder. + * what-patch, pull-debian-debdiff, mk-sbuild-lv, dch-repat, debian/copyright: + - Change the license of all scripts from Kees Cook to the GPL version 3 + or later. + - Order the script names alphabetically in debian/copyright. + + -- Siegfried-Angel Gevatter Pujals Tue, 12 Aug 2008 20:09:42 +0200 ubuntu-dev-tools (0.38ubuntu1) intrepid; urgency=low diff --git a/debian/control b/debian/control index c9290d3..bd300e0 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Package: ubuntu-dev-tools Architecture: all Section: devel Depends: ${python:Depends}, binutils, devscripts, sudo, python-launchpad-bugs (>= 0.2.25), python-debian, dctrl-tools, lsb-release, diffstat, dpkg-dev -Recommends: bzr, pbuilder, reportbug (>= 3.39ubuntu1) +Recommends: bzr, pbuilder | sbuild, reportbug (>= 3.39ubuntu1) Conflicts: devscripts (<< 2.10.7ubuntu5) Replaces: devscripts (<< 2.10.7ubuntu5) XB-Python-Version: ${python:Versions} diff --git a/debian/copyright b/debian/copyright index 8e64534..252b5fc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -39,9 +39,9 @@ Copyright: Licenses: -404main, check-symbols, dch-repeat, dgetlp, mk-sbuild-lv, pbuilder-dist, -requestsync, reverse-build-depends, submittodebian, update-maintainer -and what-patch are licensed under GPLv2: +404main, check-symbols, dgetlp, pbuilder-dist, requestsync, +reverse-build-depends, submittodebian and update-maintainer are licensed +under the GNU General Public License, version 2: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,8 +55,9 @@ and what-patch are licensed under GPLv2: On Debian systems, the complete text of the GNU General Public License v2 can be found in `/usr/share/common-licenses/GPL-2'. -get-branches, get-build-deps, debian-pull-debdiff, massfile, ppaput, -suspicious-source and pull-lp-source are licensed under GPLv3: +dch-repeat, get-branches, get-build-deps, massfile, mk-sbuild-lv, ppaput, +pull-debian-debdiff, pull-lp-source, suspicious-source and what-patch are +licensed under the GNU General Public License, version 3: 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 @@ -71,6 +72,6 @@ On Debian systems, the complete text of the GNU General Public License v3 can be found in `/usr/share/common-licenses/GPL-3'. The following of the scripts can be used, at your option, regarding any -later version of the previously specified license: 404main, pbuilder-dist, -dgetlp, reverse-build-depends, suspicious-source, pull-lp-source and -get-build-deps. +later version of the previously specified license: 404main, dch-repeat, dgetlp, +get-build-deps, mk-sbuild-lv, pull-debian-debdiff, pull-lp-source, +reverse-build-depends, suspicious-source, what-patch. diff --git a/mk-sbuild-lv b/mk-sbuild-lv index 444fed7..07fd920 100755 --- a/mk-sbuild-lv +++ b/mk-sbuild-lv @@ -7,14 +7,15 @@ # # 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; version 2. +# 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-2 for more details. +# See file /usr/share/common-licenses/GPL for more details. # # ################################################################## # diff --git a/pull-debian-debdiff b/pull-debian-debdiff index 37f3cd8..eb0fd60 100755 --- a/pull-debian-debdiff +++ b/pull-debian-debdiff @@ -6,14 +6,15 @@ # # 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; version 3. +# 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-3 for more details. +# See file /usr/share/common-licenses/GPL for more details. # # ################################################################## # diff --git a/what-patch b/what-patch index 90d3f47..c7bcd54 100755 --- a/what-patch +++ b/what-patch @@ -8,14 +8,15 @@ # # 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; version 2. +# 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-2 for more details. +# See file /usr/share/common-licenses/GPL for more details. # # ################################################################## #