From c401d717148dea724427de35f468719f8df4eff8 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 3 Jul 2014 09:05:53 +0200
Subject: debian/control: Replace Sun's Java6 by Oracle's Java7.

---
 debian/control | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index 7936dfd..9d33966 100644
--- a/debian/control
+++ b/debian/control
@@ -276,6 +276,8 @@ Replaces:
  itzks-systems-terminalserver,
  itzks-systems-virtman,
  itzks-systems-backup,
+ sun-java6-jre,
+ sun-java6-plugin,
 Breaks:
  itzks-packages-diskless,
  itzks-systems-mainserver,
@@ -368,6 +370,8 @@ Depends:
  nted,
  ocsinventory-agent,
  odt2txt,
+ oracle-java7-jre,
+ oracle-java7-plugin,
  pkg-mozilla-archive-keyring,
  pidgin,
  pinta,
@@ -377,8 +381,6 @@ Depends:
  scratch,
  stunnel4,
  subversion,
- sun-java6-jre,
- sun-java6-plugin,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -440,6 +442,8 @@ Conflicts:
  openoffice.org-thesaurus-de,
  openoffice.org-thesaurus-de-ch,
  openoffice.org-writer,
+ sun-java6-jre,
+ sun-java6-plugin,
 Description: Profiling for ITZkS Diskless Workstation Systems
  Install this package to pull in all dependencies required on
  ITZkS Diskless Workstation systems.
@@ -457,6 +461,8 @@ Replaces:
  itzks-systems-diskless,
  itzks-systems-virtman,
  itzks-systems-backup,
+ sun-java6-jre,
+ sun-java6-plugin,
 Breaks:
  itzks-packages-terminalserver,
  itzks-systems-mainserver,
@@ -554,8 +560,8 @@ Depends:
  scratch,
  stunnel4,
  subversion,
- sun-java6-jre,
- sun-java6-plugin,
+ oracle-java7-jre,
+ oracle-java7-plugin,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -644,6 +650,8 @@ Replaces:
  itzks-systems-diskless,
  itzks-systems-virtman,
  itzks-systems-backup,
+ sun-java6-jre,
+ sun-java6-plugin,
 Depends:
  itzks-systems-common,
  ${misc:Depends},
@@ -736,8 +744,8 @@ Depends:
  scratch,
  stunnel4,
  subversion,
- sun-java6-jre,
- sun-java6-plugin,
+ oracle-java7-jre,
+ oracle-java7-plugin,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -799,6 +807,8 @@ Conflicts:
  openoffice.org-thesaurus-de,
  openoffice.org-thesaurus-de-ch,
  openoffice.org-writer,
+ sun-java6-jre,
+ sun-java6-plugin,
 Description: Profiling for ITZkS Workstation Systems
  Install this package to pull in all dependencies required on
  ITZkS (diskfull) Workstation systems.
-- 
cgit v1.2.3