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

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

    Date: Tuesday, November 22, 2011 @ 22:43:36
  Author: jtaylor-guest
Revision: 19425

remove obsolete Conflicts and Replaces

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

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2011-11-22 22:43:32 UTC (rev 19424)
+++ packages/ipython/trunk/debian/changelog	2011-11-22 22:43:36 UTC (rev 19425)
@@ -9,8 +9,9 @@
       dependency with ${sphinxdoc:Depends} and drop ipython-doc.links
   * remove empty directory from ipython
   * link duplicate images in ipython-doc
+  * remove obsolete Conflicts and Replaces
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 22 Nov 2011 22:59:46 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 22 Nov 2011 23:40:57 +0100
 
 ipython (0.11-1) experimental; urgency=low
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2011-11-22 22:43:32 UTC (rev 19424)
+++ packages/ipython/trunk/debian/control	2011-11-22 22:43:36 UTC (rev 19425)
@@ -39,8 +39,6 @@
          python-simplegeneric,
          ${misc:Depends},
          ${python:Depends}
-Conflicts: ipython-common, python2.3-ipython, python2.4-ipython
-Replaces: ipython-common, python2.3-ipython, python2.4-ipython
 Suggests: ipython-doc,
           ipython-parallel,
           ipython-qtconsole,
@@ -86,8 +84,6 @@
          python-zmq (>= 2.1.4),
          ${misc:Depends},
          ${python:Depends}
-Conflicts: ipython-common, python2.3-ipython, python2.4-ipython
-Replaces: ipython-common, python2.3-ipython, python2.4-ipython
 Description: enhanced interactive Python shell
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific