X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=be482cd4efd7639da1877df4dd68afc7de9be005;hb=a8819815ee807c7c569e53b50556dceaddf2fe29;hp=3b2f83c00ec0ede133981f480ab57c545c298716;hpb=5d6cba3f1651e62c4eb7f6fb6b5f1df91b147e80;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 3b2f83c..be482cd 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -7,10 +7,15 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 %:
 	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_install:
+	dh_install
+	install -D -m 0644 $(CURDIR)/etc/ceilometer/ceilometer.conf.sample	$(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+	install -D -m 0644 $(CURDIR)/etc/ceilometer/policy.json			$(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/policy.json
+	install -D -m 0644 $(CURDIR)/etc/ceilometer/sources.json		$(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/sources.json
+
+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
@@ -18,15 +23,8 @@ override_dh_installchangelogs:
 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
+	find . -iname '*.pyc' -delete
 
 override_dh_gencontrol:
 	if dpkg-vendor --derives-from ubuntu ; then \
@@ -34,14 +32,3 @@ override_dh_gencontrol:
 	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