This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-mylyn.
commit b495528914553da61fa426efdb708ae5294cdb51 Author: Jakub Adam <[email protected]> Date: Thu Nov 14 17:06:28 2013 +0100 Removed d/patches/rebuild-prepare-install-profile-job-3-6.patch --- debian/changelog | 2 + .../rebuild-prepare-install-profile-job-3-6.patch | 73 -------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 74 deletions(-) diff --git a/debian/changelog b/debian/changelog index 947af02..d23e9ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ eclipse-mylyn (3.10.0-1) UNRELEASED; urgency=low * Support Bugzilla authenticated solely via HTTP. * Fixed d/watch to support multiple digits in version number components. * Refreshed d/patches/debian-orbit-deps.patch. + * Removed d/patches/rebuild-prepare-install-profile-job-3-6.patch + - support for Eclipse 3.5 removed upstream. -- Jakub Adam <[email protected]> Mon, 14 Oct 2013 17:49:11 +0200 diff --git a/debian/patches/rebuild-prepare-install-profile-job-3-6.patch b/debian/patches/rebuild-prepare-install-profile-job-3-6.patch deleted file mode 100644 index 76bfe01..0000000 --- a/debian/patches/rebuild-prepare-install-profile-job-3-6.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Fri, 3 Aug 2012 19:13:14 +0200 -Subject: rebuild-prepare-install-profile-job-3-6 - ---- - .../org.eclipse.mylyn.discovery.ui/build.properties | 5 ++--- - .../org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml | 8 -------- - .../eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java | 11 +---------- - 3 files changed, 3 insertions(+), 21 deletions(-) - -diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/build.properties b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/build.properties -index ebba0e6..b4fb17c 100644 ---- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/build.properties -+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/build.properties -@@ -8,15 +8,14 @@ - # Contributors: - # Tasktop Technologies - initial API and implementation - ############################################################################### --source.. = src/ -+source.. = src/,\ -+ src-e3.6/ - output.. = bin/ - bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - about.html,\ - icons/,\ -- lib-e3.5/,\ -- lib-e3.6/,\ - plugin.properties - src.includes = about.html,\ - src-e3.5/,\ -diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml -index 003b95d..85bbd15 100644 ---- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml -+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/customBuildCallbacks.xml -@@ -27,14 +27,6 @@ - <!-- build.result.folder - folder to contain the build results --> - <!-- ===================================================================== --> - <target name="pre.build.jars"> -- <uptodate property="isUpToDate-e3.5" -- srcfile="src-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.java" -- targetfile="lib-e3.5/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_5.class"/> -- <fail unless="isUpToDate-e3.5"/> -- <uptodate property="isUpToDate-e3.6" -- srcfile="src-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.java" -- targetfile="lib-e3.6/org/eclipse/mylyn/internal/discovery/ui/PrepareInstallProfileJob_e_3_6.class"/> -- <fail unless="isUpToDate-e3.6"/> - </target> - - <!-- ===================================================================== --> -diff --git a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java -index b76e697..45174f5 100644 ---- a/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java -+++ b/org.eclipse.mylyn.commons/org.eclipse.mylyn.discovery.ui/src/org/eclipse/mylyn/internal/discovery/ui/DiscoveryUi.java -@@ -49,16 +49,7 @@ public abstract class DiscoveryUi { - } - - public static AbstractInstallJob createInstallJob(List<ConnectorDescriptor> descriptors) { -- AbstractInstallJob runner = null; -- Bundle bundle = Platform.getBundle("org.eclipse.equinox.p2.engine"); //$NON-NLS-1$ -- if (bundle != null && new VersionRange("[1.0.0,1.1.0)").isIncluded(CoreUtil.getVersion(bundle))) { //$NON-NLS-1$ -- // load class for Eclipse 3.5 -- runner = new PrepareInstallProfileJob_e_3_5(descriptors); -- } -- if (runner == null) { -- runner = new PrepareInstallProfileJob_e_3_6(descriptors); -- } -- return runner; -+ return new PrepareInstallProfileJob_e_3_6(descriptors); - } - - public static boolean install(List<ConnectorDescriptor> descriptors, IRunnableContext context) { diff --git a/debian/patches/series b/debian/patches/series index 23624aa..1e440d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ debian-orbit-deps.patch -rebuild-prepare-install-profile-job-3-6.patch remove-eclipse-ecf-usage.patch mylyn-builds-fix-ecore-repository-location.patch org.eclipse.mylyn.ide.ui-to-context-common.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-mylyn.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
