[DRE-commits] [SCM] ruby-gnuplot.git branch, master, updated. upstream/2.3.6-14-gbb5f0df

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 69f13f1e6b724da3962cfea9e53927df2d5075bb
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Jun 11 00:07:01 2012 +0200

    Update copyright to DEP-5 copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index ec83358..244712b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,30 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ruby_gnuplot
 Source: https://github.com/rdp/ruby_gnuplot
 
 Files: *
 Copyright: Copyright (c) 2004-2005, Gordon James Miller (gmiller at bittwiddlers.com)
-License: BSD
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: Copyright 2011 Lucas Nussbaum <lucas at debian.org>
+License: BSD-3-clause
+
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
- 
+ . 
      * Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
- 
+ .
      * 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 BitTwiddlers, Inc. nor the names of its
        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
@@ -30,6 +36,3 @@ License: BSD
  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 2011 Lucas Nussbaum <lucas at debian.org>
-License: BSD

-- 
ruby-gnuplot.git