diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/copyright | 106 |
2 files changed, 51 insertions, 59 deletions
diff --git a/debian/changelog b/debian/changelog index b8a2ad5f..02ab0821 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,10 @@ network-manager (0.9.4.0-1) UNRELEASED; urgency=low * debian/patches/10-format-security.patch: Fix format string vulnerability by using g_set_error_literal(). * Refresh patches. + * Rewrite and update debian/copyright using the machine-readable copyright + format 1.0. (Closes: #652882) - -- Michael Biebl <biebl@debian.org> Sat, 24 Mar 2012 13:21:42 +0100 + -- Michael Biebl <biebl@debian.org> Sat, 24 Mar 2012 13:36:27 +0100 network-manager (0.9.2.0-2) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 58e38447..87573bfb 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,59 +1,49 @@ -This package was debianized by Thom May <thom@debian.org> on -Sun, 3 Oct 2004 11:54:56 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: NetworkManager +Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/ + +Files: * +Copyright: 2004 - 2012 Red Hat, Inc. + 2005 - 2009 Novell, Inc. +License: GPL-2+ + +Files: libnm-util/* + libnm-glib/* +Copyright: 2005 - 2012 Red Hat, Inc. + 2005 - 2009 Novell, Inc. +License: LGPL-2+ + +License: GPL-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 + 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 program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: LGPL-2+ + This package 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 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 + Lesser 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/>. + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2". -It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/NetworkManager - - -All files if not specified otherwise are licensed under the following terms: - -Copyright: - - Copyright (C) 2006 - 2009 Red Hat, Inc. - Copyright (C) 2006 - 2009 Novell, Inc. - -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; 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., - 51 Franklin Street, 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'. - - - -libnm-util/*.[ch], libnm-glib/*.[ch]: - -Copyright: - - Copyright (C) 2005 - 2009 Red Hat, Inc. - Copyright (C) 2005 - 2009 Novell, Inc. - -License: - - 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 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 - 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 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 Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL'. |