lintian fixes

1 files changed, 31 insertions, 4 deletions

diff --git a/debian/copyright b/debian/copyright
index 3ddba59f4..017f9b85e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Files: Utility/Mounts.hsc
 Copyright: Volker Wysk <hsss@volker-wysk.de>
 License: LGPL-2.1+
  The full text of version 2.1 of the LGPL is distributed as doc/LGPL
- in this package's source, or in /usr/share/common-licences/LGPL-2.1
+ in this package's source, or in /usr/share/common-licenses/LGPL-2.1
  on Debian systems.
 
 Files: Utility/libmounts.c
@@ -20,9 +20,36 @@ Copyright: 1980, 1989, 1993, 1994 The Regents of the University of California
            2001 David Rufino <daverufino@btinternet.com>
            2012 Joey Hess <joey@kitenet.net>
 License: BSD-3-clause
- The full text of the 3 clause BSD license is distributed inside
- Utility/libmounts.c in this package's source, or in
- /usr/share/common-licenses/BSD on Debian systems.
+ * Copyright (c) 1980, 1989, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2001
+ *      David Rufino <daverufino@btinternet.com>
+ * Copyright 2012
+ *      Joey Hess <joey@kitenet.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
 
 Files: doc/logo* */favicon.ico
 Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>