X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Frules;h=f38a7dc148abaeaeae0b954bd162b0d489bb6134;hb=b9bca788919819024b0486e6bfecc0f1bfcacee7;hp=0c37cb6e185619eaf9c142ee6dc84494d6f1909b;hpb=bf2e44f60d8dc309f7724c0b6841d4edd090968d;p=openstack-build%2Fcinder-build.git

diff --git a/debian/rules b/debian/rules
index 0c37cb6e1..f38a7dc14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//')
-export OSLO_PACKAGE_VERSION=$(VERSION)
-
 %:
 	dh $@  --with python2
 
@@ -15,7 +11,7 @@ get-orig-source:
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	PYTHONPATH=$(CURDIR) bash run_tests.sh -N
+	./run_tests.sh -N -P
 endif
 
 override_dh_install:
@@ -23,3 +19,7 @@ override_dh_install:
 
 override_dh_fixperms:
 	dh_fixperms -Xcinder_tgt.conf
+
+override_dh_clean:
+	# temporary workaround for d2to1 wonkyness
+	dh_clean -Xsetup.cfg