[SCM] Eclipse Team provider for the Git version control system branch, master, updated. debian/1.1.0-1-1-g20f35d6

[Jakub Adam]

The following commit has been merged in the master branch:
commit 20f35d66309adacf4d258b5785745e02830d6965
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Nov 13 22:12:23 2011 +0100

    Transition from eclipse-jgit to libjgit-java.

diff --git a/debian/changelog b/debian/changelog
index 8ba67e0..50ee96c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse-egit (1.1.0-2) UNRELEASED; urgency=low
+
+  * Transition from eclipse-jgit to libjgit-java.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 13 Nov 2011 22:13:42 +0100
+
 eclipse-egit (1.1.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #575783)
diff --git a/debian/control b/debian/control
index 8d73532..d57a3ef 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Niels Thykier <niels at thykier.net>,
            Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 8~),
                default-jdk,
-               eclipse-jgit (>= 1.1.0),
+               libjgit-java (>= 1.1.0),
                eclipse-pde (>= 3.7~exp),
                javahelper (>= 0.32~),
                unzip,
@@ -19,7 +19,7 @@ Homepage: http://www.eclipse.org/egit/
 
 Package: eclipse-egit
 Architecture: all
-Depends: eclipse-jgit (>= 1.1.0),
+Depends: libjgit-java (>= 1.1.0),
          eclipse-platform (>= 3.7~exp),
          ${misc:Depends}
 Description: Eclipse Team provider for the Git version control system
diff --git a/debian/eclipse.features b/debian/eclipse.features
index c15f24b..c8aac24 100644
--- a/debian/eclipse.features
+++ b/debian/eclipse.features
@@ -1 +1 @@
-org.eclipse.egit jgit
+org.eclipse.egit
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
new file mode 100644
index 0000000..2bb8804
--- /dev/null
+++ b/debian/eclipse.orbitdeps
@@ -0,0 +1 @@
+org.eclipse.jgit
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..34b2431
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-distribution-jgit.patch
diff --git a/debian/patches/use-distribution-jgit.patch b/debian/patches/use-distribution-jgit.patch
new file mode 100644
index 0000000..4f6969f
--- /dev/null
+++ b/debian/patches/use-distribution-jgit.patch
@@ -0,0 +1,31 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 13 Nov 2011 22:57:14 +0100
+Subject: use-distribution-jgit
+
+---
+ org.eclipse.egit-feature/feature.xml |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
+index 896ac86..6fab9e2 100644
+--- a/org.eclipse.egit-feature/feature.xml
++++ b/org.eclipse.egit-feature/feature.xml
+@@ -43,10 +43,16 @@
+       <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="1.1.0" match="equivalent"/>
+    </requires>
+ 
+    <plugin
++         id="org.eclipse.jgit"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
++   <plugin
+          id="org.eclipse.egit.core"
+          download-size="0"
+          install-size="0"
+-- 

-- 
Eclipse Team provider for the Git version control system