diff -Nru eclipse-3.8.1/debian/changelog eclipse-3.8.1/debian/changelog
--- eclipse-3.8.1/debian/changelog	2016-10-25 23:16:44.000000000 +0000
+++ eclipse-3.8.1/debian/changelog	2018-02-21 17:00:21.000000000 +0000
@@ -1,3 +1,14 @@
+eclipse (3.8.1-11) unstable; urgency=medium
+
+  * Team upload.
+  * Declare compliance with Debian Policy 4.1.3.
+  * Drop binary package libequinox-osgi-java which is now provided by
+    src:libequinox-osgi-java.
+  * Remove obsolete libequinox-osgi-java install filesi and debian/rules code.
+  * Drop obsolete eclipse-platform.menu file.
+
+ -- Markus Koschany <apo@debian.org>  Wed, 21 Feb 2018 18:00:21 +0100
+
 eclipse (3.8.1-10) unstable; urgency=medium
 
   * Team upload.
diff -Nru eclipse-3.8.1/debian/control eclipse-3.8.1/debian/control
--- eclipse-3.8.1/debian/control	2016-10-25 21:31:47.000000000 +0000
+++ eclipse-3.8.1/debian/control	2018-02-21 17:00:21.000000000 +0000
@@ -7,7 +7,7 @@
            Jakub Adam <jakub.adam@ktknet.cz>
 Build-Depends: ant (>= 1.8.2),
                ant-optional,
-               debhelper (>= 9~),
+               debhelper (>= 9),
                default-jdk,
                docbook2x,
                javahelper,
@@ -39,7 +39,7 @@
                sat4j (<< 2.4.0),
                unzip,
                zip
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/eclipse.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/eclipse.git
 Homepage: http://www.eclipse.org/
@@ -175,7 +175,7 @@
 Package: eclipse-rcp
 Architecture: any
 Depends: default-jre | java5-runtime | java6-runtime,
-         libequinox-osgi-java (= ${source:Version}),
+         libequinox-osgi-java (>= 3.9.1),
          libfelix-gogo-command-java,
          libfelix-gogo-shell-java,
          libicu4j-49-java (>= 49.1-2),
@@ -205,19 +205,3 @@
  This package includes the Eclipse Rich Client Platform (RCP), the basis upon
  which Eclipse RCP applications are built.
 
-Package: libequinox-osgi-java
-Architecture: all
-Section: java
-Depends: ${misc:Depends}
-Recommends: libservlet3.1-java
-Breaks: eclipse-rcp (<< 3.5.1-0ubuntu3)
-Replaces: eclipse-platform-gcj, eclipse-rcp-gcj
-Description: Equinox OSGi framework
- The Eclipse Platform is an open and extensible platform for anything and yet
- nothing in particular. It provides a foundation for constructing and running
- integrated software-development tools. The Eclipse Platform allows tool
- builders to independently develop tools that integrate with other people's
- tools so seamlessly you can't tell where one tool ends and another starts.
- .
- This package includes only the Eclipse Equinox OSGi framework, which can
- be used outside Eclipse.
diff -Nru eclipse-3.8.1/debian/eclipse-platform.menu eclipse-3.8.1/debian/eclipse-platform.menu
--- eclipse-3.8.1/debian/eclipse-platform.menu	2016-10-18 12:26:27.000000000 +0000
+++ eclipse-3.8.1/debian/eclipse-platform.menu	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-?package(eclipse-platform):needs="X11" title="Eclipse" command="eclipse" section="Applications/Programming"
diff -Nru eclipse-3.8.1/debian/libequinox-osgi-java.install eclipse-3.8.1/debian/libequinox-osgi-java.install
--- eclipse-3.8.1/debian/libequinox-osgi-java.install	2016-10-18 12:26:27.000000000 +0000
+++ eclipse-3.8.1/debian/libequinox-osgi-java.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar
-usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar
diff -Nru eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides
--- eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides	2016-10-18 12:26:27.000000000 +0000
+++ eclipse-3.8.1/debian/libequinox-osgi-java.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-jar-not-in-usr-share
-# Follows from an optional OSGi dependency on javax.servlet
-needless-suggest-recommend-libservlet-java
diff -Nru eclipse-3.8.1/debian/rules eclipse-3.8.1/debian/rules
--- eclipse-3.8.1/debian/rules	2016-10-18 17:56:02.000000000 +0000
+++ eclipse-3.8.1/debian/rules	2018-02-21 17:00:21.000000000 +0000
@@ -106,24 +106,11 @@
 	dh_install --indep
 	# mv arch-indep plugins from lib to share
 	cd debian/eclipse-platform-data/usr && find lib/ -type f -path '*lib/eclipse/*' | perl ../../../debian/extra/imagemv.pl
-	# Expose osgi jars
-	mkdir -p debian/libequinox-osgi-java/usr/share/java
-	cd debian/libequinox-osgi-java/usr/share/java && \
-	  for FILE in ../../lib/eclipse/plugins/* ; do \
-		ln -s $$FILE ; \
-		ln -s $$FILE `basename $$FILE | sed 's/_.*$$//g'`.jar ; \
-	  done
 	# Expose jdi.jar and jdimodel.jar
 	mkdir -p debian/eclipse-jdt/usr/share/java
 	cd debian/eclipse-jdt/usr/share/java; \
 	  ln -s ../eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug_*/jdi.jar; \
 	  ln -s ../eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug_*/jdimodel.jar;
-	# Install poms and jars into Maven repo
-	 for pom in $(wildcard debian/poms/*.xml); do \
-		mh_installpom -v -plibequinox-osgi-java $$pom; \
-		SUFFIX=`basename $$pom .xml | sed 's/pom-equinox-//'`; \
-		mh_installjar -v -plibequinox-osgi-java  $$pom debian/libequinox-osgi-java/usr/share/java/org.eclipse.$$SUFFIX.jar; \
-	 done
 
 override_jh_classpath:
 	jh_classpath