[librepository] 11/22: Import Debian patch 1.1.6-2

[Emmanuel Bourg]

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

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

commit b3760e81dcfbcd677cbccd3c1323ad21c086cd38
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 1 15:22:48 2011 +0000

    Import Debian patch 1.1.6-2
---
 debian/ant.properties | 1 +
 debian/changelog      | 6 ++++++
 debian/control        | 2 +-
 debian/rules          | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..fe47546
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1 @@
+antcontrib.build.cache.dir=/usr/share/java
diff --git a/debian/changelog b/debian/changelog
index 943fa4e..a650608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librepository (1.1.6-2) unstable; urgency=low
+
+  * merge libbase 1.1.6-2 changes 
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 01 Nov 2011 15:22:48 +0000
+
 librepository (1.1.6-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ba6e2a6..5d3e286 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, libjcommon-java (>= 1.0.10), libbase-java, libgnumail-java, libcommons-logging-java, javahelper
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, libjcommon-java (>= 1.0.10), libbase-java, libgnumail-java, libcommons-logging-java, javahelper, ant-contrib
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/librepository
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/librepository/
diff --git a/debian/rules b/debian/rules
index b1c4a5b..a485e03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon libbase gnumail commons-logging
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon libbase gnumail commons-logging ant-contrib
 DEB_ANT_BUILDFILE := build.xml
 DEB_ANT_BUILD_TARGET := compile jar javadoc
 

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