This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "felix-framework packaging".
The branch, master has been updated
via a284c91a97a7de03ec0fedadf21e2414c54f54e2 (commit)
from ee422e41da61f2c1536de1b9350745476536e4b4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a284c91a97a7de03ec0fedadf21e2414c54f54e2
Author: Damien Raude-Morvan <draz...@debian.org>
Date: Sun May 8 19:40:46 2011 +0200
d/{build.xml,rules}: Fix FTBFS with Ant 1.8.2 (move property in global
scope and change its name as java.class.path clash with default one).
-----------------------------------------------------------------------
Summary of changes:
debian/build.xml | 10 +++++-----
debian/changelog | 8 ++++++++
debian/rules | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/debian/build.xml b/debian/build.xml
index fa67120..b111a53 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -23,6 +23,11 @@
<property name="build.compile.version" value="1.5"/>
<property name="build.compile.lint" value="-Xlint:unchecked"/>
+ <path id="build.classpath">
+ <pathelement location="${build.dst.classes}"/>
+ <pathelement path="${build.jar.path}"/>
+ </path>
+
<!-- clean =============================================================== -->
<target name="clean" description="Delete old build directory">
<delete dir="${build.dst}"/>
@@ -31,11 +36,6 @@
<!-- prepare ============================================================= -->
<target name="prepare" description="Prepare build">
- <path id="build.classpath">
- <pathelement location="${build.dst.classes}"/>
- <pathelement path="${java.class.path}"/>
- </path>
-
<mkdir dir="${build.dst}"/>
<mkdir dir="${build.dist}"/>
<mkdir dir="${build.dst.doc}"/>
diff --git a/debian/changelog b/debian/changelog
index cc49d20..0d6d189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+felix-framework (2.0.5-2) UNRELEASED; urgency=low
+
+ * d/{build.xml,rules}: Fix FTBFS with Ant 1.8.2 (move property in
+ global scope and change its name as java.class.path clash with
+ default one).
+
+ -- Damien Raude-Morvan <draz...@debian.org> Sun, 08 May 2011 19:44:02 +0200
+
felix-framework (2.0.5-1) unstable; urgency=low
[ Andres Mejia ]
diff --git a/debian/rules b/debian/rules
index 90d3c4b..b1db43d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ ANT_BUILD_TARGET := build javadoc
ANT_ARGS := -Dbuild.sysclasspath=first \
-Dversion=$(VERSION) \
-Djar.name=$(JAR_NAME) \
- -Djava.class.path=$(CLASSPATH)
+ -Dbuild.jar.path=$(CLASSPATH)
%:
dh $@ --with javahelper
hooks/post-receive
--
felix-framework packaging
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
