[SCM] felix-framework packaging branch, master, updated. debian/2.0.5-2-2-gbd756d4

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit bd756d449fe0a2f3e5d12e63e2c42cabc49c8b91
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Thu Oct 6 00:07:00 2011 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 405561f..bec40bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-felix-framework (2.0.5-3) UNRELEASED; urgency=low
+felix-framework (2.0.5-3) unstable; urgency=low
 
+  [ Andres Mejia ]
   * Update to my @debian.org email.
 
- -- Andres Mejia <amejia at debian.org>  Sun, 17 Jul 2011 13:37:27 -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:37 +0200
 
 felix-framework (2.0.5-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 87d120f..437cffe 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), cdbs, default-jdk, maven-debian-helper (>= 1.4),
- libequinox-osgi-java, libmaven-bundle-plugin-java,
+ libosgi-core-java, libosgi-compendium-java, libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java
 Standards-Version: 3.9.2
 Homepage: http://felix.apache.org/site/apache-felix-framework.html
diff --git a/debian/maven.rules b/debian/maven.rules
index f08b46d..ce4a3fd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -15,6 +15,3 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
-
-s/org.osgi/org.eclipse.osgi/ s/org.osgi.compendium/org.eclipse.osgi.services/ jar s/.*/debian/ * *
-s/org.osgi/org.eclipse.osgi/ s/org.osgi.core/org.eclipse.osgi/ jar s/.*/debian/ * *
\ No newline at end of file

-- 
felix-framework packaging