cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.3 to c8b8089
Date Tue, 02 Sep 2014 11:06:00 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 1a8e07d17 -> c8b80893a


Fix for -SNAPSHOT problem in debian rules. Use -snapshot in the changelog to force the packaging
to use the -SNAPSHOT extension for maven targets

(cherry picked from commit 2b47611c5d44893021016d2df9713c392cfa92df)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	debian/changelog
	debian/rules


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

Branch: refs/heads/4.3
Commit: c8b80893a4e32defb87be21720a86172a24bc3f6
Parents: 1a8e07d
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Fri Oct 4 18:11:49 2013 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Tue Sep 2 13:04:22 2014 +0200

----------------------------------------------------------------------
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8b80893/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 66800de..4edf893 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +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 ; fi )
+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"


Mime
View raw message