[olap4j] 17/19: Removed the dependency on liblog4j1.2-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository olap4j.

commit 29fc4351c33617e7f88e7a2acae49acf559240f3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 20 19:03:32 2015 +0200

    Removed the dependency on liblog4j1.2-java
---
 debian/changelog | 1 +
 debian/control   | 4 +---
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7c9ae1..5d4c9ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ olap4j (1.2.0-1) UNRELEASED; urgency=medium
   * New upstream release:
     - Refreshed the patches
     - Replaced the build dependency on cup with javacc
+    - Removed the dependency on liblog4j1.2-java
   * Improved the reproducibility:
     - Set the locale when generating the javadoc and remove the timestamps)
     - Removed VERSION.txt from the jar files (contains timestamps, usernames)
diff --git a/debian/control b/debian/control
index f246a8e..8e4b820 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends-Indep: ant-contrib,
                      junit-doc,
                      libcommons-dbcp-java,
                      libeigenbase-farrago-java,
-                     liblog4j1.2-java,
                      libmondrian-java,
                      libxerces2-java
 Standards-Version: 3.9.6
@@ -22,8 +21,7 @@ Homepage: http://www.olap4j.org/
 
 Package: libolap4j-java
 Architecture: all
-Depends: liblog4j1.2-java,
-         libxerces2-java,
+Depends: libxerces2-java,
          ${misc:Depends}
 Suggests: libcommons-dbcp-java
 Description: unified Java API to access an OLAP server
diff --git a/debian/rules b/debian/rules
index 35f3dbe..9d51fb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
 
-DEB_JARS             := log4j-1.2 xercesImpl commons-dbcp junit ant-junit ant-nodeps ant-trax ant-contrib
+DEB_JARS             := xercesImpl commons-dbcp junit ant-junit ant-nodeps ant-trax ant-contrib
 
 DEB_ANT_BUILD_TARGET := version-properties jar xmla-jar tck-jar javadoc
 # olap4j need mondrian for testing.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/olap4j.git