[SCM] eclipse-linuxtools packaging branch, master, updated. debian/1.0.0-1-7-g6a72384

Jakub Adam jakub.adam at ktknet.cz
Thu Jul 26 17:33:02 UTC 2012


The following commit has been merged in the master branch:
commit 6a7238496d21c79cffdb0722d12a475936b94e1f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jul 26 18:57:52 2012 +0200

    Remove versions from orbit dependencies

diff --git a/debian/changelog b/debian/changelog
index cbcbcf4..9390f87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse-linuxtools (1.1.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Refreshed d/patches/remote-profiling-disable-rdt-proxy.patch.
   * Fix bundle build order.
+  * Remove versions from Orbit dependencies.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 26 Jul 2012 17:28:07 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 6ad8b71..225c6fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ valgrind-remote-unversioned-rse-dependency.patch
 remote-profiling-disable-rdt-proxy.patch
 libhover-fix-automake-texinfo-parser.patch
 fix-bundle-build-order.patch
+unversioned-orbitdeps.patch
diff --git a/debian/patches/unversioned-orbitdeps.patch b/debian/patches/unversioned-orbitdeps.patch
new file mode 100644
index 0000000..7878b20
--- /dev/null
+++ b/debian/patches/unversioned-orbitdeps.patch
@@ -0,0 +1,21 @@
+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

-- 
eclipse-linuxtools packaging



More information about the pkg-java-commits mailing list