Merge branch 'stable'

[gnulib.git] / debian / clscan / copyright.in

diff --git a/debian/clscan/copyright.in b/debian/clscan/copyright.in
index f2920f0..dc87d7b 100644 (file)
--- a/debian/clscan/copyright.in
+++ b/debian/clscan/copyright.in
@@ -1,7 +1,7 @@
 This package was debianized by Daniel Baumann <daniel@debian.org> on
 Thu,  1 Jun 2006 00:00:00 +0200.
 
-It was downloaded from <http://www.gnu.org/software/gnulib/>.
+It was downloaded from <git://git.savannah.gnu.org/gnulib.git>.
 
 > The files in here are mostly copyright (C) Free Software Foundation, and
 > are under assorted licenses.  Mostly, but not entirely, GPL.
@@ -20,15 +20,30 @@ It was downloaded from <http://www.gnu.org/software/gnulib/>.
 > copy of maintain.texi in doc/ has a verbatim-copying license, and
 > doc/standards.texi and make-stds.texi are GFDL.
 
-On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file,
-the GNU Lesser General Public License in /usr/share/common-licenses/LGPL,
-and the GNU Free Document License in /usr/share/common-licenses/GFDL.
-
-The Debian packaging is Copyright 2006-2008, Daniel Baumann <daniel@debian.org>
-and Copyright 2009 Ian Beckwith <ianb@debian.org>, and is licensed
-under the GPL-2, see `/usr/share/common-licenses/GPL-2'.
-
 Detailed copyright information follows, see debian/clscan/README
 in the gnulib source package for information on updating this.
 
+Files: debian/*
+Copyright: 2006-2008, Daniel Baumann <daniel@debian.org> /  2009-2011 Ian Beckwith <ianb@debian.org>
+License: GPL-2
+
+Files: modules/*
+Copyright: 2002-2007 Free Software Foundation, Inc.
+License: other
+  From modules/README:
+  > All the files in this directory are distributed under the following copyright:
+  >
+  > Copyright (C) 2002-2007 Free Software Foundation, Inc.
+  > Copying and distribution of this file, with or without modification,
+  > in any medium, are permitted without royalty provided the copyright
+  > notice and this notice are preserved.
+  From modules/COPYING:
+  > The files in this directory describe the gnulib modules.
+  > The following copyright notice applies to each of these
+  > description files.
+  >
+  > Copyright (C) 2006 Free Software Foundation, Inc.
+  > This file is free software; the Free Software Foundation
+  > gives unlimited permission to copy and/or distribute it,
+  > with or without modifications, as long as this notice is preserved.
+