[SCM] Debian packaging for felix-shell branch, master, updated. debian/1.4.2-2-1-g57e3c65

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 57e3c6551a1a663cfc62eb703341dea6d9073a5c
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Oct 2 23:35:06 2011 +0200

    * d/patches/exclude_servletapi.diff: Drop, not needed now.
    * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.

diff --git a/debian/changelog b/debian/changelog
index a7823bc..aacb3aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+felix-shell (1.4.2-3) unstable; urgency=low
+
+  * d/patches/exclude_servletapi.diff: Drop, not needed now.
+  * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 06 Oct 2011 00:58:26 +0200
+
 felix-shell (1.4.2-2) unstable; urgency=low
 
   * d/control: Drop unneeded Build-Depends and rebuild
diff --git a/debian/control b/debian/control
index 6e1bc4f..b65e8c5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: 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,
  default-jdk-doc, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.2
 Homepage: http://felix.apache.org/site/apache-felix-shell.html
diff --git a/debian/maven.rules b/debian/maven.rules
index d8618e7..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/ * *
diff --git a/debian/patches/exclude_servletapi.diff b/debian/patches/exclude_servletapi.diff
deleted file mode 100644
index fe54966..0000000
--- a/debian/patches/exclude_servletapi.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Disable transitive dependency on servlet-api
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwared: no
-Last-Update: 2011-04-30
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -38,6 +38,12 @@
-       <groupId>org.osgi</groupId>
-       <artifactId>org.osgi.compendium</artifactId>
-       <version>4.0.0</version>
-+      <exclusions>
-+        <exclusion>
-+          <groupId>javax.servlet</groupId>
-+          <artifactId>servlet-api</artifactId>
-+        </exclusion>
-+      </exclusions>
-     </dependency>    
-   </dependencies>
-   <build>
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

-- 
Debian packaging for felix-shell