[DRE-commits] [SCM] ruby-bluecloth.git branch, master, updated. upstream/2.1.0-5-gea0f053

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit b16b35758aef5bbdc3d103e6056fe333b3626e6f
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Aug 2 15:18:32 2011 +0200

    update copyright information

diff --git a/debian/copyright b/debian/copyright
index 2de88c6..fd988b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,40 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
 Upstream-Name: bluecloth
-Source: FIXME (URL where source can be downloaded)
+Source: http://deveiate.org/projects/BlueCloth/
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-License: GPL-2+
- 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.
+Copyright: Copyright (c) 2004-2011, Michael Granger
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: Copyright 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: BSD-3-clause
+
+License: BSD-3-clause
+ All rights reserved.
  .
- 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.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-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.
+ .
+ * Neither the name of the author/s, nor the names of the project's
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
 
-Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]

-- 
ruby-bluecloth.git