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

[zack at bononia.it]

------------------------------------------------------------
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
-------------- next part --------------
=== 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
+  The following modules are released under GPL v3 or above:
+    debfile.py, arfile.py, debtags.py
+
+  The Debian packaging is (C) Debian python-debian Maintainers (see
+  debian/control for maintainer names), and is placed under GPL v2 or
+  above.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.
 

=== modified file 'debian_bundle/arfile.py'
--- a/debian_bundle/arfile.py	2007-07-15 08:41:30 +0000
+++ b/debian_bundle/arfile.py	2007-07-15 14:47:13 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 # ArFile: a Python representation of ar (as in "man 1 ar") archives.
 # Copyright (C) 2007    Stefano Zacchiroli  <zack at debian.org>
 # Copyright (C) 2007    Filippo Giunchedi   <filippo at debian.org>

=== modified file 'debian_bundle/debtags.py'
--- a/debian_bundle/debtags.py	2007-02-11 21:46:58 +0000
+++ b/debian_bundle/debtags.py	2007-07-15 14:47:13 +0000
@@ -1,22 +1,19 @@
-#
+
 # debtags.py -- Access and manipulate Debtags information
-#
-# Copyright (C) 2006  Enrico Zini <enrico at enricozini.org>
-# 
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# Copyright (C) 2006-2007  Enrico Zini <enrico at enricozini.org>
+#
+# 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
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 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/>.
 
 import math, re, cPickle