summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/control5
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index f5a83d4..d3f0fc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ itzks-systems (2015.10.15.1) UNRELEASED; urgency=medium
* debian-mate-default-settings: Provide itzks-debian-mate-default-settings
for Debian jessie / ITZkS.
+ * debian/control:
+ + Remove various duplicate entries for emacs24 and debian-edu-artwork-joy.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 11 Sep 2015 23:14:43 +0200
diff --git a/debian/control b/debian/control
index 48207f8..26cc854 100644
--- a/debian/control
+++ b/debian/control
@@ -426,7 +426,6 @@ Depends:
x2goclient,
xarchiver,
x11-apps,
- emacs24,
xpdf,
xul-ext-adblock-plus,
yakuake,
@@ -633,7 +632,6 @@ Depends:
x2goserver-fmbindings,
xarchiver,
x11-apps,
- emacs24,
xpdf,
xul-ext-adblock-plus,
yakuake,
@@ -659,7 +657,6 @@ Conflicts:
gdm,
gdm3,
gnu-fdisk,
- debian-edu-artwork-joy,
mate-media-gstreamer,
mate-settings-daemon-gstreamer,
openoffice.org,
@@ -837,7 +834,6 @@ Depends:
x2godesktopsharing,
x2goclient,
x11-apps,
- emacs24,
xpdf,
xul-ext-adblock-plus,
yakuake,
@@ -863,7 +859,6 @@ Conflicts:
gdm,
gdm3,
gnu-fdisk,
- debian-edu-artwork-joy,
mate-media-gstreamer,
mate-settings-daemon-gstreamer,
openoffice.org,