Repository: cloudstack Updated Branches: refs/heads/master acde8268c -> 8e5fefc66
Convert debian/rules to short dh-style. Signed-off-by: Wido den Hollander <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/01e28a31 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/01e28a31 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/01e28a31 Branch: refs/heads/master Commit: 01e28a31bc14fd698f700d1df686539158503e24 Parents: 6e0867b Author: Felix Geyer <[email protected]> Authored: Mon Feb 16 13:18:22 2015 +0100 Committer: Wido den Hollander <[email protected]> Committed: Thu Mar 5 14:35:52 2015 +0100 ---------------------------------------------------------------------- debian/rules | 66 ++++++++++--------------------------------------------- 1 file changed, 12 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/01e28a31/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index d55d251..0501c80 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,5 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') @@ -17,43 +8,26 @@ PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1) SYSCONFDIR = "/etc" DESTDIR = "debian/tmp" -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 -# This has to be exported to make some magic below work. -export DH_OPTIONS +%: + dh $@ --with python2 -configure: configure-stamp -configure-stamp: - dh_testdir +override_dh_auto_configure: cp packaging/debian/replace.properties replace.properties.tmp echo VERSION=${VERSION} >> replace.properties.tmp - touch configure-stamp -build: build-indep - -build-indep: build-indep-stamp - -build-indep-stamp: configure +override_dh_auto_build: mvn -T C1.5 clean package -Pawsapi -DskipTests -Dsystemvm \ - -Dcs.replace.properties=replace.properties.tmp \ - -Dmaven.repo.local=$(CURDIR)/mavenrepo \ - ${ACS_BUILD_OPTS} - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp configure-stamp + -Dcs.replace.properties=replace.properties.tmp \ + -Dmaven.repo.local=$(CURDIR)/mavenrepo \ + ${ACS_BUILD_OPTS} + +override_dh_auto_clean: + dh_auto_clean rm -f replace.properties.tmp rm -rf mavenrepo - dh_clean - -install: - dh_testdir - dh_testroot - dh_prep -s +override_dh_auto_install: # Common packages mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE) mkdir -p $(DESTDIR)/$(SYSCONFDIR)/init.d @@ -176,21 +150,5 @@ install: rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/services.xml rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/META-INF - dh_installdirs - dh_install - dh_python2 - -binary: install - dh_install - dh_installchangelogs +override_dh_installdocs: dh_installdocs -A tools/whisker/LICENSE tools/whisker/NOTICE INSTALL.md - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb
