debian: Depend on log4j 1.2.16 and add to CLASSPATH

Ubuntu 12.04 and Debian (testing) both ship from their repository, so there is no need
for us to distribute it in our packages.

We depend on it externally for our logging.
This commit is contained in:
Wido den Hollander 2012-09-10 16:17:20 +02:00
parent 18cad09dff
commit a6a74c7d9c
2 changed files with 3 additions and 3 deletions

4
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: cloud
Section: libs Section: libs
Priority: extra Priority: extra
Maintainer: Wido den Hollander <wido@widodh.nl> Maintainer: Wido den Hollander <wido@widodh.nl>
Build-Depends: debhelper (>= 7), openjdk-6-jdk, tomcat6, libws-commons-util-java, libcommons-dbcp-java, libcommons-collections-java, libcommons-httpclient-java, libservlet2.5-java, genisoimage, python-mysqldb, maven (>= 3.0.4) Build-Depends: debhelper (>= 7), openjdk-6-jdk, tomcat6, libws-commons-util-java, libcommons-dbcp-java, libcommons-collections-java, libcommons-httpclient-java, libservlet2.5-java, genisoimage, python-mysqldb, maven (>= 3.0.4), liblog4j1.2-java (>= 1.2.16)
Standards-Version: 3.8.1 Standards-Version: 3.8.1
Homepage: http://www.cloudstack.org/ Homepage: http://www.cloudstack.org/
@ -119,7 +119,7 @@ Provides: vmops-agent
Conflicts: vmops-agent Conflicts: vmops-agent
Replaces: vmops-agent Replaces: vmops-agent
Architecture: any Architecture: any
Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), python, cloud-python (= ${source:Version}), cloud-agent-libs (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, ebtables, vlan, libcglib-java, libcommons-httpclient-java, libservlet2.5-java, liblog4j1.2-java, libjna-java, wget, jsvc, lsb-base (>= 3.2) Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), python, cloud-python (= ${source:Version}), cloud-agent-libs (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, ebtables, vlan, libcglib-java, libcommons-httpclient-java, libservlet2.5-java, liblog4j1.2-java (>= 1.2.16), libjna-java, wget, jsvc, lsb-base (>= 3.2)
Description: CloudStack agent Description: CloudStack agent
The CloudStack agent is in charge of managing shared computing resources in 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 if this computer

View File

@ -96,8 +96,8 @@ systemjars = {
"jetty-start-daemon.jar", "jetty-start-daemon.jar",
"jetty-sslengine.jar", "jetty-sslengine.jar",
"jetty-start.jar", "jetty-start.jar",
"slf4j-log4j12.jar",
"jna.jar", "jna.jar",
"log4j-1.2.jar",
), ),
'Windows': 'Windows':
( (