[Pkg-python-debian-commits] r91 trunk: updated copyright information

[John Wright]

On Sun, Jul 15, 2007 at 04:47:13PM +0200, zack at bononia.it wrote:
> ------------------------------------------------------------
> revno: 91
> committer: zack at bononia.it
> branch nick: pkg-python-debian.debfile
> timestamp: Sun 2007-07-15 16:47:13 +0200
> message:
>   updated copyright information
> modified:
>   debian/copyright
>   debian_bundle/arfile.py
>   debian_bundle/debtags.py

> === modified file 'debian/copyright'
> --- a/debian/copyright	2007-07-15 09:43:46 +0000
> +++ b/debian/copyright	2007-07-15 14:47:13 +0000
> @@ -24,43 +24,15 @@
>    
>  Licenses:
>  
> -   deb822.py is under the following license
> -
> -   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
> -   dated June, 1991.
> -   
> -   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, write to the Free Software Foundation, 
> -   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
> -  
> -   debian_support.py, changelog.py, README.changelog, Debtags.py, and the
> -   contents of examples/debtags/ and examples/changelog/ are under the
> -   following license
> -
> -   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
> -   the Free Software Foundation; either version 2 of the License, or
> -   (at your option) any later version.
> -
> -   This package 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 package; if not, write to the Free Software
> -   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
> -
> -On Debian systems, the complete text of the GNU General
> -Public License can be found in `/usr/share/common-licenses/GPL'.
> -
> -The Debian packaging is (C) 2006 James Westby <jw+debian at ajemswestby.net>,
> -and is placed under the GPL, see above.
> +  The following modules are released under GPL v2 or above:
> +    deb822.py, changelog.py, debian_support.py

This is incorrect - deb822 is GPLv2 only for now (see the heading of the
file); Dann, Dato and I haven't discussed allowing distribution under v3.

Thanks,
John