You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/05/25 16:47:55 UTC
[1/2] git commit: updated refs/heads/master to 68d18c2
Repository: cloudstack
Updated Branches:
refs/heads/master cde6ef94b -> 68d18c234
Fixed debchange tool's removal of timestamp and wrong sort order in changelog
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #291
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68d18c23
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68d18c23
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68d18c23
Branch: refs/heads/master
Commit: 68d18c234955e4aeac758d30bf834fd3f4deec9d
Parents: 4cdfbf3
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri May 22 20:23:26 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon May 25 16:45:50 2015 +0200
----------------------------------------------------------------------
debian/changelog | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68d18c23/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index d8babba..b468e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
cloudstack (4.6.0-SNAPSHOT) unstable; urgency=low
- [ Hugo Trippaers ]
- * Update the version to 4.6.0.snapshot
-
[ Rafael da Fonseca ]
* Switch to dpkg-source 3.0 (native) format
-- Rafael da Fonseca <rs...@gmail.com> Fri, 22 May 2015 16:03:55 +0200
+ [ Hugo Trippaers ]
+ * Update the version to 4.6.0.snapshot
+
+ -- Hugo Trippaers <hu...@apache.org> Thu, 3 Nov 2014 12:00:00 -0400
+
cloudstack (4.5.0-snapshot) unstable; urgency=low
* Update the version to 4.5.0.snapshot
[2/2] git commit: updated refs/heads/master to 68d18c2
Posted by bh...@apache.org.
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 <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4cdfbf33
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4cdfbf33
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4cdfbf33
Branch: refs/heads/master
Commit: 4cdfbf337d7e8a221e6e227836a72ee26a49641f
Parents: cde6ef9
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Fri May 22 18:19:52 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon May 25 16:45:50 2015 +0200
----------------------------------------------------------------------
debian/changelog | 8 ++++++--
debian/rules | 13 +++++--------
debian/source/format | 1 +
3 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4cdfbf33/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 9c0182e..d8babba 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 <hu...@apache.org> Thu, 3 Nov 2014 12:00:00 -0400
+ [ Rafael da Fonseca ]
+ * Switch to dpkg-source 3.0 (native) format
+
+ -- Rafael da Fonseca <rs...@gmail.com> Fri, 22 May 2015 16:03:55 +0200
cloudstack (4.5.0-snapshot) unstable; urgency=low
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4cdfbf33/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index fd26f77..66a3623 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4cdfbf33/debian/source/format
----------------------------------------------------------------------
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)