Code Review
/
openstack-build
/
cinder-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update DEB-specs to 2013.2 version
[openstack-build/cinder-build.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index 0c37cb6e185619eaf9c142ee6dc84494d6f1909b..d4ef58857951e1e532f446879a6b722d7fe70fb6 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-3,10
+3,6
@@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# 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
%:
dh $@ --with python2
@@
-15,7
+11,7
@@
get-orig-source:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
- PYTHONPATH=$(CURDIR) bash run_tests.sh -N
+ testr init && testr run
endif
override_dh_install:
endif
override_dh_install:
@@
-23,3
+19,7
@@
override_dh_install:
override_dh_fixperms:
dh_fixperms -Xcinder_tgt.conf
override_dh_fixperms:
dh_fixperms -Xcinder_tgt.conf
+
+override_dh_clean:
+ # temporary workaround for d2to1 wonkyness
+ dh_clean -Xsetup.cfg