summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-02-19 17:35:08 -0400
committerJoey Hess <joey@kitenet.net>2011-02-19 17:35:08 -0400
commitda4a447c4fda5972cd486c3d6e342476429b2733 (patch)
treeff925eb08d1047fbb55e9a33ffd70f73f8ee3497
parentd85a95af34ba2cca2436f18e87a4a49154e170a5 (diff)
downloadmoreutils-da4a447c4fda5972cd486c3d6e342476429b2733.tar.gz
dep5 update
-rw-r--r--debian/copyright30
1 files changed, 22 insertions, 8 deletions
diff --git a/debian/copyright b/debian/copyright
index feccf50..405fae1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,15 +11,10 @@ License: GPL-2+
Files: sponge.*
Copyright: 2006 Tollef Fog Heen
-Comment:
- Name and concept by Colin Watson.
License: GPL-2
Files: ifdata.c
Copyright: 2002 Benjamin BAYART
-Comment:
- It was originally called ifcfg and has a web page at
- http://edgard.dyn.fdn.fr/developpements/ifcfg.shtml
License: GPL-2+
Files: pee.c
@@ -32,7 +27,7 @@ License: GPL-2+
Files: mispipe.c
Copyright: 2004 Nathanael Nerode
-License: GPL-2+ | MIT
+License: GPL-2+ or Expat
Files: lckdo.c lckdo.docbook
Copyright: Michael Tokarev
@@ -51,10 +46,29 @@ Files: physmem.c
Copyright: 2000, 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
License: GPL-2+
-License: GPL-2+
+License: GPL-2
The full text of the GPL is distributed as COPYING in moreutils's source,
and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
-License: GPL-2
+License: GPL-2+
The full text of the GPL is distributed as COPYING in moreutils's source,
and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
+
+License: Expat
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.