[DRE-commits] [SCM] ruby-googlecharts.git branch, master, updated. upstream/1.6.8-12-g3a5b63e

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2539d715aedc4ce29bb928c7dbc0f332cd9307ba
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue May 8 10:47:37 2012 +0200

    update copyright according to DEP-5

diff --git a/debian/copyright b/debian/copyright
index 27ac3b7..174e97a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,35 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: googlecharts
-Source: FIXME <http://example.com/>
+Source: http://googlecharts.rubyforge.org/
+Disclaimer: 
+ This package is not part of Debian because it is in contrib. It is in
+ contrib because it relies on an outside source (google.com) to be useful.
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- 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.
- .
- 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.
- .
- 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
- .
- 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'.
+Copyright: 2007 Matt Aimonetti <mattaimonetti at gmail.com>
+License: Expat
 
 Files: debian/*
 Copyright: 2012 Cédric Boutillier <cedric.boutillier at gmail.com>
-License:
- [LICENSE TEXT]
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE 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.
+

-- 
ruby-googlecharts.git