[SCM] rtkit/master: Update debian/copyright.

Tue Nov 2 20:55:57 UTC 2010

The following commit has been merged in the master branch:
commit 71ff39b479f601b13220f54fd7fb800ee9dd14c8
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Nov 2 21:55:10 2010 +0100

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index bef54a9..328c48f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,71 +1,82 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: RealtimeKit
-Maintainer: Lennart Poettering <lennart at poettering.net>
-Source: http://0pointer.de/public
-
-Files: rtkit.*
-Copyright: Copyright 2009, Lennart Poettering <lennart at poettering.net>
-Copyright: Copyright 2010 David Henningsson <diwic at ubuntu.com>
-License: BSD-like
- 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.
-Files: sd-daemon.*
-Copyright: 2010, Lennart Poettering <lennart at poettering.net>
-License: BSD-like
- 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.
-Files: rtkitctl.c
-Copyright: Copyright 2009 Lennart Poettering
-License: GPL-3+
- On Debian systems the full text of the GNU General Public License can
- be found in the `/usr/share/common-licenses/GPL-3' file.
-Files: rtkit-daemon.c
-Copyright: Copyright 2010 Maarten Lankhorst
-Copyright: Copyright 2009 Lennart Poettering
-License: GPL-3+
- On Debian systems the full text of the GNU General Public License can
- be found in the `/usr/share/common-licenses/GPL-3' file.
-Files: rtkit-test.c
-Copyright: Copyright 2009 Lennart Poettering
-License: GPL-3+
- On Debian systems the full text of the GNU General Public License can
- be found in the `/usr/share/common-licenses/GPL-3' file.
-Files: debian/*
-Copyright: 2010, Luke Yelavich <themuso at ubuntu.com>
-License: GPL-3
- On Debian systems the full text of the GNU General Public License can
- be found in the `/usr/share/common-licenses/GPL-3' file.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: RealtimeKit
+Maintainer: Lennart Poettering <lennart at poettering.net>
+Source: http://0pointer.de/public
+
+Files: ./rtkit.*
+Copyright:
+ 2009 Lennart Poettering <lennart at poettering.net>
+ 2010 David Henningsson <diwic at ubuntu.com>
+License: other
+ 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.
+
+Files: ./sd-daemon.*
+Copyright: 2010 Lennart Poettering <lennart at poettering.net>
+License: other
+ 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.
+
+Files: ./rtkitctl.c, ./rtkit-test.c
+Copyright: 2009 Lennart Poettering
+License: GPL-3+
+
+Files: ./rtkit-daemon.c
+Copyright:
+ 2010 Maarten Lankhorst
+ 2009 Lennart Poettering
+License: GPL-3+
+
+Files: ./debian/*
+Copyright: 2010 Luke Yelavich <themuso at ubuntu.com>
+License: GPL-3
+
+License: GPL-3
+ 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This program 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 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/>.
+X-Comment: On Debian systems the full text of the GNU General Public License can
+ be found in the `/usr/share/common-licenses/GPL-3' file.

-- 
rtkit packaging

