[SCM] felix-osgi-obr packaging branch, master, updated. debian/1.0.2-0ubuntu1-8-g45782a1

Andres Mejia ceros-guest at alioth.debian.org
Sun Jan 9 21:58:04 UTC 2011


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  45782a17af058742771b964f55317371ec3b8fdf (commit)
       via  845e72be382fa3a03cadbeffbfa89542900afc73 (commit)
      from  9af09338c17c5f9b1d8af9c3c59c37babb237614 (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 45782a17af058742771b964f55317371ec3b8fdf
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 16:57:46 2011 -0500

    Add substitution variables in debian/control used with javahelper.

commit 845e72be382fa3a03cadbeffbfa89542900afc73
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 16:52:27 2011 -0500

    Remove unnecessary use of ANT_HOME environment variable.

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

Summary of changes:
 debian/changelog |    3 ++-
 debian/control   |    3 ++-
 debian/rules     |    1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 473a280..3204c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ felix-osgi-obr (1.0.2-1) unstable; urgency=low
   * Add Debian Java team as Maintainer, Yulia and myself as Uploaders.
   * Bump to Standards-Version 3.9.1.
   * Convert to pure dh with javahelper for packaging.
+  * Add substitution variables in debian/control used with javahelper.
 
- -- Andres Mejia <mcitadel at gmail.com>  Sun, 09 Jan 2011 16:35:43 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 09 Jan 2011 16:54:03 -0500
 
 felix-osgi-obr (1.0.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index a826f96..355aa5a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/felix-osgi-obr.git
 
 Package: libfelix-osgi-obr-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, 
+Depends: ${shlibs:Depends}, ${java:Depends}, ${misc:Depends}, 
  default-jre-headless | java2-runtime-headless, libequinox-osgi-java
 Suggests: libfelix-osgi-obr-java-doc
 Description: OSGi OBR Service API
@@ -26,6 +26,7 @@ Package: libfelix-osgi-obr-java-doc
 Architecture: all
 Section: doc
 Depends:  ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: Javadoc API for OSGi OBR Service API
  The goal of the Apache Felix OSGi Bundle Repository (OBR) is two-fold:
  1. To simplify deploying and using available bundles with Felix.
diff --git a/debian/rules b/debian/rules
index 5a6c3e4..e241321 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/
 JAVA_HOME		:= /usr/lib/jvm/default-java
 CLASSPATH		:= /usr/share/java/org.eclipse.osgi.jar
 JAR_NAME		:= org.osgi.service.obr
-ANT_HOME		:= /usr/share/ant
 ANT_BUILDFILE		:= ./debian/build.xml
 ANT_BUILD_TARGET	:= build javadoc
 ANT_ARGS		:= -Dbuild.sysclasspath=first \


hooks/post-receive
-- 
felix-osgi-obr packaging



More information about the pkg-java-commits mailing list