[Python-modules-commits] r21214 - in packages/ipython/trunk/debian (changelog rules)

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

    Date: Saturday, April 14, 2012 @ 13:40:30
  Author: jtaylor-guest
Revision: 21214

remove build directory in clean and use it as HOME

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

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-04-14 13:40:20 UTC (rev 21213)
+++ packages/ipython/trunk/debian/changelog	2012-04-14 13:40:30 UTC (rev 21214)
@@ -4,9 +4,9 @@
     Commit bbec0404b8e51a55a16e516d61465896b368151
   * ipython-notebook: depend on libjs-mathjax instead of recommending.
     mathjax can't be securely served from cloudfront.
-  * debian/rules: run python3 setup.py clean
+  * debian/rules: delete build directory in clean
   * remove transitional ipython-parallel package
-  * set HOME to debian/tmp for doc build and tests (Closes: #665224) 
+  * set HOME to build folder for doc build and tests (Closes: #665224) 
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 05 Apr 2012 18:51:45 +0200
 

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2012-04-14 13:40:20 UTC (rev 21213)
+++ packages/ipython/trunk/debian/rules	2012-04-14 13:40:30 UTC (rev 21214)
@@ -14,25 +14,22 @@
 	rm -f test_hist.sqlite
 	if cd $(CURDIR)/docs; then $(MAKE) clean; fi
 	dh_auto_clean
-	set -e && for pyvers in $(PY3VERS); do \
-	  $$pyvers setup.py clean -a; \
-	done
+	rm -rf $(CURDIR)/build
 
 override_dh_auto_build:
-	mkdir -p $(CURDIR)/debian/tmp
 	dh_auto_build -- --executable '/usr/bin/env python'
 	set -e && for pyvers in $(PY3VERS); do \
 	  $$pyvers setup.py build --executable '/usr/bin/env python3'; \
 	done
 ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
-	HOME=$(CURDIR)/debian/tmp PYTHONPATH=$(CURDIR) $(MAKE) -C $(CURDIR)/docs html
+	HOME=$(CURDIR)/build PYTHONPATH=$(CURDIR) $(MAKE) -C $(CURDIR)/docs html
 endif
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# IPython.frontend requires X
 	set -e && for pyvers in $(PYVERS); do \
-	  LC_ALL=C.UTF-8 HOME=$(CURDIR)/debian/tmp \
+	  LC_ALL=C.UTF-8 HOME=$(CURDIR)/build \
 	  PATH=$(CURDIR)/IPython/scripts/:$(PATH) PYTHONPATH=$(CURDIR) \
 	  xvfb-run -s "-screen 0 1280x1024x24 -noreset" \
 	  python$$pyvers $(CURDIR)/IPython/scripts/iptest -v -e test_not_writable_ipdir; \