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

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 3fc65c7ef57f99d2fd13b22869a3ca45f713dcb4
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Fri Dec 16 23:59:50 2011 +0100

    d/patches/fix_osgi43.diff: Fix for OSGI 4.3 API.

diff --git a/debian/changelog b/debian/changelog
index 7b63d4c..7c55e48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+felix-utils (1.1.0-3) unstable; urgency=low
+
+  * d/patches/fix_osgi43.diff: Fix for OSGI 4.3 API (Closes: #652241).
+  * d/control: Build-Depends on libosgi-core-java (>= 4.3).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 17 Dec 2011 00:13:13 +0100
+
 felix-utils (1.1.0-2) unstable; urgency=low
 
   * Build-Depends on libosgi-core-java instead of libequinox-osgi-java.
diff --git a/debian/control b/debian/control
index 8ca8fd9..cc2388d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,14 @@ Section: java
 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),
- libosgi-core-java, libosgi-compendium-java, default-jdk-doc, libmaven-javadoc-plugin-java
+Build-Depends: cdbs,
+               debhelper (>= 7),
+               default-jdk,
+               default-jdk-doc,
+               libmaven-javadoc-plugin-java,
+               libosgi-compendium-java,
+               libosgi-core-java (>= 4.3),
+               maven-debian-helper (>= 1.4)
 Standards-Version: 3.9.2
 Homepage: http://felix.apache.org/
 Vcs-Git: git://git.debian.org/git/pkg-java/felix-utils.git
@@ -12,11 +18,11 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/felix-utils.git
 
 Package: libfelix-utils-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libfelix-utils-java-doc
 Description: collection of utility classes for Apache Felix
- The Felix project is an implementation 
+ The Felix project is an implementation
  of the OSGi R4.2 core framework specification.
  .
  OSGi framework is a module system and service platform
@@ -25,15 +31,15 @@ Description: collection of utility classes for Apache Felix
  .
  This subproject provides a collection of utility classes used
  by others components of Apache Felix.
- 
+
 Package: libfelix-utils-java-doc
 Architecture: all
 Section: doc
-Depends:  ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
 Suggests: libfelix-utils-java
 Description: collection of utility classes for Apache Felix - documentation
- The Felix project is an implementation 
+ The Felix project is an implementation
  of the OSGi R4.2 core framework specification.
  .
  OSGi framework is a module system and service platform
diff --git a/debian/copyright b/debian/copyright
index 686a75e..7fce62b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,5 +14,3 @@ License: Apache-2.0
 License: Apache-2.0
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
-
-
diff --git a/debian/patches/fix_osgi43.diff b/debian/patches/fix_osgi43.diff
new file mode 100644
index 0000000..dc07fc0
--- /dev/null
+++ b/debian/patches/fix_osgi43.diff
@@ -0,0 +1,49 @@
+Description: Fix FilterImpl for new OSGI 4.3 API.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-12-17
+Forwarded: no
+Index: b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java
+===================================================================
+--- a/src/main/java/org/apache/felix/utils/filter/FilterImpl.java
++++ b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java
+@@ -177,6 +177,23 @@
+     public boolean matchCase(Map map) {
+         return match0(map);
+     }
++    
++    /**
++     * Filter using a <code>Map</code>. This <code>Filter</code> is
++     * executed using the specified <code>Map</code>'s keys and
++     * values. The keys are case insensitively matched with this
++     * <code>Filter</code>.
++     *
++     * @param map The <code>Map</code> whose keys are used in
++     *        the match.
++     * @return <code>true</code> if the <code>Map</code>'s keys and
++     *         values match this filter; <code>false</code> otherwise.
++     * @throws IllegalArgumentException If <code>map</code> contains
++     *         case variants of the same key name.
++     */
++    public boolean matches(Map<String, ?> map) {
++        return matchCase(map);
++    }
+ 
+     /**
+      * Returns this <code>Filter</code>'s filter string.
+@@ -575,13 +592,13 @@
+                 switch (operation) {
+                     case APPROX :
+                     case EQUAL : {
+-                        return ((Version) value1).compareTo(converted) == 0;
++                        return ((Version) value1).compareTo((Version) converted) == 0;
+                     }
+                     case GREATER: {
+-                        return ((Version) value1).compareTo(converted) >= 0;
++                        return ((Version) value1).compareTo((Version) converted) >= 0;
+                     }
+                     case LESS: {
+-                        return ((Version) value1).compareTo(converted) <= 0;
++                        return ((Version) value1).compareTo((Version) converted) <= 0;
+                     }
+                 }
+             } else {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d62b695
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_osgi43.diff

-- 
Debian packaging for felix-shell