[eclipse-egit] 03/05: Refreshed patches

[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 be328c8a5f312d30c32f9de1cc680ebdba06c183
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Nov 13 21:49:24 2014 +0100

    Refreshed patches
---
 debian/changelog                           |  3 +++
 debian/patches/build-without-e4.patch      | 22 ----------------------
 debian/patches/series                      |  1 -
 debian/patches/use-distribution-jgit.patch |  4 ++--
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0ade63..a846503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 eclipse-egit (3.5.2-1) UNRELEASED; urgency=medium
 
   * New Upstream release.
+  * Refreshed d/patches/use-distribution-jgit.patch.
+  * Drop d/patches/build-without-e4.patch
+    - e4 bundle import was made optional upstream.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 13 Nov 2014 21:42:47 +0100
 
diff --git a/debian/patches/build-without-e4.patch b/debian/patches/build-without-e4.patch
deleted file mode 100644
index dd65113..0000000
--- a/debian/patches/build-without-e4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sat, 21 Jun 2014 15:02:53 +0200
-Subject: build-without-e4
-
----
- org.eclipse.egit.ui/META-INF/MANIFEST.MF | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
-index 694d1e9..fff65d5 100644
---- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF
-+++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
-@@ -29,8 +29,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
-  org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)",
-  org.eclipse.help;bundle-version="[3.4.0,4.0.0)",
-  org.eclipse.search;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
-- org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
-- org.eclipse.e4.ui.css.swt.theme
-+ org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional
- Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Import-Package: org.eclipse.egit.core;version="[3.4.0,3.5.0)",
diff --git a/debian/patches/series b/debian/patches/series
index 8fa4845..34b2431 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 use-distribution-jgit.patch
-build-without-e4.patch
diff --git a/debian/patches/use-distribution-jgit.patch b/debian/patches/use-distribution-jgit.patch
index b718ad4..c6cf861 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, 21 insertions(+), 1 deletion(-)
 
 diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml
-index 521f961..0294f17 100644
+index 7f390de..618b3c0 100644
 --- a/org.eclipse.egit-feature/feature.xml
 +++ b/org.eclipse.egit-feature/feature.xml
 @@ -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"/>
--      <import feature="org.eclipse.jgit" version="3.4.0" match="equivalent"/>
+-      <import feature="org.eclipse.jgit" version="3.5.2" match="equivalent"/>
     </requires>
  
     <plugin

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