Code Review
/
openstack-build
/
neutron-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update to 8.0.0.0b1
[openstack-build/neutron-build.git]
/
trusty
/
debian
/
rules
diff --git
a/trusty/debian/rules
b/trusty/debian/rules
index 4eb03b658b72a2a714ff3ba28126d018d3627a7e..305551355713c23cb201909a73b6458622ad0c0e 100755
(executable)
--- a/
trusty/debian/rules
+++ b/
trusty/debian/rules
@@
-24,6
+24,9
@@
override_dh_install:
mkdir -p $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
cp -auxf neutron $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
done
mkdir -p $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
cp -auxf neutron $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \
done
+ tools/generate_config_file_samples.sh
+ bash -c 'for i in $$(find etc/ -name *.ini.sample); do mv $$i $$(dirname $$i)/$$(basename "$$i" .ini.sample).ini; done'
+ mv etc/neutron.conf.sample etc/neutron.conf
dh_install -O--buildsystem=python_distutils --fail-missing -X/usr/etc -X/usr/bin
rm -rf $(CURDIR)/debian/neutron-common/usr/lib
rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum*
dh_install -O--buildsystem=python_distutils --fail-missing -X/usr/etc -X/usr/bin
rm -rf $(CURDIR)/debian/neutron-common/usr/lib
rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum*
@@
-75,7
+78,7
@@
override_dh_auto_build:
override_dh_sphinxdoc:
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
override_dh_sphinxdoc:
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-
python setup.py build_sphinx
-
cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc
-
dh_sphinxdoc -O--buildsystem=python_distutils
+ python setup.py build_sphinx
+ cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc
+ dh_sphinxdoc -O--buildsystem=python_distutils
endif
endif