[openjdk-8] 01/02: Removed the conflicts declared against the old packages icedtea-gcjwebplugin and icedtea-netx (<< 1.1.1-2~)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit a6b14a55a37064442aad9f53e16b249fa00f01e4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 2 13:58:50 2014 +0200

    Removed the conflicts declared against the old packages icedtea-gcjwebplugin and icedtea-netx (<< 1.1.1-2~)
---
 debian/control              | 2 --
 debian/rules                | 3 +--
 debian/templates/control.in | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index e69a724..7919dae 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,6 @@ Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:
 Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
 Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts,
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, java8-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
-Conflicts: ${multiarch:Conflicts}
 Breaks: icedtea-netx (<< 1.4-2)
 Description: OpenJDK Java runtime, using ${vm:Name} (headless)
  Minimal Java runtime - needed for executing non GUI Java programs.
@@ -48,7 +47,6 @@ Pre-Depends: ${dpkg:Depends}
 Depends: openjdk-8-jre-headless (= ${binary:Version}), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends}, ${dep:bridge}
 Recommends: ${dlopenjre:Recommends}, fonts-dejavu-extra
 Suggests: icedtea-7-plugin, ${pkg:pulseaudio}
-Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4)
 Provides: java-runtime, java2-runtime, java5-runtime, java6-runtime, java7-runtime, java8-runtime
 Description: OpenJDK Java runtime, using ${vm:Name}
  Full Java runtime environment - needed for executing Java GUI and Webstart
diff --git a/debian/rules b/debian/rules
index 25e16c0..5a3ac7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -673,8 +673,7 @@ control_vars = \
 
 ifneq (,$(DEB_HOST_MULTIARCH))
   control_vars += \
-	'-Vmultiarch:Depends=multiarch-support' \
-	'-Vmultiarch:Conflicts=icedtea-netx (<< 1.1.1-2~)'
+	'-Vmultiarch:Depends=multiarch-support'
 endif
 
 ifneq (,$(filter-out $(hotspot_archs), $(cacao_archs)))
diff --git a/debian/templates/control.in b/debian/templates/control.in
index 74ad72b..f3ff012 100644
--- a/debian/templates/control.in
+++ b/debian/templates/control.in
@@ -32,7 +32,6 @@ Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:
 Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
 Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, java8-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
-Conflicts: ${multiarch:Conflicts}
 Breaks: icedtea-netx (<< 1.4-2)
 Description: OpenJDK Java runtime, using ${vm:Name} (headless)
  Minimal Java runtime - needed for executing non GUI Java programs.
@@ -48,7 +47,6 @@ Pre-Depends: ${dpkg:Depends}
 Depends: @basename at -jre-headless (= ${binary:Version}), ${xandsound:Depends}, ${shlibs:Depends}, ${dlopenjre:Depends}, ${misc:Depends}, ${dep:bridge}
 Recommends: ${dlopenjre:Recommends}, @core_fonts@
 Suggests: icedtea-7-plugin, ${pkg:pulseaudio}
-Conflicts: icedtea-gcjwebplugin (<< 1.0-1ubuntu4)
 Provides: java-runtime, java2-runtime, java5-runtime, java6-runtime, java7-runtime, java8-runtime
 Description: OpenJDK Java runtime, using ${vm:Name}
  Full Java runtime environment - needed for executing Java GUI and Webstart

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