[eclipse-egit] 04/04: Fix build without e4 CSS

[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 90b15a725aa11ed5c82baf8aacf430a30020a7ff
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jun 21 15:03:15 2014 +0200

    Fix build without e4 CSS
---
 debian/changelog                      |  1 +
 debian/patches/build-without-e4.patch | 22 ++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5916f1e..6a7d736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ eclipse-egit (3.4.0-1) UNRELEASED; urgency=medium
 
   * New Upstream release.
   * Refreshed d/patches/use-distribution-jgit.patch.
+  * Fix build without e4 CSS.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 21 Jun 2014 14:54:32 +0200
 
diff --git a/debian/patches/build-without-e4.patch b/debian/patches/build-without-e4.patch
new file mode 100644
index 0000000..dd65113
--- /dev/null
+++ b/debian/patches/build-without-e4.patch
@@ -0,0 +1,22 @@
+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 34b2431..8fa4845 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use-distribution-jgit.patch
+build-without-e4.patch

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