[eclipse-linuxtools] 11/14: Remove versions from dependencies in JAR manifests

Jakub Adam xhaakon-guest at moszumanska.debian.org
Wed Feb 12 17:37:22 UTC 2014


This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-linuxtools.

commit 5520eb0da217053d82fbe75af7bb13f0e1655f33
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Feb 11 18:52:00 2014 +0100

    Remove versions from dependencies in JAR manifests
---
 debian/patches/series                      |  2 +-
 debian/patches/unversioned-deps.patch      | 35 ++++++++++++++++++++++++++++++
 debian/patches/unversioned-orbitdeps.patch | 21 ------------------
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 44ccdfb..4b852fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 valgrind-add-swtchart.patch
 libhover-fix-automake-texinfo-parser.patch
 fix-bundle-build-order.patch
-unversioned-orbitdeps.patch
+unversioned-deps.patch
 remove-license-feature.patch
diff --git a/debian/patches/unversioned-deps.patch b/debian/patches/unversioned-deps.patch
new file mode 100644
index 0000000..b7ca856
--- /dev/null
+++ b/debian/patches/unversioned-deps.patch
@@ -0,0 +1,35 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 26 Jul 2012 18:45:09 +0200
+Subject: unversioned-deps
+
+---
+ perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF           | 2 +-
+ profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF b/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
+index c97c035..ee6c18f 100644
+--- a/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
++++ b/perf/org.eclipse.linuxtools.perf/META-INF/MANIFEST.MF
+@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui,
+  org.eclipse.cdt.launch;bundle-version="7.0.0",
+  org.eclipse.linuxtools.profiling.ui;bundle-version="0.9.0",
+  org.eclipse.ui.ide,
+- org.eclipse.team.ui;bundle-version="3.7.1"
++ org.eclipse.team.ui
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ActivationPolicy: lazy
+ Import-Package: org.eclipse.compare,
+diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
+index 2a92ba7..51332d9 100644
+--- a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
++++ b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
+@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
+  org.eclipse.linuxtools.profiling.launch;bundle-version="0.8.0",
+  org.eclipse.core.resources;bundle-version="3.7.100",
+  org.eclipse.core.filesystem;bundle-version="1.3.100",
+- com.jcraft.jsch;bundle-version="0.1.44"
++ com.jcraft.jsch
+ Bundle-ActivationPolicy: lazy
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-Localization: plugin
diff --git a/debian/patches/unversioned-orbitdeps.patch b/debian/patches/unversioned-orbitdeps.patch
deleted file mode 100644
index 7878b20..0000000
--- a/debian/patches/unversioned-orbitdeps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Thu, 26 Jul 2012 18:45:09 +0200
-Subject: unversioned-orbitdeps
-
----
- profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
-index ae33b47..41c349c 100644
---- a/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
-+++ b/profiling/org.eclipse.linuxtools.ssh.proxy/META-INF/MANIFEST.MF
-@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
-  org.eclipse.linuxtools.profiling.launch;bundle-version="0.8.0",
-  org.eclipse.core.resources;bundle-version="3.7.100",
-  org.eclipse.core.filesystem;bundle-version="1.3.100",
-- com.jcraft.jsch;bundle-version="0.1.44"
-+ com.jcraft.jsch
- Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-Localization: plugin

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



More information about the pkg-java-commits mailing list