Updated Branches:
  refs/heads/4.2 7dc0dca9e -> acf5ad5bf

Fix for -SNAPSHOT problem in debian rules. Adding -snapshot to the version in 
the changelog will also add the -SNAPSHOT to the paths in the rules file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/acf5ad5b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/acf5ad5b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/acf5ad5b

Branch: refs/heads/4.2
Commit: acf5ad5bf3305b7167304ab738006e89a18009cd
Parents: 7dc0dca
Author: Hugo Trippaers <[email protected]>
Authored: Fri Oct 4 14:38:27 2013 +0200
Committer: Hugo Trippaers <[email protected]>
Committed: Fri Oct 4 14:39:35 2013 +0200

----------------------------------------------------------------------
 debian/changelog |  2 +-
 debian/rules     | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acf5ad5b/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 801649a..c0a970e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cloudstack (4.2.1) unstable; urgency=low
+cloudstack (4.2.1-snapshot) unstable; urgency=low
 
   * Update the version to 4.2.1 to be in sync with Maven (again)
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acf5ad5b/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index e4c51fb..4d50407 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@
 
 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 )
 PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1)
 SYSCONFDIR = "/etc"
 DESTDIR = "debian/tmp"
@@ -65,8 +66,8 @@ 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).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 agent/target/cloud-agent-$(VERSION)$(MVNADD)-SNAPSHOT.jar 
$(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
+       install -D 
plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-$(VERSION)$(MVNADD)-SNAPSHOT.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
@@ -92,7 +93,7 @@ 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)/* 
$(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/
+       cp -r client/target/cloud-client-ui-$(VERSION)$(MVNADD)/* 
$(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/
        cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/
        cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
 
@@ -132,7 +133,7 @@ install:
        install -D client/target/utilities/bin/cloud-setup-management 
$(DESTDIR)/usr/bin/cloudstack-setup-management
        install -D client/target/utilities/bin/cloud-setup-encryption 
$(DESTDIR)/usr/bin/cloudstack-setup-encryption
        install -D client/target/utilities/bin/cloud-sysvmadm 
$(DESTDIR)/usr/bin/cloudstack-sysvmadm
-       install -D services/console-proxy/server/dist/systemvm.iso 
$(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
+       install -D systemvm/dist/systemvm.iso 
$(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
        # We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack 
to get it into the right place
        install -D agent/target/dependencies/jasypt-1.9.0.jar 
$(DESTDIR)/usr/share/$(PACKAGE)-common/lib
 
@@ -145,7 +146,7 @@ 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).jar 
$(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
+       install -D usage/target/cloud-usage-$(VERSION)$(MVNADD).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
@@ -158,7 +159,7 @@ install:
        mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
        mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup
        ln -s /usr/share/$(PACKAGE)-bridge/webapps/awsapi 
$(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080/awsapi
-       cp -r awsapi/target/cloud-awsapi-$(VERSION)/* 
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
+       cp -r awsapi/target/cloud-awsapi-$(VERSION)$(MVNADD)/* 
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi
        install -D awsapi-setup/setup/cloud-setup-bridge 
$(DESTDIR)/usr/bin/cloudstack-setup-bridge
        install -D awsapi-setup/setup/cloudstack-aws-api-register 
$(DESTDIR)/usr/bin/cloudstack-aws-api-register
        cp -r awsapi-setup/db/mysql/* 
$(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup

Reply via email to