From a6a74c7d9cecf91d15368eddddc3d60bb569b51d Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Mon, 10 Sep 2012 16:17:20 +0200 Subject: [PATCH] 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. --- debian/control | 4 ++-- wscript_configure | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 5b95eb31c7a..2035e9666be 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: cloud Section: libs Priority: extra Maintainer: Wido den Hollander -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 Homepage: http://www.cloudstack.org/ @@ -119,7 +119,7 @@ Provides: vmops-agent Conflicts: vmops-agent Replaces: vmops-agent 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 The CloudStack agent is in charge of managing shared computing resources in a CloudStack powered cloud. Install this package if this computer diff --git a/wscript_configure b/wscript_configure index d881704a812..dcea4107fc2 100644 --- a/wscript_configure +++ b/wscript_configure @@ -96,8 +96,8 @@ systemjars = { "jetty-start-daemon.jar", "jetty-sslengine.jar", "jetty-start.jar", - "slf4j-log4j12.jar", "jna.jar", + "log4j-1.2.jar", ), 'Windows': (