[SCM] felix-framework packaging branch, master, updated. debian/2.0.5-3-9-g45790a6

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit bc11e79c0784f00ed46cc3f176eb7d474ff7fa10
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sat Nov 5 14:36:18 2011 +0100

    d/patches/exclude_servletapi.diff: Dropped, not needed anymore.

diff --git a/debian/changelog b/debian/changelog
index 9bfbe66..bf19aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ felix-framework (4.0.1-1) unstable; urgency=low
   * New upstream release.
   * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
   * d/watch: fix for upstream tarball new name.
+  * d/patches/exclude_servletapi.diff: Dropped, not needed anymore.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 05 Nov 2011 14:26:31 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 05 Nov 2011 14:36:15 +0100
 
 felix-framework (2.0.5-2) unstable; urgency=low
 
diff --git a/debian/patches/exclude_servletapi.diff b/debian/patches/exclude_servletapi.diff
deleted file mode 100644
index 85c5882..0000000
--- a/debian/patches/exclude_servletapi.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Disable transitive dependency on servlet-api
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwared: no
-Last-Update: 2011-05-11
---- a/pom.xml
-+++ b/pom.xml
-@@ -39,6 +39,12 @@
-       <groupId>org.osgi</groupId>
-       <artifactId>org.osgi.compendium</artifactId>
-       <version>4.2.0</version>
-+      <exclusions>
-+        <exclusion>
-+          <groupId>javax.servlet</groupId>
-+          <artifactId>servlet-api</artifactId>
-+        </exclusion>
-+      </exclusions>
-     </dependency>
-   </dependencies>
-   <properties>
diff --git a/debian/patches/series b/debian/patches/series
index 54589a4..f8b50dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 # Only for bootstrapping
 #bootstrap_packaging_jar.diff
-exclude_servletapi.diff

-- 
felix-framework packaging