[SCM] felix-main packaging branch, master, updated. debian/2.0.5-1-6-ge5ca1ca

[Damien Raude-Morvan]

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-main packaging".

The branch, master has been updated
       via  e5ca1ca62f91ae046cc929fea9d1053f033d0d4b (commit)
      from  e8bb1d246caf0574dd1a270d0a7b04ef8cbd26e5 (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 e5ca1ca62f91ae046cc929fea9d1053f033d0d4b
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun May 8 19:22:37 2011 +0200

    Fix FTBFS with Ant 1.8.2

-----------------------------------------------------------------------

Summary of changes:
 debian/build.xml |   10 +++++-----
 debian/changelog |    7 +++++++
 debian/rules     |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 0d49023..7714517 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 d9eaa33..70c28f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+felix-main (2.0.5-2) UNRELEASED; urgency=low
+
+  * d/build.xml: 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 <drazzib at debian.org>  Sun, 08 May 2011 19:31:10 +0200
+
 felix-main (2.0.5-1) unstable; urgency=low
 
   [ Andres Mejia ]
diff --git a/debian/rules b/debian/rules
index 4472409..5d4b540 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-main packaging