[SCM] pyepr branch, master, updated. upstream/0.5-8-gb017792

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 358a96736e2900c07e33ce0cb6bd07a11418ed02
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Fri Aug 12 20:12:16 2011 +0200

    Updated copyright file

diff --git a/debian/changelog b/debian/changelog
index cf15b8e..4eb34de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyepr (0.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated copyright file
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Fri, 12 Aug 2011 20:11:56 +0200
+
 pyepr (0.5-1) unstable; urgency=low
 
   * Initial release (Closes: #625997)
diff --git a/debian/copyright b/debian/copyright
index 989a03d..567060a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,3 +26,94 @@ License: GPL-3.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+Files: doc/sphinxext/ipython_console_highlighting.py
+Copyright: 2008-2010, IPython Development Team
+           2001-2007, Fernando Perez. <fernando.perez at colorado.edu>
+           2001, Janko Hauser <jhauser at zscout.de>
+           2001, Nathaniel Gray <n8gray at caltech.edu>
+License: Modified BSD License (also known as New or Revised BSD)
+ =============================
+  The IPython licensing terms
+ =============================
+ .
+ IPython is licensed under the terms of the Modified BSD License (also known as
+ New or Revised BSD), as follows:
+ .
+ Copyright (c) 2008-2010, IPython Development Team
+ Copyright (c) 2001-2007, Fernando Perez. <fernando.perez at colorado.edu>
+ Copyright (c) 2001, Janko Hauser <jhauser at zscout.de>
+ Copyright (c) 2001, Nathaniel Gray <n8gray at caltech.edu>
+ .
+ All rights reserved.
+ .
+ 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 IPython Development Team 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
+ 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.
+ .
+ About the IPython Development Team
+ ----------------------------------
+ .
+ Fernando Perez began IPython in 2001 based on code from Janko Hauser
+ <jhauser at zscout.de> and Nathaniel Gray <n8gray at caltech.edu>.  Fernando is still
+ the project lead.
+ .
+ The IPython Development Team is the set of all contributors to the IPython
+ project.  This includes all of the IPython subprojects. A full list with
+ details is kept in the documentation directory, in the file
+ ``about/credits.txt``.
+ .
+ The core team that coordinates development on GitHub can be found here:
+ http://github.com/ipython.  As of late 2010, it consists of:
+ .
+ * Brian E. Granger
+ * Jonathan March
+ * Evan Patterson
+ * Fernando Perez
+ * Min Ragan-Kelley
+ * Robert Kern
+ .
+ Our Copyright Policy
+ --------------------
+ .
+ IPython uses a shared copyright model. Each contributor maintains copyright
+ over their contributions to IPython. But, it is important to note that these
+ contributions are typically only changes to the repositories. Thus, the IPython
+ source code, in its entirety is not the copyright of any single person or
+ institution.  Instead, it is the collective copyright of the entire IPython
+ Development Team.  If individual contributors want to maintain a record of what
+ changes/contributions they have specific copyright on, they should indicate
+ their copyright in the commit message of the change, when they commit the
+ change to one of the IPython repositories.
+ .
+ With this in mind, the following banner should be used in any source code file
+ to indicate the copyright and license terms:
+ .
+ #-----------------------------------------------------------------------------
+ # Copyright (c) 2010, IPython Development Team.
+ #
+ # Distributed under the terms of the Modified BSD License.
+ #
+ # The full license is in the file COPYING.txt, distributed with this software.
+ #-----------------------------------------------------------------------------

-- 
Python ENVISAT Product Reader API