diff options
| author | David Sommerseth <davids@redhat.com> | 2009-08-11 11:34:21 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2009-08-11 11:34:21 +0200 |
| commit | eb08fd406370a81172d7fdd0663233a5f140b784 (patch) | |
| tree | c50e19f2b873441672b20a7e339c176d9a4a7cbf /debian/copyright | |
| parent | 39cbdfb56e80cabbd67754d8d77f781e14eaa3da (diff) | |
| parent | 3165a97a06f891622b913714bc4f8ca54565f9cc (diff) | |
| download | python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.tar.gz python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.tar.xz python-dmidecode-eb08fd406370a81172d7fdd0663233a5f140b784.zip | |
Merge commit 'nima/xml'
Conflicts:
debian/changelog
Had the same changelog entry in both xml and master
branch, with a minor wording difference. Removed the
duplicate and merged in the changelog entries from the
XML branch
src/dmidecode.c
Merge process got confused by some functions which was not
changed. Removed the code coming from the master branch and
let the XML be the base.
src/setup-dbg.py
src/setup.py
In the XML branch, the version of the python-dmidecode is
now a function which retrieves the version number from
src/version.h. Merged in this feature to master as well.
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/debian/copyright b/debian/copyright index 2515d56..2a3c869 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,13 +13,13 @@ It was downloaded from http://projects.autonomy.net.au/dmidecode/ Upstream Author: Nima Talebi <nima@autonomy.net.au> The Debian packaging is © 2008, Nima Talebi <nima@it.net.au> and is licensed -under the GPL, see `/usr/share/common-licenses/GPL-3'. +under the GPL, see `/usr/share/common-licenses/GPL-2'. License: - GPLv3 - The python-dmidecode packages is available under the terms of + GPLv2 - The python-dmidecode packages is available under the terms of the GNU General Public license version 3. On Debian systems, the complete text of the GNU General Public License can be found in - `/usr/share/common-licenses/GPL-3'. + `/usr/share/common-licenses/GPL-2'. DMIDecode @@ -36,7 +36,8 @@ Copyrights ========== © 2000-2002 Alan Cox <alan@redhat.com> © 2000-2008 Jean Delvare <khali@linux-fr.org> - © 2007-2009Nima Talebi <nima@it.net.au> + © 2007-2009 Nima Talebi <nima@it.net.au> + © 2009 David Sommerseth <davids@redhat.com> License: This program is free software; you can redistribute it and/or modify |