merge changes from l10n

[ikiwiki.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index b06d27f19f5c907c2461924cd0f6b22895c4c9d4..98feffc6f0c70fdb23382e5b7343f9acb12a5a66 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -140,6 +140,10 @@ Files: wmd.pm, getsource.pm
 Copyright: © 2009 William Uther
 License: GPL-2+
 
+Files: rsync.pm
+Copyright: © 2009 Amitai Schlair
+License: BSD-C2
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
@@ -164,3 +168,28 @@ License: GPL-2+
  118 Turnpike Rd., Southboro, MA 01772.
  .
  Republished with permission.
+
+Files: cvs.pm
+Copyright: © 2009 Amitai Schlair
+License: BSD-C2
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY IKIWIKI 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 FOUNDATION
+ 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.