[felix-utils] 02/04: Refreshed the patch

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jan 16 10:21:48 UTC 2017


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository felix-utils.

commit 5f1d64909b04f5ba39f2b5400d48c75f87aa5292
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 16 11:16:30 2017 +0100

    Refreshed the patch
---
 debian/changelog               | 8 ++++++++
 debian/patches/fix_osgi43.diff | 6 ++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dcd7f8..468b118 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+felix-utils (1.8.6-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 Jan 2017 11:15:53 +0100
+
 felix-utils (1.8.4-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix_osgi43.diff b/debian/patches/fix_osgi43.diff
index dc07fc0..c941ef3 100644
--- a/debian/patches/fix_osgi43.diff
+++ b/debian/patches/fix_osgi43.diff
@@ -2,11 +2,9 @@ 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 @@
+@@ -188,6 +188,23 @@
      public boolean matchCase(Map map) {
          return match0(map);
      }
@@ -30,7 +28,7 @@ Index: b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java
  
      /**
       * Returns this <code>Filter</code>'s filter string.
-@@ -575,13 +592,13 @@
+@@ -586,13 +603,13 @@
                  switch (operation) {
                      case APPROX :
                      case EQUAL : {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-utils.git



More information about the pkg-java-commits mailing list