From 4cdfbf337d7e8a221e6e227836a72ee26a49641f Mon Sep 17 00:00:00 2001 From: Rafael da Fonseca Date: Fri, 22 May 2015 18:19:52 +0200 Subject: [PATCH] Fixes problem with having to change the "-SNAPSHOT" string in debian/rules for releases, deb packaging was broken in master due to this in a merge with release version. Fixes some warnings generated by dpkg-buildpackage regarding upstream tarball an source versioning Reduces source tarball from 669MB to 183MB (it was including .git), now build is faster and takes up less space Signed-off-by: Rohit Yadav --- debian/changelog | 8 ++++++-- debian/rules | 13 +++++-------- debian/source/format | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 9c0182efc29..d8babba627e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -cloudstack (4.6.0-snapshot) unstable; urgency=low +cloudstack (4.6.0-SNAPSHOT) unstable; urgency=low + [ Hugo Trippaers ] * Update the version to 4.6.0.snapshot - -- Hugo Trippaers Thu, 3 Nov 2014 12:00:00 -0400 + [ Rafael da Fonseca ] + * Switch to dpkg-source 3.0 (native) format + + -- Rafael da Fonseca Fri, 22 May 2015 16:03:55 +0200 cloudstack (4.5.0-snapshot) unstable; urgency=low diff --git a/debian/rules b/debian/rules index fd26f778a46..66a36239be3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- - -DEBVERS := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') -VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e 's/[~-].*//') -MVNADD := $(shell if echo '$(DEBVERS)' | grep -q snapshot; then echo -SNAPSHOT; fi ) +VERSION := $(shell mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v "\[") PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1) SYSCONFDIR = "/etc" DESTDIR = "debian/tmp" @@ -41,8 +38,8 @@ override_dh_auto_install: mkdir $(DESTDIR)/var/log/$(PACKAGE)/agent mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent mkdir $(DESTDIR)/usr/share/$(PACKAGE)-agent/plugins - install -D agent/target/cloud-agent-$(VERSION)$(MVNADD).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar - install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION)$(MVNADD).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ + install -D agent/target/cloud-agent-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar + install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent install -D agent/target/transformed/cloud-setup-agent $(DESTDIR)/usr/bin/cloudstack-setup-agent @@ -69,7 +66,7 @@ override_dh_auto_install: mkdir $(DESTDIR)/var/lib/$(PACKAGE)/management mkdir $(DESTDIR)/var/lib/$(PACKAGE)/mnt cp -r client/target/utilities/scripts/db/* $(DESTDIR)/usr/share/$(PACKAGE)-management/setup/ - cp -r client/target/cloud-client-ui-$(VERSION)$(MVNADD)/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/ + cp -r client/target/cloud-client-ui-$(VERSION)/* $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/ cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/ cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/ @@ -122,7 +119,7 @@ override_dh_auto_install: mkdir $(DESTDIR)/var/log/$(PACKAGE)/usage mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage/plugins - install -D usage/target/cloud-usage-$(VERSION)$(MVNADD).jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar + install -D usage/target/cloud-usage-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar install -D usage/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/ cp usage/target/transformed/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/ cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000000..89ae9db8f88 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)