Code Review
/
openstack-build
/
ceilometer-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Removed duplicate debian/rules target (now in pkgos.make)
[openstack-build/ceilometer-build.git]
/
xenial
/
debian
/
rules
diff --git
a/xenial/debian/rules
b/xenial/debian/rules
index 3b2f83c00ec0ede133981f480ab57c545c298716..09236a76a5e2eea83b4821554bfaf024e61de052 100755
(executable)
--- a/
xenial/debian/rules
+++ b/
xenial/debian/rules
@@
-7,10
+7,9
@@
include /usr/share/openstack-pkg-tools/pkgos.make
%:
dh $@ --with python2
%:
dh $@ --with python2
-DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//')
-DEBFLAVOR :=$(shell dpkg-parsechangelog | grep -E ^Distribution: | cut -d" " -f2)
-DEBPKGNAME :=$(shell dpkg-parsechangelog | grep -E ^Source: | cut -d" " -f2)
+override_dh_auto_build:
+ dh_auto_build
+ /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.postinst
override_dh_installchangelogs:
dh_installchangelogs debian/CHANGELOG
override_dh_installchangelogs:
dh_installchangelogs debian/CHANGELOG
@@
-18,15
+17,7
@@
override_dh_installchangelogs:
override_dh_auto_clean:
dh_auto_clean
rm -rf debian/*.upstart
override_dh_auto_clean:
dh_auto_clean
rm -rf debian/*.upstart
-
-override_dh_installinit:
- if dpkg-vendor --derives-from ubuntu ; then \
- for i in *.upstart.in ; do \
- MYPKG=`echo $i | cut -d. -f1` ; \
- cp $MYPKG.upstart.in $MYPKG.upstart ; \
- done ; \
- fi
- dh_installinit --error-handler=true
+ rm -rf debian/ceilometer-common.postinst
override_dh_gencontrol:
if dpkg-vendor --derives-from ubuntu ; then \
override_dh_gencontrol:
if dpkg-vendor --derives-from ubuntu ; then \
@@
-34,14
+25,3
@@
override_dh_gencontrol:
else \
dh_gencontrol -- -T$(CURDIR)/debian/debian_control_vars ; \
fi
else \
dh_gencontrol -- -T$(CURDIR)/debian/debian_control_vars ; \
fi
-
-override_dh_builddeb:
- dh_builddeb -- -Zxz -z9
-
-regen-manifest-patch:
- quilt pop -a || true
- quilt push install-missing-files.patch
- git checkout MANIFEST.in
- git ls-files --no-empty-directory --exclude-standard nova | grep -v '.py$$' | sed -n 's/.*/include &/gp' >> MANIFEST.in
- quilt refresh
- quilt pop -a