You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2018/04/19 18:15:08 UTC
[GitHub] rhtyd closed pull request #2549: debian: Fix errors reported by
lintian
rhtyd closed pull request #2549: debian: Fix errors reported by lintian
URL: https://github.com/apache/cloudstack/pull/2549
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/debian/control b/debian/control
index 42d3e1a5fab..b23d277777c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,37 @@
Source: cloudstack
-Section: libs
-Priority: extra
-Maintainer: Wido den Hollander <wi...@widodh.nl>
+Section: net
+Priority: optional
+Maintainer: Rohit Yadav <ro...@apache.org>
Build-Depends: debhelper (>= 9), openjdk-8-jdk | java8-sdk | java8-jdk, genisoimage,
python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), lsb-release, dh-systemd, python-setuptools
-Standards-Version: 3.8.1
-Homepage: http://www.cloudstack.org/
+Standards-Version: 4.0.0
+Homepage: http://cloudstack.apache.org/
Package: cloudstack-common
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, genisoimage, nfs-common, python-netaddr
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
+Description: The Apache CloudStack common package
+ A common package which contains files which are shared by several Apache
+ CloudStack packages.
Package: cloudstack-management
Architecture: all
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), sudo, jsvc, python-mysql.connector, libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release, init-system-helpers (>= 1.14~)
Conflicts: cloud-server, cloud-client, cloud-client-ui
-Description: CloudStack server library
- The CloudStack management server
+Description: The Apache CloudStack management server
+ The CloudStack management server is in charge of overall cloud
+ orchestation, management and service. The management server
+ also provides the UI and API services.
Package: cloudstack-agent
Architecture: all
Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless | java8-runtime, cloudstack-common (= ${source:Version}), lsb-base (>= 4.0), libcommons-daemon-java, openssh-client, qemu-kvm (>= 1.0), libvirt-bin (>= 1.2.2), uuid-runtime, iproute, ebtables, vlan, jsvc, ipset, python-libvirt, ethtool, iptables, lsb-release, init-system-helpers (>= 1.14~), aria2
Recommends: init-system-helpers
Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts
-Description: CloudStack agent
+Description: The Apache CloudStack agent
The CloudStack agent is in charge of managing shared computing resources in
- a CloudStack powered cloud. Install this package if this computer
+ a CloudStack powered cloud. Install this package on the host that
will participate in your cloud as a KVM HyperVisor.
Package: cloudstack-usage
@@ -37,17 +41,15 @@ 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-docs
-Architecture: all
-Depends: ${misc:Depends}
-Description: The CloudStack documentation
-
Package: cloudstack-marvin
Architecture: all
Depends: ${misc:Depends}, python-pip, python-dev, libffi-dev
-Description: The CloudStack Marvin library
+Description: The Apache CloudStack Marvin library
+ Marvin is a Python library that is used to write and run integration tests.
Package: cloudstack-integration-tests
Architecture: all
Depends: ${misc:Depends}, cloudstack-marvin (= ${source:Version})
Description: The CloudStack Marvin integration tests
+ This packages smoke and component integration tests based on Marvin for
+ Apache CloudStack.
diff --git a/debian/rules b/debian/rules
index a41b3f9c2b8..16513b828b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ override_dh_auto_install:
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/
+ chmod -x $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/*.jar
install -m0755 packaging/debian/$(PACKAGE)-agent.init $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
install -d -m0755 debian/$(PACKAGE)-agent/lib/systemd/system
@@ -79,6 +80,7 @@ override_dh_auto_install:
cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
cp client/target/cloud-client-ui-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/cloudstack-$(VERSION).jar
cp client/target/lib/*jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/
+ chmod -x $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/*.jar
# nast hack for a couple of configuration files
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-limits.conf $(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
@@ -116,6 +118,7 @@ override_dh_auto_install:
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.2.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
+ chmod -x $(DESTDIR)/usr/share/$(PACKAGE)-common/lib/*.jar
# cloudstack-python
mkdir -p $(DESTDIR)/usr/share/pyshared
@@ -129,6 +132,7 @@ override_dh_auto_install:
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
+ chmod -x $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/*.jar
install -D -m0755 packaging/debian/$(PACKAGE)-usage.init $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
install -d -m0755 debian/$(PACKAGE)-usage/lib/systemd/system
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services