[eclipse-pydev] 02/02: Replace dependency on libjaffl-java with libjnr-ffi-java

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository eclipse-pydev.

commit cadd9ff4e4a66865912c504aff8551ac59e943cd
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jun 20 23:44:20 2015 +0200

    Replace dependency on libjaffl-java with libjnr-ffi-java
---
 debian/changelog                                   |  7 +++++-
 debian/control                                     |  3 ++-
 debian/eclipse.orbitdeps                           |  3 ++-
 .../add-orbit-dependencies-feature.xml.patch       | 26 +++++++++++++---------
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69cd0fd..1530349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 eclipse-pydev (3.9.2-3) UNRELEASED; urgency=medium
 
+  [ Miguel Landaeta ]
   * Team upload.
   * Replace dependency on libconstantine-java with libjnr-constants-java.
 
- -- Miguel Landaeta <nomadium at debian.org>  Sat, 09 May 2015 19:25:24 -0300
+  [ Jakub Adam ]
+  * Replace dependency on libjaffl-java with libjnr-ffi-java
+    (Closes: #789510).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 25 Jun 2015 11:56:35 +0200
 
 eclipse-pydev (3.9.2-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 6b5c201..a3ee497 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,10 @@ Build-Depends:
  libasm3-java (>= 3.3.2-2),
  libjnr-constants-java (>= 0.8.6-6),
  libguava-java (>= 13.0.1-2),
- libjaffl-java (>= 0.5.9-2),
  libjffi-java (>= 1.0.2-10),
+ libjnr-ffi-java (>= 1.0.10-3),
  libjnr-posix-java (>= 1.1.8-2),
+ libjnr-x86asm-java (>= 1.0.2-3),
  libjpathwatch-java,
  libxerces2-java,
  libxmlrpc3-client-java,
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 38a1563..113d607 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -3,9 +3,10 @@ asm3-all
 atinject-jsr330-api
 jnr-constants
 guava
-jaffl
 jffi
+jnr-ffi
 jnr-posix
+jnr-x86asm
 jpathwatch
 jython
 ws-commons-util
diff --git a/debian/patches/add-orbit-dependencies-feature.xml.patch b/debian/patches/add-orbit-dependencies-feature.xml.patch
index 78a0e24..ee72b7f 100644
--- a/debian/patches/add-orbit-dependencies-feature.xml.patch
+++ b/debian/patches/add-orbit-dependencies-feature.xml.patch
@@ -6,14 +6,14 @@ Declare new orbit (build) dependencies here.
 
 Forwarded: not-needed
 ---
- features/org.python.pydev.feature/feature.xml | 108 ++++++++++++++++++++++++++
- 1 file changed, 108 insertions(+)
+ features/org.python.pydev.feature/feature.xml | 114 ++++++++++++++++++++++++++
+ 1 file changed, 114 insertions(+)
 
 diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml
-index 94dc59d..439c739 100644
+index 94dc59d..3220650 100644
 --- a/features/org.python.pydev.feature/feature.xml
 +++ b/features/org.python.pydev.feature/feature.xml
-@@ -240,4 +240,112 @@ This Agreement is governed by the laws of the State of New York and the intellec
+@@ -240,4 +240,118 @@ This Agreement is governed by the laws of the State of New York and the intellec
           install-size="160"
           version="3.9.2.qualifier"/>
  
@@ -24,6 +24,18 @@ index 94dc59d..439c739 100644
 +         version="0.0.0"
 +         unpack="false"/>
 +   <plugin
++         id="jnr.ffi"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++   <plugin
++         id="jnr.x86asm"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++   <plugin
 +         id="org.apache.xmlrpc"
 +         download-size="0"
 +         install-size="0"
@@ -72,12 +84,6 @@ index 94dc59d..439c739 100644
 +         version="0.0.0"
 +         unpack="false"/>
 +   <plugin
-+         id="com.kenai.jaffl"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/>
-+   <plugin
 +         id="com.kenai.jffi"
 +         download-size="0"
 +         install-size="0"

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