From f6b1da55827adca6e1e177c9bdf8bbfd78b165fb Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 2 Jul 2014 14:58:42 +0200
Subject: debian/control: Pull-in debian-edu-artwork-spacefun and make sure
 debian-edu-artwork-joy does not get installed.

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

(limited to 'debian/control')

diff --git a/debian/control b/debian/control
index 1dd9e13..8bb2c6b 100644
--- a/debian/control
+++ b/debian/control
@@ -295,6 +295,7 @@ Depends:
  cups,
  cups-bsd,
  deb-multimedia-keyring,
+ debian-edu-artwork-spacefun,
  emacs23,
  eog,
  etckeeper,
@@ -408,6 +409,7 @@ Depends:
 Conflicts:
  gdm,
  gdm3,
+ debian-edu-artwork-joy,
  openoffice.org,
  openoffice.org-base,
  openoffice.org-base-core,
@@ -481,6 +483,7 @@ Depends:
  cups,
  cups-bsd,
  deb-multimedia-keyring,
+ debian-edu-artwork-spacefun,
  emacs23,
  eog,
  etckeeper,
@@ -593,6 +596,7 @@ Depends:
 Conflicts:
  gdm,
  gdm3,
+ debian-edu-artwork-joy,
  openoffice.org,
  openoffice.org-base,
  openoffice.org-base-core,
@@ -663,6 +667,7 @@ Depends:
  cups,
  cups-bsd,
  deb-multimedia-keyring,
+ debian-edu-artwork-spacefun,
  emacs23,
  eog,
  etckeeper,
@@ -775,6 +780,7 @@ Depends:
 Conflicts:
  gdm,
  gdm3,
+ debian-edu-artwork-joy,
  openoffice.org,
  openoffice.org-base,
  openoffice.org-base-core,
-- 
cgit v1.2.3