[Pkg-javascript-commits] [SCM] flot branch, master, updated. debian/0.6-1-33-g9759e10

[Marcelo Jorge Vieira]

The following commit has been merged in the master branch:
commit c84879fb62f6e7ccefb98be4dffc78d208ebf87f
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Wed May 29 13:34:19 2013 -0300

    Updating copyright file

diff --git a/debian/copyright b/debian/copyright
index 7856e60..0cde996 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,29 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: flot
-Upstream-Maintainer: Ole Laursen <olau at iola.dk>
-Upstream-Source: http://code.google.com/p/flot/downloads/list
+Upstream-Contact: Ole Laursen <olau at iola.dk>
+Source: https://github.com/flot/flot
 
 Files: *
-Copyright: (c) 2007, IOLA
+Copyright: 2007-2013 IOLA and Ole Laursen
 License: MIT
 
+Files: examples/axes-time-zones/tz/*
+Copyright: 2006 Arthur David Olson
+License: public-domain
+
+Files: examples/axes-time-zones/date.js
+Copyright: 2010 Matthew Eernisse (mde at fleegix.org) and Open Source Applications Foundation
+License: Apache-2.0
+
 Files: debian/*
 Copyright: (c) 2009, Marcelo Jorge Vieira (metal) <metal at alucinados.com>
 License: MIT
 
+License: Apache-2.0
+  On Debian GNU/Linux systems, the complete text of the Apache License
+  can be found in `/usr/share/common-licenses/Apache-2.0'
 
 License: MIT
-
   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
@@ -22,10 +32,10 @@ License: MIT
   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
@@ -34,3 +44,29 @@ License: MIT
   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.
+
+License: public-domain
+  This is free and unencumbered software released into the public domain.
+  .
+  Anyone is free to copy, modify, publish, use, compile, sell, or
+  distribute this software, either in source code form or as a compiled
+  binary, for any purpose, commercial or non-commercial, and by any
+  means.
+  .
+  In jurisdictions that recognize copyright laws, the author or authors
+  of this software dedicate any and all copyright interest in the
+  software to the public domain. We make this dedication for the benefit
+  of the public at large and to the detriment of our heirs and
+  successors. We intend this dedication to be an overt act of
+  relinquishment in perpetuity of all present and future rights to this
+  software under copyright law.
+  .
+  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 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.
+  .
+  For more information, please refer to <http://unlicense.org/>

-- 
flot