[Python-modules-commits] r19240 - in packages/ipython/trunk/debian (control rules)

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

    Date: Saturday, November 12, 2011 @ 17:58:06
  Author: jtaylor-guest
Revision: 19240

depend on python-configobj, don't install embedded copy (Closes: #555339)

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

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2011-11-12 17:57:59 UTC (rev 19239)
+++ packages/ipython/trunk/debian/control	2011-11-12 17:58:06 UTC (rev 19240)
@@ -25,7 +25,11 @@
 
 Package: ipython
 Architecture: all
-Depends: python-argparse, python-pexpect, ${misc:Depends}, ${python:Depends}
+Depends: python-argparse,
+         python-configobj,
+         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,

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2011-11-12 17:57:59 UTC (rev 19239)
+++ packages/ipython/trunk/debian/rules	2011-11-12 17:58:06 UTC (rev 19240)
@@ -29,6 +29,10 @@
 	dh_auto_install
 	# remove embedded arparse
 	find $(CURDIR)/debian/ipython/usr/ -name _argparse.py -delete
+	
+	# remove embedded configobj
+	find $(CURDIR)/debian/ipython/usr/ -name _configobj.py -delete
+	find $(CURDIR)/debian/ipython/usr/ -name _validate.py -delete
 
 	# remove test suite script
 	rm $(CURDIR)/debian/ipython/usr/bin/iptest