about summary refs log tree commit diff
path: root/debian/copyright
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-04-12 17:55:51 +0200
committerMichael Biebl <biebl@debian.org>2016-04-12 18:11:25 +0200
commitb4adde0877d40b57ebd79d1ac6167335f139e794 (patch)
tree772333c0da0399d56e67aca4e0ea92f647c9ed56 /debian/copyright
parent4ead62023a3b92903ae0f5642146ab605f7bf6d4 (diff)
Update debian/copyright
Add new section for documentation which is licensed under the GFDL.
Diffstat (limited to 'debian/copyright')
-rw-r--r--debian/copyright19
1 files changed, 17 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright
index 71d773a2..45449a81 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: NetworkManager
 Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/
 
 Files: *
-Copyright: 2004 - 2014 Red Hat, Inc.
+Copyright: 2004 - 2016 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
 License: GPL-2+
 
@@ -11,16 +11,23 @@ Files: libnm-util/*
        libnm-glib/*
        libnm-core/*
        libnm/*
-Copyright: 2005 - 2014 Red Hat, Inc.
+       shared/*
+Copyright: 2005 - 2016 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
 License: LGPL-2+
 
 Files: src/systemd/*
 Copyright: 2013 - 2015 Tom Gundersen
+           2010 - 2015 Lennart Poettering
            2014 Susant Sahani
            2014 - 2015 Intel Corporation. All rights reserved.
 License: LGPL-2.1+
 
+Files: doc/*
+       man/*
+Copyright: 2012 - 2016 The NetworkManager Authors
+License: GFDL-NIV-1.1+
+
 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
@@ -72,3 +79,11 @@ License: LGPL-2.1+
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in "/usr/share/common-licenses/LGPL-2.1".
 
+License: GFDL-NIV-1.1+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.1 or
+ any later version published by the Free Software Foundation; with no
+ Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.1 can be found in "/usr/share/common-licenses/GFDL".