about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-01-21 02:54:52 +0100
committerMichael Biebl <biebl@debian.org>2016-01-21 18:08:44 +0100
commit1fdcac97ccb3da3148647efa987119c276b5c016 (patch)
tree2e0ebcc5a31d7527e577205eba21a8a1aae329fa /debian
parent4e5df18ec3fd758ae0798383464ae9779070d46f (diff)
Update debian/copyright
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/copyright29
2 files changed, 33 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 58f2ba49..0d6261cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.1.90-2) UNRELEASED; urgency=medium
+
+  * Update debian/copyright.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 21 Jan 2016 18:08:37 +0100
+
 network-manager (1.1.90-1) experimental; urgency=medium
 
   * New upstream release (1.2 beta1).
diff --git a/debian/copyright b/debian/copyright
index 87573bfb..71d773a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,24 @@ Upstream-Name: NetworkManager
 Source: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/
 
 Files: *
-Copyright: 2004 - 2012 Red Hat, Inc.
+Copyright: 2004 - 2014 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
 License: GPL-2+
 
 Files: libnm-util/*
        libnm-glib/*
-Copyright: 2005 - 2012 Red Hat, Inc.
+       libnm-core/*
+       libnm/*
+Copyright: 2005 - 2014 Red Hat, Inc.
            2005 - 2009 Novell, Inc.
 License: LGPL-2+
 
+Files: src/systemd/*
+Copyright: 2013 - 2015 Tom Gundersen
+           2014 Susant Sahani
+           2014 - 2015 Intel Corporation. All rights reserved.
+License: LGPL-2.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
@@ -47,3 +55,20 @@ License: LGPL-2+
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in "/usr/share/common-licenses/LGPL-2".
 
+License: LGPL-2.1+
+ 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.1 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.1".
+