[python-pyqtgraph] 01/02: Imported Debian patch 0.9.8-2

Tue Aug 26 12:30:38 UTC 2014

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository python-pyqtgraph.

commit 5ab1efd12cdc08a22f38bd1b1cab4272548027a7
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Aug 1 15:18:08 2014 +0200

    Imported Debian patch 0.9.8-2
---
 debian/changelog |  8 ++++++++
 debian/control   | 19 ++++++++++++-------
 debian/copyright | 48 ++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6c7fe9..4bc426d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-pyqtgraph (0.9.8-2) unstable; urgency=medium
+
+  * Add some requied runtime dependencies
+    (mostly taken from binwalk documentation).
+  * Refactor debian/copyright
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 01 Aug 2014 15:18:08 +0200
+
 python-pyqtgraph (0.9.8-1) unstable; urgency=low
 
   [ Gianfranco Costamagna ]
diff --git a/debian/control b/debian/control
index 90ace31..e3e3cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,23 @@ Uploaders: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
 Section: python
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), dh-python, python
+Build-Depends: debhelper (>= 9), python
 Homepage: http://luke.campagnola.me/code/pyqtgraph
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/python-pyqtgraph.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/python-pyqtgraph.git
 
 Package: python-pyqtgraph
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-qt4 | python-pyside, python-scipy, python-numpy
-Recommends: python-opengl, python-qt4-gl
+Depends: ${python:Depends}, ${misc:Depends},
+ python-numpy,
+ python-opengl,
+ python-pyside,
+ python-qt4,
+ python-qt4-gl,
+ python-scipy,
 Description: Scientific Graphics and GUI Library for Python
- PyQtGraph is a pure-python graphics and GUI library built on PyQt4 and numpy. 
- It is intended for use in mathematics / scientific / engineering applications. 
- Despite being written entirely in python, the library is very fast due to its 
- heavy leverage of numpy for number crunching and Qt's GraphicsView framework 
+ PyQtGraph is a pure-python graphics and GUI library built on PyQt4 and numpy.
+ It is intended for use in mathematics / scientific / engineering applications.
+ Despite being written entirely in Python, the library is very fast due to its
+ heavy leverage of numpy for number crunching and Qt's GraphicsView framework
  for fast display.
diff --git a/debian/copyright b/debian/copyright
index 22791ae..4827084 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,46 @@
-Copyright (c) 2012  University of North Carolina at Chapel Hill
-Luke Campagnola    ('luke.campagnola@%s.com' % 'gmail')
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://www.pyqtgraph.org
+Upstream-Contact: Luke Campagnola    ('luke.campagnola@%s.com' % 'gmail')
 
-The MIT License
-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:
+Files: *
+Copyright:
+  2012  University of North Carolina at Chapel Hill
+        Luke Campagnola    ('luke.campagnola@%s.com' % 'gmail')
+License: MIT
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Files: pyqtgraph/PIL_Fix/Image.py-1.6
+Copyright:
+  1997-2006 by Secret Labs AB.  All rights reserved.
+  1995-2006 by Fredrik Lundh.
+License: PIL
 
-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.
+Files: pyqtgraph/PIL_Fix/Image.py-1.7
+Copyright:
+  1997-2009 by Secret Labs AB.  All rights reserved.
+  1995-2009 by Fredrik Lundh.
+License: PIL
 
+Files: debian/*
+Copyright:
+  2014 Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+License: MIT
+
+Files: pyqtgraph/ordereddict.py
+Copyright:
+  2009 Raymond Hettinger
+License: MIT
+
+License: PIL
+ By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions:
+ .
+ Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Secret Labs AB or the author not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.
+ .
+ SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+License: MIT
+ The MIT License
+ 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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-pyqtgraph.git

