[eclipse-egit] 01/01: Add org.eclipse.jgit.java7 to orbitdeps

[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 938625358f8058e386f3d74bbdbd68b2a220b99e
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Aug 17 17:35:25 2013 +0200

    Add org.eclipse.jgit.java7 to orbitdeps
---
 debian/changelog                           |    1 +
 debian/control                             |    2 +-
 debian/eclipse.orbitdeps                   |    1 +
 debian/patches/use-distribution-jgit.patch |   15 +++++++++++----
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79be1ad..48641de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ eclipse-egit (3.0.1-1) UNRELEASED; urgency=low
   * Refreshed d/patches/use-distribution-jgit.patch.
   * Add JavaEWAH.jar into orbit dependencies.
   * Use xz for upstream tarball compression.
+  * Add org.eclipse.jgit.java7 to orbitdeps.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 14 Aug 2013 18:58:43 +0200
 
diff --git a/debian/control b/debian/control
index 90b73f7..532d6ca 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Niels Thykier <niels at thykier.net>,
            Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 8~),
                default-jdk,
-               libjgit-java (>= 2.3.1),
+               libjgit-java (>= 3.0.0),
                eclipse-pde (>= 3.7~exp),
                eclipse-mylyn,
                javahelper (>= 0.32~),
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
index 37fbf09..69c2a14 100644
--- a/debian/eclipse.orbitdeps
+++ b/debian/eclipse.orbitdeps
@@ -1,2 +1,3 @@
 JavaEWAH
 org.eclipse.jgit
+org.eclipse.jgit.java7
diff --git a/debian/patches/use-distribution-jgit.patch b/debian/patches/use-distribution-jgit.patch
index 8e4ce65..1624a2d 100644
--- a/debian/patches/use-distribution-jgit.patch
+++ b/debian/patches/use-distribution-jgit.patch
@@ -3,14 +3,14 @@ Date: Sun, 13 Nov 2011 22:57:14 +0100
 Subject: use-distribution-jgit
 
 ---
- org.eclipse.egit-feature/feature.xml |   15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
+ org.eclipse.egit-feature/feature.xml |   22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
-index 68c236f..0c3e283 100644
+index 4e1f2ba..8293a3a 100644
 --- a/org.eclipse.egit-feature/feature.xml
 +++ b/org.eclipse.egit-feature/feature.xml
-@@ -38,10 +38,23 @@
+@@ -38,10 +38,30 @@
        <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"/>
@@ -25,6 +25,13 @@ index 68c236f..0c3e283 100644
 +         unpack="false"/>
 +
 +   <plugin
++         id="org.eclipse.jgit.java7"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
 +         id="com.googlecode.javaewah.JavaEWAH"
 +         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