debian/control: More work on fixing dependencies for Debian stable/testing/unstable.

1 files changed, 26 insertions, 24 deletions

diff --git a/debian/control b/debian/control
index 8bb2c6b..b3815c4 100644
--- a/debian/control
+++ b/debian/control
@@ -53,11 +53,11 @@ Depends:
  deb-multimedia-keyring,
  etckeeper,
  etherboot-qemu,
- eog,
+ eom,
  firmware-linux-free,
  firmware-linux-nonfree,
  git,
- gnu-fdisk,
+ gdisk,
  htop,
  iceweasel,
  iceweasel-l10n-de,
@@ -94,6 +94,7 @@ Depends:
  vim,
  zip,
 Conflicts:
+ gnu-fdisk,
  exim4, exim4-config, exim4-base, exim4-daemon
 Description: Profiling ITZkS-VirtMan Systems
  Install this package to pull in all dependencies required on
@@ -114,7 +115,7 @@ Depends:
  firmware-linux-free,
  firmware-linux-nonfree,
  git,
- gnu-fdisk,
+ gdisk,
  htop,
  itzks-keyring,
  links,
@@ -137,6 +138,7 @@ Depends:
  xfsprogs,
  zip,
 Conflicts:
+ gnu-fdisk,
  exim4, exim4-config, exim4-base, exim4-daemon
 Description: Profiling ITZkS-Backup Systems
  Install this package to pull in all dependencies required on
@@ -174,10 +176,10 @@ Depends:
  bzip2,
  deb-multimedia-keyring,
  dnsutils,
- eog,
- file-roller,
+ eom,
+ engrampa,
  filezilla,
- gnu-fdisk,
+ gdisk,
  htop,
  itzks-keyring,
  links,
@@ -237,7 +239,7 @@ Depends:
  deb-multimedia-keyring,
  dnsutils,
  htop,
- gnu-fdisk,
+ gdisk,
  itzks-keyring,
  links,
  linuxlogo,
@@ -288,7 +290,6 @@ Breaks:
 Depends:
  itzks-systems-common,
  ${misc:Depends},
- arc-colors,
  arj,
  bzip2,
  catdvi,
@@ -297,9 +298,9 @@ Depends:
  deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
  emacs23,
- eog,
+ eom,
  etckeeper,
- file-roller,
+ engrampa,
  filezilla,
  firmware-linux-free,
  firmware-linux-nonfree,
@@ -381,8 +382,8 @@ Depends:
  scratch,
  stunnel4,
  subversion,
- sun-java6-jre,
- sun-java6-plugin,
+ oracle-java7-jre,
+ oracle-java7-plugin,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -409,6 +410,7 @@ Depends:
 Conflicts:
  gdm,
  gdm3,
+ gnu-fdisk,
  debian-edu-artwork-joy,
  openoffice.org,
  openoffice.org-base,
@@ -475,7 +477,6 @@ Breaks:
 Depends:
  itzks-systems-common,
  ${misc:Depends},
- arc-colors,
  arj,
  apt-file,
  bzip2,
@@ -485,9 +486,9 @@ Depends:
  deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
  emacs23,
- eog,
+ eom,
  etckeeper,
- file-roller,
+ engrampa,
  filezilla,
  firmware-linux-free,
  firmware-linux-nonfree,
@@ -500,7 +501,7 @@ Depends:
  mate-desktop-environment-extras,
  mate-screensaver,
  gnome-colors-common,
- gnu-fdisk,
+ gdisk,
  grdesktop,
  gv,
  htop,
@@ -564,8 +565,8 @@ Depends:
  scratch,
  stunnel4,
  subversion,
- sun-java6-jre,
- sun-java6-plugin,
+ oracle-java7-jre,
+ oracle-java7-plugin,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -596,6 +597,7 @@ Depends:
 Conflicts:
  gdm,
  gdm3,
+ gnu-fdisk,
  debian-edu-artwork-joy,
  openoffice.org,
  openoffice.org-base,
@@ -660,7 +662,6 @@ Replaces:
 Depends:
  itzks-systems-common,
  ${misc:Depends},
- arc-colors,
  arj,
  bzip2,
  catdvi,
@@ -669,9 +670,9 @@ Depends:
  deb-multimedia-keyring,
  debian-edu-artwork-spacefun,
  emacs23,
- eog,
+ eom,
  etckeeper,
- file-roller,
+ engrampa,
  filezilla,
  firmware-linux-free,
  firmware-linux-nonfree,
@@ -684,7 +685,7 @@ Depends:
  mate-desktop-environment-extras,
  gnome-colors-common,
  git,
- gnu-fdisk,
+ gdisk,
  grdesktop,
  gstreamer0.10-plugins-bad,
  gstreamer0.10-plugins-good,
@@ -752,8 +753,8 @@ Depends:
  scratch,
  stunnel4,
  subversion,
- sun-java6-jre,
- sun-java6-plugin,
+ oracle-java7-jre,
+ oracle-java7-plugin,
  sysstat,
  texlive-fonts-recommended,
  texlive-generic-recommended,
@@ -780,6 +781,7 @@ Depends:
 Conflicts:
  gdm,
  gdm3,
+ gnu-fdisk,
  debian-edu-artwork-joy,
  openoffice.org,
  openoffice.org-base,