[eclipse-egit] 03/06: Refreshed d/patches/use-distribution-jgit.patch

[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-egit.

commit ed6589b73277b1e62513f1284ee7f1ac2ffe9c47
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Jun 11 22:22:36 2013 +0200

    Refreshed d/patches/use-distribution-jgit.patch
---
 debian/changelog                           |    2 ++
 debian/eclipse.orbitdeps                   |    1 +
 debian/patches/use-distribution-jgit.patch |   17 ++++++++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7921865..b105b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 eclipse-egit (3.0.0-1) UNRELEASED; urgency=low
 
   * New Upstream release.
+  * Refreshed d/patches/use-distribution-jgit.patch.
+  * Add JavaEWAH.jar into orbit dependencies.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 11 Jun 2013 22:17:38 +0200
 
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 2bb8804..37fbf09 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1 +1,2 @@
+JavaEWAH
 org.eclipse.jgit
diff --git a/debian/patches/use-distribution-jgit.patch b/debian/patches/use-distribution-jgit.patch
index f741cc4..8e4ce65 100644
--- a/debian/patches/use-distribution-jgit.patch
+++ b/debian/patches/use-distribution-jgit.patch
@@ -3,18 +3,18 @@ Date: Sun, 13 Nov 2011 22:57:14 +0100
 Subject: use-distribution-jgit
 
 ---
- org.eclipse.egit-feature/feature.xml |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ org.eclipse.egit-feature/feature.xml |   15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
-index 47b9d20..73ad5b4 100644
+index 68c236f..0c3e283 100644
 --- a/org.eclipse.egit-feature/feature.xml
 +++ b/org.eclipse.egit-feature/feature.xml
-@@ -38,10 +38,16 @@
+@@ -38,10 +38,23 @@
        <import plugin="org.eclipse.jsch.ui" version="1.1.100" match="compatible"/>
        <import plugin="org.eclipse.jsch.core" version="1.1.100" match="compatible"/>
        <import plugin="com.jcraft.jsch" version="0.1.37" match="compatible"/>
--      <import feature="org.eclipse.jgit" version="2.3.1" match="equivalent"/>
+-      <import feature="org.eclipse.jgit" version="3.0.0" match="equivalent"/>
     </requires>
  
     <plugin
@@ -25,6 +25,13 @@ index 47b9d20..73ad5b4 100644
 +         unpack="false"/>
 +
 +   <plugin
++         id="com.googlecode.javaewah.JavaEWAH"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
           id="org.eclipse.egit.core"
           download-size="0"
           install-size="0"

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