[debian-edu-commits] debian-edu/ 01/03: tasks/desktop-lxde: replace recommends on "evince-gtk | evince" with just evince, as evince-gtk is a transitional package.

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu.

commit a794f8a7e5f44907c5c87c7d8a8749a429263aa0
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Apr 21 18:41:57 2017 +0200

    tasks/desktop-lxde: replace recommends on "evince-gtk | evince" with just evince, as evince-gtk is a transitional package.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian-edu-tasks.desc | 2 +-
 debian/changelog      | 2 ++
 debian/control        | 2 +-
 tasks/desktop-lxde    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index ef1eaee..ef9a6d7 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -357,7 +357,7 @@ Packages: list
  desktop-file-utils
  lightdm
  totem
- evince-gtk
+ evince
  galculator
  osmo
  parcellite
diff --git a/debian/changelog b/debian/changelog
index 006e254..63927a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ debian-edu (1.924) UNRELEASED; urgency=medium
     on fonts-wqy-microhei and fonts-wqy-zenhei. (Closes: #859531)
   * tasks/graphics: replace recommends of transitional dummy package dia-gnome
     with dia.
+  * tasks/desktop-lxde: replace recommends on "evince-gtk | evince" with just
+    evince, as evince-gtk is a transitional package.
 
   [ Wolfgang Schweer ]
   * Move the Depends of the package gosa-desktop from tasks/networked to
diff --git a/debian/control b/debian/control
index 27c8ffa..30ebaea 100644
--- a/debian/control
+++ b/debian/control
@@ -310,7 +310,7 @@ Depends: education-tasks (= ${source:Version}), ${misc:Depends}
 Recommends: blueman,
  desktop-file-utils,
  education-common,
- evince-gtk | evince,
+ evince,
  fotoxx,
  galculator,
  gimp,
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index 087e34d..3114e0e 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -14,7 +14,7 @@ NeedConfig:  no
 
 Depends:      lxde, desktop-file-utils
 Why:          LXDE needs login manager, opening files in LXDE depends on desktop-file-utils
-Recommends:   evince-gtk | evince, galculator, osmo, parcellite, \
+Recommends:   evince, galculator, osmo, parcellite, \
               pidgin, hexchat, mtpaint, fotoxx, gimp, \
               inkscape, \
               synaptic

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu.git