[Python-modules-commits] r16685 - in packages/ipython/trunk/debian (changelog control copyright)

[jtaylor-guest at users.alioth.debian.org]

    Date: Thursday, April 21, 2011 @ 15:32:21
  Author: jtaylor-guest
Revision: 16685

wrap-and-sort debian/

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/copyright

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2011-04-21 15:30:08 UTC (rev 16684)
+++ packages/ipython/trunk/debian/changelog	2011-04-21 15:32:21 UTC (rev 16685)
@@ -5,6 +5,7 @@
   * removed Bernd Zeimetz <bzed at debian.org> from uploaders
     thank you for your work
   * Use environment python interpreter. Closes: #547003
+  * wrap-and-sort debian/
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 21 Apr 2011 14:54:20 +0200
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2011-04-21 15:30:08 UTC (rev 16684)
+++ packages/ipython/trunk/debian/control	2011-04-21 15:32:21 UTC (rev 16685)
@@ -2,9 +2,18 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Stephan Peijnik <debian at sp.or.at>, Julian Taylor <jtaylor.debian at googlemail.com>
+Uploaders: Stephan Peijnik <debian at sp.or.at>,
+           Julian Taylor <jtaylor.debian at googlemail.com>
 Build-Depends: debhelper (>= 7.3.13), python, quilt (>= 0.46-7~)
-Build-Depends-Indep: python-sphinx, python-pygments, python-foolscap, python-openssl (>= 0.6), python-nose, python-twisted-core, python-zope.interface, python-pexpect, python (>= 2.5) | python-ctypes
+Build-Depends-Indep: python (>= 2.5) | python-ctypes,
+                     python-foolscap,
+                     python-nose,
+                     python-openssl (>= 0.6),
+                     python-pexpect,
+                     python-pygments,
+                     python-sphinx,
+                     python-twisted-core,
+                     python-zope.interface
 Homepage: http://ipython.scipy.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/ipython/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/ipython/trunk/
@@ -13,11 +22,23 @@
 
 Package: ipython
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pexpect
-Conflicts: python2.3-ipython, python2.4-ipython, ipython-common
-Replaces: python2.3-ipython, python2.4-ipython, ipython-common
-Suggests: python-profiler, python-numpy, python-matplotlib, libjs-jquery, python-gobject, python-gtk2, python-qt3 | python-qt4
-Recommends: python-wxgtk2.8, global, python-openssl (>= 0.6), python (>= 2.5) | python-ctypes, python-foolscap, python-zope.interface, python-twisted-core
+Depends: python-pexpect, ${misc:Depends}, ${python:Depends}
+Conflicts: ipython-common, python2.3-ipython, python2.4-ipython
+Replaces: ipython-common, python2.3-ipython, python2.4-ipython
+Suggests: libjs-jquery,
+          python-gobject,
+          python-gtk2,
+          python-matplotlib,
+          python-numpy,
+          python-profiler,
+          python-qt3 | python-qt4
+Recommends: global,
+            python (>= 2.5) | python-ctypes,
+            python-foolscap,
+            python-openssl (>= 0.6),
+            python-twisted-core,
+            python-wxgtk2.8,
+            python-zope.interface
 Breaks: ${python:Breaks}
 Description: enhanced interactive Python shell
  IPython can be used as a replacement for the standard Python shell,

Modified: packages/ipython/trunk/debian/copyright
===================================================================
--- packages/ipython/trunk/debian/copyright	2011-04-21 15:30:08 UTC (rev 16684)
+++ packages/ipython/trunk/debian/copyright	2011-04-21 15:32:21 UTC (rev 16685)
@@ -117,7 +117,7 @@
 alone or in any derivative version, provided, however, that PSF's
 License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version 
+Reserved" are retained in Python alone or in any derivative version
 prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
@@ -235,4 +235,3 @@
 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.
-