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

Jakub Adam jakub.adam at ktknet.cz
Thu Dec 20 22:13:23 UTC 2012


The following commit has been merged in the master branch:
commit 130fbe312ec415407b291cd920f6ced32a5c39c3
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Dec 20 22:43:39 2012 +0100

    Refreshed d/patches/use-distribution-jgit.patch

diff --git a/debian/changelog b/debian/changelog
index e73cc14..7f2c09a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ eclipse-egit (2.2.0-1) UNRELEASED; urgency=low
 
   * New Upstream release.
   * Update Build-Dep on libjgit-java to 2.2.0.
+  * Refreshed d/patches/use-distribution-jgit.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 20 Dec 2012 22:36:33 +0100
 
diff --git a/debian/patches/use-distribution-jgit.patch b/debian/patches/use-distribution-jgit.patch
index 3f4878a..329a99c 100644
--- a/debian/patches/use-distribution-jgit.patch
+++ b/debian/patches/use-distribution-jgit.patch
@@ -7,14 +7,14 @@ Subject: use-distribution-jgit
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
-index 157d3de..02078b6 100644
+index aaac6ff..3cfa40e 100644
 --- a/org.eclipse.egit-feature/feature.xml
 +++ b/org.eclipse.egit-feature/feature.xml
-@@ -43,10 +43,16 @@
+@@ -38,10 +38,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="2.1.0" match="equivalent"/>
+-      <import feature="org.eclipse.jgit" version="2.2.0" match="equivalent"/>
     </requires>
  
     <plugin

-- 
Eclipse Team provider for the Git version control system



More information about the pkg-java-commits mailing list