[SCM] felix-osgi-obr packaging branch, master, updated. debian/1.0.2-2-2-g7c266e7

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 7c266e71d923b8fabbb9f78dac5ac1b0bc6a5271
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Oct 2 20:01:52 2011 +0200

    Build-Depends on libosgi-core-java instead of libequinox-osgi-java.

diff --git a/debian/changelog b/debian/changelog
index 5a0975e..7cedc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-felix-osgi-obr (1.0.2-3) UNRELEASED; urgency=low
+felix-osgi-obr (1.0.2-3) unstable; urgency=low
 
+  [ Andres Mejia ]
   * Update to my @debian.org email.
 
- -- Andres Mejia <amejia at debian.org>  Sun, 17 Jul 2011 13:42:44 -0400
+  [ Damien Raude-Morvan ]
+  * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 06 Oct 2011 00:58:12 +0200
 
 felix-osgi-obr (1.0.2-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1e85677..e5dbe49 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
  Andres Mejia <amejia at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7.3.3), javahelper, default-jdk
-Build-Depends-Indep: ant, libequinox-osgi-java, maven-repo-helper (>= 1.1)
+Build-Depends-Indep: ant, libosgi-core-java, maven-repo-helper (>= 1.1)
 Standards-Version: 3.9.2
 Homepage: http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html
 Vcs-Git: git://git.debian.org/git/pkg-java/felix-osgi-obr.git
@@ -14,7 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/felix-osgi-obr.git
 Package: libfelix-osgi-obr-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}, 
- libequinox-osgi-java
+ libosgi-core-java
 Suggests: libfelix-osgi-obr-java-doc
 Description: OSGi OBR Service API
  The goal of the Apache Felix OSGi Bundle Repository (OBR) is two-fold:
diff --git a/debian/maven.rules b/debian/maven.rules
index 43fd4e0..9c5209b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1 @@
-s/org\.apache\.felix/org.eclipse.osgi/ s/org\.osgi\.core/org.eclipse.osgi/ * s/.*/debian/
-
+s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/
diff --git a/debian/rules b/debian/rules
index b0f803a..5b282e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 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
+CLASSPATH		:= /usr/share/java/osgi.core.jar
 JAR_NAME		:= org.osgi.service.obr
 ANT_BUILDFILE		:= ./debian/build.xml
 ANT_BUILD_TARGET	:= build javadoc

-- 
felix-osgi-obr packaging