[Git][java-team/eclipse-wtp][master] 3 commits: Fix FTBFS due to update in libeclipse-jface-text-java
Sudip Mukherjee
gitlab at salsa.debian.org
Fri Oct 9 22:21:43 BST 2020
Sudip Mukherjee pushed to branch master at Debian Java Maintainers / eclipse-wtp
Commits:
81c804ee by Sudip Mukherjee at 2020-10-09T21:39:20+01:00
Fix FTBFS due to update in libeclipse-jface-text-java
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
0549654c by Sudip Mukherjee at 2020-10-09T21:39:48+01:00
Add superficial autopkgtest
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
c28db841 by Sudip Mukherjee at 2020-10-09T21:41:36+01:00
Add changelog for 3.18-4 release
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
- - - - -
5 changed files:
- debian/changelog
- + debian/patches/0001-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
- + debian/patches/fix_jface_text.patch
- debian/patches/series
- + debian/tests/control
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+eclipse-wtp (3.18-4) unstable; urgency=medium
+
+ * Fix FTBFS due to update in libeclipse-jface-text-java.
+ * Add superficial autopkgtest.
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com> Fri, 09 Oct 2020 21:41:08 +0100
+
eclipse-wtp (3.18-3) unstable; urgency=medium
* Use versionless dependency in manifest file.
=====================================
debian/patches/0001-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
=====================================
@@ -0,0 +1,124 @@
+From 5dd251905b5179b9b583da56265f0f5ab208787f Mon Sep 17 00:00:00 2001
+From: Nitin Dahyabhai <thatnitind at gmail.com>
+Date: Sun, 9 Aug 2020 03:26:37 -0400
+Subject: [PATCH] [528191] Replace uses of org.eclipse.jface.util.Assert and
+ org.eclipse.jface.text.Assert because of their deletion.
+
+---
+
+upstream link: https://git.eclipse.org/c/sourceediting/webtools.sourceediting.git/commit/?id=5dd251905b5179b9b583da56265f0f5ab208787f
+
+diff --git a/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/cleanup/StructuredContentCleanupHandlerImpl.java b/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/cleanup/StructuredContentCleanupHandlerImpl.java
+index 033bed456..cf2ec62b6 100644
+--- a/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/cleanup/StructuredContentCleanupHandlerImpl.java
++++ b/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/cleanup/StructuredContentCleanupHandlerImpl.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2001, 2005 IBM Corporation and others.
++ * Copyright (c) 2001, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -17,10 +17,10 @@ package org.eclipse.wst.sse.core.internal.cleanup;
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import org.eclipse.jface.text.Assert;
++import org.eclipse.core.runtime.Assert;
+
+ public class StructuredContentCleanupHandlerImpl implements StructuredContentCleanupHandler {
+- protected Map fCleanupProcessors;
++ protected Map<String,IStructuredCleanupProcessor> fCleanupProcessors;
+
+ public IStructuredCleanupProcessor getCleanupProcessor(String contentType) {
+ Assert.isNotNull(contentType);
+@@ -28,14 +28,14 @@ public class StructuredContentCleanupHandlerImpl implements StructuredContentCle
+ if (fCleanupProcessors == null)
+ return null;
+
+- return (IStructuredCleanupProcessor) fCleanupProcessors.get(contentType);
++ return fCleanupProcessors.get(contentType);
+ }
+
+ public void setCleanupProcessor(IStructuredCleanupProcessor cleanupProcessor, String contentType) {
+ Assert.isNotNull(contentType);
+
+ if (fCleanupProcessors == null)
+- fCleanupProcessors = new HashMap();
++ fCleanupProcessors = new HashMap<>();
+
+ if (fCleanupProcessors == null)
+ fCleanupProcessors.remove(contentType);
+diff --git a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/hyperlink/HighlighterHyperlinkPresenter.java b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/hyperlink/HighlighterHyperlinkPresenter.java
+index 6045cd5e2..975786461 100644
+--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/hyperlink/HighlighterHyperlinkPresenter.java
++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/hyperlink/HighlighterHyperlinkPresenter.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2005 IBM Corporation and others.
++ * Copyright (c) 2005, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -12,9 +12,9 @@
+ *******************************************************************************/
+ package org.eclipse.wst.sse.ui.internal.hyperlink;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.jface.preference.IPreferenceStore;
+ import org.eclipse.jface.preference.PreferenceConverter;
+-import org.eclipse.jface.text.Assert;
+ import org.eclipse.jface.text.BadLocationException;
+ import org.eclipse.jface.text.DocumentEvent;
+ import org.eclipse.jface.text.IDocument;
+diff --git a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/OverlayPreferenceStore.java b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/OverlayPreferenceStore.java
+index 5d285b81b..bb3949640 100644
+--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/OverlayPreferenceStore.java
++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/OverlayPreferenceStore.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2001, 2005 IBM Corporation and others.
++ * Copyright (c) 2001, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -14,9 +14,9 @@
+ *******************************************************************************/
+ package org.eclipse.wst.sse.ui.internal.preferences;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.jface.preference.IPreferenceStore;
+ import org.eclipse.jface.preference.PreferenceStore;
+-import org.eclipse.jface.text.Assert;
+ import org.eclipse.jface.util.IPropertyChangeListener;
+ import org.eclipse.jface.util.PropertyChangeEvent;
+
+diff --git a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TranslucencyPreferenceTab.java b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TranslucencyPreferenceTab.java
+index 2e568434d..890447f59 100644
+--- a/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TranslucencyPreferenceTab.java
++++ b/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TranslucencyPreferenceTab.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2001, 2005 IBM Corporation and others.
++ * Copyright (c) 2001, 2020 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+@@ -14,13 +14,13 @@
+ *******************************************************************************/
+ package org.eclipse.wst.sse.ui.internal.preferences.ui;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.jface.preference.FieldEditor;
+ import org.eclipse.jface.preference.IPreferenceStore;
+ import org.eclipse.jface.preference.IntegerFieldEditor;
+ import org.eclipse.jface.preference.PreferencePage;
+ import org.eclipse.jface.preference.StringFieldEditor;
+ import org.eclipse.jface.resource.JFaceResources;
+-import org.eclipse.jface.text.Assert;
+ import org.eclipse.jface.util.IPropertyChangeListener;
+ import org.eclipse.jface.util.PropertyChangeEvent;
+ import org.eclipse.swt.SWT;
+--
+2.11.0
+
=====================================
debian/patches/fix_jface_text.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Use org.eclipse.core.runtime.Assert
+
+From: https://git.eclipse.org/c/sourceediting/webtools.sourceediting.git/commit/?id=a7ad80b1ee9a0b1ec3a730dd1010dfe24539f523
+
+Forwarded: not-needed
+---
+
+--- eclipse-wtp-3.18.orig/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TextHoverPreferenceTab.java
++++ eclipse-wtp-3.18/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TextHoverPreferenceTab.java
+@@ -17,11 +17,11 @@ package org.eclipse.wst.sse.ui.internal.
+ import java.util.ArrayList;
+ import java.util.HashMap;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.jface.action.Action;
+ import org.eclipse.jface.dialogs.Dialog;
+ import org.eclipse.jface.preference.PreferencePage;
+-import org.eclipse.jface.text.Assert;
+ import org.eclipse.jface.viewers.ArrayContentProvider;
+ import org.eclipse.jface.viewers.CheckStateChangedEvent;
+ import org.eclipse.jface.viewers.CheckboxTableViewer;
=====================================
debian/patches/series
=====================================
@@ -4,3 +4,5 @@ jflex-compatibility.patch
build_stub.patch
0001-Fix-license-text
versionless.patch
+0001-528191-Replace-uses-of-org.eclipse.jface.util.Assert.patch
+fix_jface_text.patch
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,4 @@
+# just check if all packages are installed correctly
+Test-Command: ls -l /usr/share/java/eclipse-jem-util.jar /usr/share/java/eclipse-wst-common-core.jar /usr/share/java/eclipse-wst-common-emf.jar /usr/share/java/eclipse-wst-common-emfworkbench-integration.jar /usr/share/java/eclipse-wst-common-environment.jar /usr/share/java/eclipse-wst-common-frameworks.jar /usr/share/java/eclipse-wst-common-frameworks-ui.jar /usr/share/java/eclipse-wst-common-project-facet-core.jar /usr/share/java/eclipse-wst-common-ui.jar /usr/share/java/eclipse-wst-common-uriresolver.jar /usr/share/java/eclipse-wst-sse-core.jar /usr/share/java/eclipse-wst-sse-ui.jar /usr/share/java/eclipse-wst-validation.jar /usr/share/java/eclipse-wst-validation-ui.jar /usr/share/java/eclipse-wst-xml-core.jar /usr/share/java/eclipse-wst-xml-ui.jar /usr/share/java/eclipse-wst-xsd-core.jar
+Depends: @
+Restrictions: superficial
View it on GitLab: https://salsa.debian.org/java-team/eclipse-wtp/-/compare/a2102428355b38142a2c6855b194286a48578e24...c28db841c043d1b71f239dbb45ad754da49e0bdb
--
View it on GitLab: https://salsa.debian.org/java-team/eclipse-wtp/-/compare/a2102428355b38142a2c6855b194286a48578e24...c28db841c043d1b71f239dbb45ad754da49e0bdb
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201009/383dd5f8/attachment.html>
More information about the pkg-java-commits
mailing list