[SCM] felix-osgi-obr packaging branch, master, updated. debian/1.0.2-1-6-gcdecded

[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-osgi-obr packaging".

The branch, master has been updated
       via  cdecded52acb3913150d237d6cfaacbc8a82545b (commit)
       via  9070d97cd9642daa49dc6c67e38b7a88436d5877 (commit)
      from  10c25216d0bfc452c2db921ad0daf725984a6911 (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 cdecded52acb3913150d237d6cfaacbc8a82545b
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun May 8 19:35:37 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).

commit 9070d97cd9642daa49dc6c67e38b7a88436d5877
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun May 8 19:34:13 2011 +0200

    d/copyright: Change Upstream-Name to match exactly usage of upstream: "Apache Felix OSGi OBR Service API".

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

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

diff --git a/debian/build.xml b/debian/build.xml
index ee5d069..cc2851d 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 66c6f91..ade9172 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+felix-osgi-obr (1.0.2-2) UNRELEASED; urgency=low
+
+  * d/copyright: Change Upstream-Name to match exactly usage of
+    upstream: "Apache Felix OSGi OBR Service API".
+  * 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 <drazzib at debian.org>  Sun, 08 May 2011 19:35:23 +0200
+
 felix-osgi-obr (1.0.2-1) unstable; urgency=low
 
   [ Andres Mejia ]
diff --git a/debian/copyright b/debian/copyright
index fff94ca..d7a4e69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
-Upstream-Name: felix-osgi-obr
+Upstream-Name: Apache Felix OSGi OBR Service API
 Source: http://felix.apache.org/site/downloads.cgi
 
 Files: *
diff --git a/debian/rules b/debian/rules
index 41f4e44..b0f803a 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-osgi-obr packaging