summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt/__init__.py18
-rw-r--r--apt/cache.py2
-rw-r--r--apt/cdrom.py2
-rw-r--r--apt/debfile.py31
-rw-r--r--apt/package.py2
-rw-r--r--apt/progress/__init__.py4
-rw-r--r--apt/progress/gtk2.py2
-rw-r--r--aptsources/distinfo.py10
-rw-r--r--aptsources/distro.py4
-rw-r--r--aptsources/sourceslist.py12
-rw-r--r--debian/changelog1
-rw-r--r--debian/copyright58
12 files changed, 103 insertions, 43 deletions
diff --git a/apt/__init__.py b/apt/__init__.py
index e3cfacbe..ae2abbf2 100644
--- a/apt/__init__.py
+++ b/apt/__init__.py
@@ -1,3 +1,21 @@
+# Copyright (c) 2005-2009 Canonical
+#
+# Author: Michael Vogt <michael.vogt@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 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.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
# import the core of apt_pkg
import apt_pkg
import sys
diff --git a/apt/cache.py b/apt/cache.py
index a9430d6b..cc425ccb 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -1,6 +1,6 @@
# cache.py - apt cache abstraction
#
-# Copyright (c) 2005 Canonical
+# Copyright (c) 2005-2009 Canonical
#
# Author: Michael Vogt <michael.vogt@ubuntu.com>
#
diff --git a/apt/cdrom.py b/apt/cdrom.py
index 61250fc4..b52762ad 100644
--- a/apt/cdrom.py
+++ b/apt/cdrom.py
@@ -1,6 +1,6 @@
# cdrom.py - CDROM handling
#
-# Copyright (c) 2005 Canonical
+# Copyright (c) 2005-2009 Canonical
# Copyright (c) 2009 Julian Andres Klode <jak@debian.org>
#
# Author: Michael Vogt <michael.vogt@ubuntu.com>
diff --git a/apt/debfile.py b/apt/debfile.py
index c550d766..0406a250 100644
--- a/apt/debfile.py
+++ b/apt/debfile.py
@@ -1,24 +1,21 @@
-# Copyright (c) 2005-2007 Canonical
+# Copyright (c) 2005-2009 Canonical
#
-# AUTHOR:
-# Michael Vogt <mvo@ubuntu.com>
+# Author: Michael Vogt <michael.vogt@ubuntu.com>
#
-# This file is part of GDebi
+# 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.
#
-# GDebi 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.
-#
-# GDebi 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 GDebi; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
"""Classes for working with locally available Debian packages."""
from gettext import gettext as _
import os
diff --git a/apt/package.py b/apt/package.py
index 595cf8ec..9afe1674 100644
--- a/apt/package.py
+++ b/apt/package.py
@@ -1,6 +1,6 @@
# package.py - apt package abstraction
#
-# Copyright (c) 2005 Canonical
+# Copyright (c) 2005-2009 Canonical
#
# Author: Michael Vogt <michael.vogt@ubuntu.com>
#
diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py
index 51eb2426..769942ce 100644
--- a/apt/progress/__init__.py
+++ b/apt/progress/__init__.py
@@ -1,6 +1,6 @@
-# Progress.py - progress reporting classes
+# progress.py - progress reporting classes
#
-# Copyright (c) 2005 Canonical
+# Copyright (c) 2005-2009 Canonical
#
# Author: Michael Vogt <michael.vogt@ubuntu.com>
#
diff --git a/apt/progress/gtk2.py b/apt/progress/gtk2.py
index 435265d4..f872e34f 100644
--- a/apt/progress/gtk2.py
+++ b/apt/progress/gtk2.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (c) 2004-2005 Canonical
+# Copyright (c) 2004-2009 Canonical
#
# Authors: Michael Vogt <michael.vogt@ubuntu.com>
# Sebastian Heinlein <glatzor@ubuntu.com>
diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py
index 59fa7e02..ce44e48b 100644
--- a/aptsources/distinfo.py
+++ b/aptsources/distinfo.py
@@ -1,12 +1,10 @@
-#!/usr/bin/env python
-#
# distinfo.py - provide meta information for distro repositories
#
-# Copyright (c) 2005 Gustavo Noronha Silva
-# 2006-2007 Sebastian Heinlein
+# Copyright (c) 2005 Gustavo Noronha Silva <kov@debian.org>
+# Copyright (c) 2006-2007 Sebastian Heinlein <glatzor@ubuntu.com>
#
-# Author: Gustavo Noronha Silva <kov@debian.org>
-# Sebastian Heinlein <glatzor@ubuntu.com>
+# Authors: Gustavo Noronha Silva <kov@debian.org>
+# Sebastian Heinlein <glatzor@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
diff --git a/aptsources/distro.py b/aptsources/distro.py
index d81c6e4a..bbb8ba50 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -1,7 +1,7 @@
# distro.py - Provide a distro abstraction of the sources.list
#
-# Copyright (c) 2004-2007 Canonical Ltd.
-# 2006-2007 Sebastian Heinlein
+# Copyright (c) 2004-2009 Canonical Ltd.
+# Copyright (c) 2006-2007 Sebastian Heinlein
#
# Authors: Sebastian Heinlein <glatzor@ubuntu.com>
# Michael Vogt <mvo@debian.org>
diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py
index b1f00446..1dfd870f 100644
--- a/aptsources/sourceslist.py
+++ b/aptsources/sourceslist.py
@@ -1,12 +1,12 @@
# aptsource.py - Provide an abstraction of the sources.list
#
-# Copyright (c) 2004-2007 Canonical Ltd.
-# 2004 Michiel Sikkes
-# 2006-2007 Sebastian Heinlein
+# Copyright (c) 2004-2009 Canonical Ltd.
+# Copyright (c) 2004 Michiel Sikkes
+# Copyright (c) 2006-2007 Sebastian Heinlein
#
-# Author: Michiel Sikkes <michiel@eyesopened.nl>
-# Michael Vogt <mvo@debian.org>
-# Sebastian Heinlein <glatzor@ubuntu.com>
+# Authors: Michiel Sikkes <michiel@eyesopened.nl>
+# Michael Vogt <mvo@debian.org>
+# Sebastian Heinlein <glatzor@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
diff --git a/debian/changelog b/debian/changelog
index f51944f9..91ce7304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ python-apt (0.7.10~exp1) experimental; urgency=low
- Remove mdz from Uploaders (Closes: #521477), add myself.
- Update Standards-Version to 3.8.1
- Use ${binary:Version} instead of ${Source-Version}
+ * debian/copyright: Switch to machine-interpretable copyright
-- Julian Andres Klode <jak@debian.org> Wed, 01 Apr 2009 15:24:29 +0200
diff --git a/debian/copyright b/debian/copyright
index f8463185..8599328a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,53 @@
-APT is free software; you can redistribute them and/or modify them 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.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=443
-On Debian systems, a copy of the GNU General Public License can be
-found in /usr/share/common-licenses/GPL.
+Files: *
+Copyright: © 2004-2009 Canonical Ltd.
+License: GPL-2+
+
+Files: aptsources/*.py
+Copyright: © 2004-2009 Canonical Ltd.
+Copyright: © 2005 Gustavo Noronha Silva
+Copyright: © 2006-2007 Sebastian Heinlein
+License: GPL-2+
+
+Files: doc/source/*
+Copyright: © 2009 Julian Andres Klode <jak@debian.org>
+License: GPL-2+
+
+Files: utils/get_*.py
+Copyright: © 2006 Free Software Foundation Europe
+License: GPL-2+
+
+Files: po/*
+Copyright: © 2006 Canonical Ltd, and Rosetta Contributors 2006
+License: GPL-2+
+
+Files: po/de.po
+Copyright: © 2005 Michiel Sikkes <michiel@eyesopened.nl>
+License: GPL-2+
+
+Files: po/en_CA.po
+Copyright: © 2005 Adam Weinberger and the GNOME Foundation
+License: GPL-2+
+
+Files: po/fi.po
+Copyright: © 2005-2006 Timo Jyrinki
+License: GPL-2+
+
+Files: po/fr.po
+Copyright: © 2007 Hugues NAULET <hnaulet@gmail.com>
+License: GPL-2+
+
+Files: po/hu.po, po/lt.po, po/pt.po, po/ro.po, po/rw.po, po/sv.po, po/uk.po,
+ po/zh_HK.po
+Copyright: © 2005-2006 Free Software Foundation
+License: GPL-2+
+
+License: GPL-2+
+ APT is free software; you can redistribute them and/or modify them 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.
+ .
+ On Debian systems, a copy of the GNU General Public License can be
+ found in /usr/share/common-licenses/GPL-2.
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-16 06:05:52 +0000