r513 - devmapper/trunk/debian

[Bastian Blank]

Author: waldi
Date: Wed Jan  2 14:22:24 2008
New Revision: 513

Log:
* debian/changelog: Update.
* debian/copyright: Fix.


Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/debian/copyright

Modified: devmapper/trunk/debian/changelog
==============================================================================
--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Wed Jan  2 14:22:24 2008
@@ -7,6 +7,7 @@
   * Cleanup udeb relations. (closes: #419604)
   * Fix pkgconfig file for static linking. (closes: #390243)
   * Supply proper --host and --build args to configure. (closes: #451136)
+  * Fix copyright file.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 02 Jan 2008 14:06:25 +0000
 

Modified: devmapper/trunk/debian/copyright
==============================================================================
--- devmapper/trunk/debian/copyright	(original)
+++ devmapper/trunk/debian/copyright	Wed Jan  2 14:22:24 2008
@@ -8,16 +8,15 @@
 Copyright (C) 2001-2004 Sistina Software (UK) Limited.
 Copyright (C) 2004 Red Hat, Inc.
 
-device-mapper has portions licensed under the GPL, and other
-portions licensed under the LGPL.
+device-mapper has portions licensed under the GPLv2, and other
+portions licensed under the LGPLv2.1.
 
 
 The following license applies to dmsetup: 
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,8 +27,8 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian systems, the full text of the GPL can be found in
-/usr/share/common-licenses/GPL
+On Debian systems, the full text of the GPLv2 can be found in
+/usr/share/common-licenses/GPL-2.
 
 
 The following license applies to the device-mapper library (libdevmapper),
@@ -37,8 +36,7 @@
 
 This library 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.
+License version 2.1 as published by the Free Software Foundation.
                                                                                 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -49,6 +47,6 @@
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-The full text of the LGPL can be found in
-/usr/share/common-licenses/LGPL
+On Debian systems, the full text of the LGPLv2.1 can be found in
+/usr/share/common-licenses/LGPL-2.1.