[DRE-commits] [SCM] ruby-rubymail.git branch, master, updated. debian/1.0.0-1-2-g11dc0f7

[Per Andersson]

The following commit has been merged in the master branch:
commit 3ed7b562586dc149537f86ea45b9fc8ecabd3974
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Jun 28 13:47:06 2012 +0200

    debian/copyright: source is BSD licensed, updated

diff --git a/debian/changelog b/debian/changelog
index bdc67c2..5c8ddf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,9 +21,11 @@ ruby-rubymail (1.0.0-1) unstable; urgency=low
   * Add watch file.
   * Change doc-base section to Programming/Ruby.
   * Add patch for testing header params without order guarantee.
-  * debian/copyright: Change format to DEP5.
+  * debian/copyright:
+    - Change format to DEP5.
+    - Source is BSD licensed, updated accordingly.
 
- -- Per Andersson <avtobiff at gmail.com>  Tue, 19 Jun 2012 22:06:53 +0200
+ -- Per Andersson <avtobiff at gmail.com>  Thu, 28 Jun 2012 13:37:01 +0200
 
 librmail-ruby (0.17-1.1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 9d99bcc..a6597c3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,27 @@ Source: <http://rubyforge.org/projects/rubymail/>
 Files: *
 Copyright: 2001, 2002 Matt Armstrong <matt at lickey.com>
 License:
- Copyright (C) 2001, 2002 Matt Armstrong.  All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  .
- Permission is granted for use, copying, modification,
- distribution, and distribution of modified versions of this work
- as long as the above copyright notice is included.
+ 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. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: debian/*
 Copyright: 2002, 2003 Akira Yamada <akira at debian.org>

-- 
ruby-rubymail.git