Relicense Kees' scripts to GPLv3+. Add sbuild as alternative recommend to pbuilder.

This commit is contained in:
Siegfried-Angel Gevatter Pujals 2008-08-12 20:15:15 +02:00
parent a37b0de322
commit 0faf0bc3e5
8 changed files with 49 additions and 35 deletions

View File

@ -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 <jpds@ubuntu.com>
# Copyright (C) 2008 Jonathan Patrick Davies <jpds@ubuntu.com>
#
# 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
# <martin.pitt@ubuntu.com> and Kees Cook <kees@ubuntu.com>.
#
# 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 <http://www.gnu.org/licenses/>.
# 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 <martin.pitt@ubuntu.com> and
# Kees Cook <kees@ubuntu.com>.
""" Necessary modules. """
import cookielib
import glob
import os.path

View File

@ -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.
#
# ##################################################################
#

10
debian/changelog vendored
View File

@ -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 <jpds@ubuntu.com> 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 <rainct@ubuntu.com> Tue, 12 Aug 2008 20:09:42 +0200
ubuntu-dev-tools (0.38ubuntu1) intrepid; urgency=low

2
debian/control vendored
View File

@ -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}

17
debian/copyright vendored
View File

@ -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.

View File

@ -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.
#
# ##################################################################
#

View File

@ -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.
#
# ##################################################################
#

View File

@ -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.
#
# ##################################################################
#