[Python-modules-commits] r31057 - in packages/deap/trunk/debian (changelog control)

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

    Date: Wednesday, October 15, 2014 @ 09:04:33
  Author: danstender-guest
Revision: 31057

added Conflicts: python-deap-doc to description of deap-doc

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

Modified: packages/deap/trunk/debian/changelog
===================================================================
--- packages/deap/trunk/debian/changelog	2014-10-14 19:33:26 UTC (rev 31056)
+++ packages/deap/trunk/debian/changelog	2014-10-15 09:04:33 UTC (rev 31057)
@@ -1,3 +1,10 @@
+deap (1.0.1-4) UNRELEASED; urgency=medium
+
+  * Added Conflicts: python-deap-doc to description of deap-doc
+    Closes: #765440).
+
+ -- Daniel Stender <debian at danielstender.com>  Wed, 15 Oct 2014 10:59:32 +0200
+
 deap (1.0.1-3) unstable; urgency=medium
 
   * deb/copyright: added licenses for doc/_static/sidebar.js and

Modified: packages/deap/trunk/debian/control
===================================================================
--- packages/deap/trunk/debian/control	2014-10-14 19:33:26 UTC (rev 31056)
+++ packages/deap/trunk/debian/control	2014-10-15 09:04:33 UTC (rev 31057)
@@ -66,6 +66,8 @@
 Recommends:
  python-deap,
  python3-deap
+Conflicts:
+ python-deap-doc
 Description: Distributed Evolutionary Algorithms in Python (docs)
  DEAP is a novel evolutionary computation framework for rapid prototyping and
  testing of ideas. It seeks to make algorithms explicit and data structures