[DRE-commits] [SCM] ruby-blankslate.git branch, master, updated. upstream/2.1.2.4-7-g8ee3f64

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 8ee3f648ca8e77ac02e9fff5968c995a66a9c4e1
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat Jan 7 00:33:56 2012 +0100

    use header of lib/blankslate.rb as license

diff --git a/debian/copyright b/debian/copyright
index 55ef9b4..f8df478 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,11 @@ Format: http://dep.debian.net/deps/dep5
 Upstream-Name: blankslate
 Source: https://github.com/masover/blankslate
 Comment: Code extracted from Builder (https://github.com/jimweirich/builder)
+ Builder's license is Expat.
 
 Files: *
 Copyright: 2004, 2006 by Jim Weirich (jim at weirichhouse.org).
-License: Expat
+License: other
 
 Files: debian/*
 Copyright: 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
@@ -28,7 +29,12 @@ License: Expat
  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.  Permission is granted for use, copying, modification, distribution,
+ SOFTWARE. 
+
+License: other
+ All right reserved.
+ .
+ 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.
 

-- 
ruby-blankslate.git