[SCM] Debian packaging for felix-shell branch, master, updated. debian/1.1.0-1-1-gd473ea2

[Damien Raude-Morvan]

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

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

diff --git a/debian/changelog b/debian/changelog
index 68b73c2..7b63d4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+felix-utils (1.1.0-2) unstable; urgency=low
+
+  * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
+  * d/patches/exclude_servletapi.diff: Drop, not needed now.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 06 Oct 2011 00:58:21 +0200
+
 felix-utils (1.1.0-1) unstable; urgency=low
 
   * Initial release (Closes: #624113).
diff --git a/debian/control b/debian/control
index 7a6d502..8ca8fd9 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, default-jdk-doc, libmaven-javadoc-plugin-java
+ libosgi-core-java, libosgi-compendium-java, default-jdk-doc, libmaven-javadoc-plugin-java
 Standards-Version: 3.9.2
 Homepage: http://felix.apache.org/
 Vcs-Git: git://git.debian.org/git/pkg-java/felix-utils.git
diff --git a/debian/maven.rules b/debian/maven.rules
index d8618e7..764d060 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,5 +16,3 @@
 # 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 1d82414..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-04-30
---- a/pom.xml
-+++ b/pom.xml
-@@ -38,6 +38,12 @@
-       <groupId>org.osgi</groupId>
-       <artifactId>org.osgi.compendium</artifactId>
-       <version>4.1.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
deleted file mode 100644
index 52b845b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-exclude_servletapi.diff

-- 
Debian packaging for felix-shell