You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/03/05 16:27:19 UTC
[01/13] git commit: updated refs/heads/master to 8e5fefc
Repository: cloudstack
Updated Branches:
refs/heads/master acde8268c -> 8e5fefc66
Convert debian/rules to short dh-style.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
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 <fe...@credativ.de>
Authored: Mon Feb 16 13:18:22 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
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
[04/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Use /bin/sh and set -e uniformly in maintainer scripts.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71b42e26
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71b42e26
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71b42e26
Branch: refs/heads/master
Commit: 71b42e266f042e044e8a1b628cc28af2dff93dff
Parents: 6ce9729
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 14:05:15 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:35:53 2015 +0100
----------------------------------------------------------------------
debian/cloudstack-agent.postinst | 2 +-
debian/cloudstack-management.postinst | 5 ++++-
debian/cloudstack-usage.postinst | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71b42e26/debian/cloudstack-agent.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-agent.postinst b/debian/cloudstack-agent.postinst
index 2a938ad..9cb178d 100644
--- a/debian/cloudstack-agent.postinst
+++ b/debian/cloudstack-agent.postinst
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71b42e26/debian/cloudstack-management.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index 2a16bc4..0dbeca9 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -16,6 +17,8 @@
# specific language governing permissions and limitations
# under the License.
+set -e
+
if [ "$1" = configure ]; then
if ! getent passwd cloud >/dev/null; then
adduser --quiet --system --group --no-create-home --home /var/lib/cloudstack/management cloud
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71b42e26/debian/cloudstack-usage.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst
index 9452d39..9529711 100644
--- a/debian/cloudstack-usage.postinst
+++ b/debian/cloudstack-usage.postinst
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
[09/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Add dependency on ${misc:Depends} to all packages.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b482766c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b482766c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b482766c
Branch: refs/heads/master
Commit: b482766c61bc4c69cf1e6c6005001be75f967682
Parents: 05f865f
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 15:06:34 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:39:54 2015 +0100
----------------------------------------------------------------------
debian/control | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b482766c/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 142d370..e3e82e1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,20 +9,20 @@ Homepage: http://www.cloudstack.org/
Package: cloudstack-common
Architecture: all
-Depends: ${python:Depends}, bash, genisoimage, nfs-common
+Depends: ${misc:Depends}, ${python:Depends}, bash, genisoimage, nfs-common
Conflicts: cloud-scripts, cloud-utils, cloud-system-iso, cloud-console-proxy, cloud-daemonize, cloud-deps, cloud-python, cloud-setup
Description: A common package which contains files which are shared by several CloudStack packages
Package: cloudstack-management
Architecture: all
-Depends: ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
+Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
Package: cloudstack-agent
Architecture: all
-Depends: ${python:Depends}, openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables
+Depends: ${misc:Depends}, ${python:Depends}, openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
Description: CloudStack agent
The CloudStack agent is in charge of managing shared computing resources in
@@ -31,21 +31,22 @@ Description: CloudStack agent
Package: cloudstack-usage
Architecture: all
-Depends: openjdk-7-jre, cloudstack-common (= ${source:Version}), jsvc, libmysql-java
+Depends: ${misc:Depends}, openjdk-7-jre, cloudstack-common (= ${source:Version}), jsvc, libmysql-java
Description: CloudStack usage monitor
The CloudStack usage monitor provides usage accounting across the entire cloud for
cloud operators to charge based on usage parameters.
Package: cloudstack-awsapi
Architecture: all
-Depends: ${python:Depends}, cloudstack-common (= ${source:Version}), cloudstack-management (= ${source:Version})
+Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), cloudstack-management (= ${source:Version})
Description: CloudStack Amazon EC2 API
Package: cloudstack-cli
Architecture: all
-Depends: cloudstack-common (= ${source:Version})
+Depends: ${misc:Depends}, cloudstack-common (= ${source:Version})
Description: The CloudStack CLI called CloudMonkey
Package: cloudstack-docs
Architecture: all
+Depends: ${misc:Depends}
Description: The CloudStack documentation
[03/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Swap maven3 | maven build-dependency.
maven3 is not a package in Debian and buildds look only at the
first alternative.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1301a2c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1301a2c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1301a2c
Branch: refs/heads/master
Commit: f1301a2c5d642375b16bbd368f7ab7a77999f126
Parents: acde826
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 12:21:40 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:35:52 2015 +0100
----------------------------------------------------------------------
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1301a2c/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 398a767..02cd68e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: extra
Maintainer: Wido den Hollander <wi...@widodh.nl>
Build-Depends: debhelper (>= 7), openjdk-7-jdk, genisoimage,
- python-mysqldb, maven3 | maven (>= 3), python (>= 2.6.6-3~)
+ python-mysqldb, maven (>= 3) | maven3, python (>= 2.6.6-3~)
Standards-Version: 3.8.1
Homepage: http://www.cloudstack.org/
[06/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Add proper python dependencies.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b338e88e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b338e88e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b338e88e
Branch: refs/heads/master
Commit: b338e88e4016ca0948e0ef269766ba21b92ceb8f
Parents: 465b3e9
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 14:33:11 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:39:54 2015 +0100
----------------------------------------------------------------------
debian/control | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b338e88e/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 02cd68e..b5f3dbb 100644
--- a/debian/control
+++ b/debian/control
@@ -9,20 +9,20 @@ Homepage: http://www.cloudstack.org/
Package: cloudstack-common
Architecture: all
-Depends: bash, genisoimage, nfs-common
+Depends: ${python:Depends}, bash, genisoimage, nfs-common
Conflicts: cloud-scripts, cloud-utils, cloud-system-iso, cloud-console-proxy, cloud-daemonize, cloud-deps, cloud-python, cloud-setup
Description: A common package which contains files which are shared by several CloudStack packages
Package: cloudstack-management
Architecture: all
-Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client
+Depends: ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
Package: cloudstack-agent
Architecture: all
-Depends: openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables
+Depends: ${python:Depends}, openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
Description: CloudStack agent
The CloudStack agent is in charge of managing shared computing resources in
@@ -38,7 +38,7 @@ Description: CloudStack usage monitor
Package: cloudstack-awsapi
Architecture: all
-Depends: cloudstack-common (= ${source:Version}), cloudstack-management (= ${source:Version})
+Depends: ${python:Depends}, cloudstack-common (= ${source:Version}), cloudstack-management (= ${source:Version})
Description: CloudStack Amazon EC2 API
Package: cloudstack-cli
[05/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Add DEBHELPER tokens to maintainer script.
dh_* tools insert their scripts there.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6ce97295
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6ce97295
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6ce97295
Branch: refs/heads/master
Commit: 6ce9729580541a6d608fbd9e9aa6e7ab0634ccec
Parents: 01e28a3
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 14:04:13 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:35:53 2015 +0100
----------------------------------------------------------------------
debian/cloudstack-agent.postinst | 2 +-
debian/cloudstack-management.postinst | 2 ++
debian/cloudstack-usage.postinst | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ce97295/debian/cloudstack-agent.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-agent.postinst b/debian/cloudstack-agent.postinst
index 01aaef6..2a938ad 100644
--- a/debian/cloudstack-agent.postinst
+++ b/debian/cloudstack-agent.postinst
@@ -44,4 +44,4 @@ case "$1" in
;;
esac
-exit 0
+#DEBHELPER#
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ce97295/debian/cloudstack-management.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index 366ccc1..2a16bc4 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -56,3 +56,5 @@ if [ "$1" = configure ]; then
chgrp cloud /etc/cloudstack/management/db.properties
service tomcat6 stop || true
fi
+
+#DEBHELPER#
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6ce97295/debian/cloudstack-usage.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst
index 8a475c4..9452d39 100644
--- a/debian/cloudstack-usage.postinst
+++ b/debian/cloudstack-usage.postinst
@@ -46,4 +46,4 @@ case "$1" in
;;
esac
-exit 0
+#DEBHELPER#
[07/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Add adduser dependency to cloudstack-management.
Used in the postinst script.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05f865ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05f865ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05f865ff
Branch: refs/heads/master
Commit: 05f865ffd54e596466ce107b189ffc704ac59e2e
Parents: b338e88
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 14:36:50 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:39:54 2015 +0100
----------------------------------------------------------------------
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05f865ff/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index b5f3dbb..142d370 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are shared by several C
Package: cloudstack-management
Architecture: all
-Depends: ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client
+Depends: ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
[12/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Register the init scripts.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb16d48f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb16d48f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb16d48f
Branch: refs/heads/master
Commit: bb16d48f0cd04509162b7357ca5e363d71296ba8
Parents: b77198d
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 17:02:31 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:39:55 2015 +0100
----------------------------------------------------------------------
debian/rules | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb16d48f/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 5c61029..d43f4f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,5 +150,8 @@ override_dh_auto_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
+override_dh_installinit:
+ dh_installinit -pcloudstack-management -pcloudstack-agent -pcloudstack-usage --onlyscripts --no-start
+
override_dh_installdocs:
dh_installdocs -A tools/whisker/LICENSE tools/whisker/NOTICE INSTALL.md
[11/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Remove dependencies on essential packages.
They are guaranteed to be present on Debian systems.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/705af841
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/705af841
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/705af841
Branch: refs/heads/master
Commit: 705af84141a3bf83f5d60c2fd9cbd4fb672d1cff
Parents: b482766
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 15:08:43 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:39:54 2015 +0100
----------------------------------------------------------------------
debian/control | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/705af841/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index e3e82e1..4ab832e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,20 +9,20 @@ Homepage: http://www.cloudstack.org/
Package: cloudstack-common
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, bash, genisoimage, nfs-common
+Depends: ${misc:Depends}, ${python:Depends}, genisoimage, nfs-common
Conflicts: cloud-scripts, cloud-utils, cloud-system-iso, cloud-console-proxy, cloud-daemonize, cloud-deps, cloud-python, cloud-setup
Description: A common package which contains files which are shared by several CloudStack packages
Package: cloudstack-management
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
+Depends: ${misc:Depends}, ${python:Depends}, cloudstack-common (= ${source:Version}), tomcat6, sudo, jsvc, python-mysqldb, libmysql-java, python-paramiko, augeas-tools, mysql-client, adduser
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
Package: cloudstack-agent
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables
+Depends: ${misc:Depends}, ${python:Depends}, openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, iproute, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
Description: CloudStack agent
The CloudStack agent is in charge of managing shared computing resources in
[10/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Use invoke-rc.d instead of service to stop tomcat.
Debian policy requires that invoke-rc.d is used.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b77198de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b77198de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b77198de
Branch: refs/heads/master
Commit: b77198def52b38c52e660edb2c55802238789dde
Parents: 705af84
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 16:19:06 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:39:54 2015 +0100
----------------------------------------------------------------------
debian/cloudstack-management.postinst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b77198de/debian/cloudstack-management.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index 0dbeca9..145d1ea 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -57,7 +57,7 @@ if [ "$1" = configure ]; then
chmod 0640 /etc/cloudstack/management/db.properties
chgrp cloud /etc/cloudstack/management/db.properties
- service tomcat6 stop || true
+ invoke-rc.d tomcat6 stop || true
fi
#DEBHELPER#
[02/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Specify maven repo location.
By default it chooses a location based on $HOME which is not guranteed to
have a proper value on buildds.
We also need to take care of cleaning it up after the build.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e0867b3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e0867b3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e0867b3
Branch: refs/heads/master
Commit: 6e0867b307e86b6823a316d66084a8916696ab9d
Parents: f1301a2
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 12:41:47 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:35:52 2015 +0100
----------------------------------------------------------------------
debian/rules | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e0867b3/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 08fca4c..d55d251 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ build-indep: build-indep-stamp
build-indep-stamp: configure
mvn -T C1.5 clean package -Pawsapi -DskipTests -Dsystemvm \
-Dcs.replace.properties=replace.properties.tmp \
+ -Dmaven.repo.local=$(CURDIR)/mavenrepo \
${ACS_BUILD_OPTS}
touch $@
@@ -45,6 +46,7 @@ clean:
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
rm -f replace.properties.tmp
+ rm -rf mavenrepo
dh_clean
install:
[08/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Install python files into the correct path.
Signed-off-by: Wido den Hollander <wi...@widodh.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/465b3e9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/465b3e9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/465b3e9d
Branch: refs/heads/master
Commit: 465b3e9d1aa8506327effd4b9103bca929f4af32
Parents: 71b42e2
Author: Felix Geyer <fe...@credativ.de>
Authored: Mon Feb 16 14:20:20 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 14:39:54 2015 +0100
----------------------------------------------------------------------
debian/rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/465b3e9d/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 0501c80..5c61029 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,8 +114,8 @@ override_dh_auto_install:
install -D agent/target/dependencies/jasypt-1.9.2.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
# cloudstack-python
- mkdir -p $(DESTDIR)/usr/lib/python2.7/dist-packages
- cp -r python/lib/cloud* $(DESTDIR)/usr/lib/python2.7/dist-packages
+ mkdir -p $(DESTDIR)/usr/share/pyshared
+ cp -r python/lib/cloud* $(DESTDIR)/usr/share/pyshared
# cloudstack-usage
mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage
[13/13] git commit: updated refs/heads/master to 8e5fefc
Posted by wi...@apache.org.
Fix Python path for Debian installer
This closes #96
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8e5fefc6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8e5fefc6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8e5fefc6
Branch: refs/heads/master
Commit: 8e5fefc66c8f5063406ceb3a4130bea4b559a202
Parents: bb16d48
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Thu Mar 5 16:25:17 2015 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Mar 5 16:25:17 2015 +0100
----------------------------------------------------------------------
debian/cloudstack-common.install | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8e5fefc6/debian/cloudstack-common.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install
index 7e01ada..01d0957 100644
--- a/debian/cloudstack-common.install
+++ b/debian/cloudstack-common.install
@@ -29,4 +29,4 @@
/usr/share/cloudstack-common/lib/*
/usr/bin/cloudstack-set-guest-password
/usr/bin/cloudstack-set-guest-sshkey
-/usr/lib/python2.?/*-packages/*
+/usr/share/pyshared