[debian-edu-commits] debian-edu/ 01/03: Add evince as alternative to evince-gtk in desktop-lxde, in case the lxde desktop is installed in parallell with the gnome desktop, where the gnome-core package depend on evince, which conflict with evince- gtk.

[Petter Reinholdtsen]

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

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

commit ae681f519e1b5caec11e79d133527623b49c5d86
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 21 20:05:54 2014 +0200

    Add evince as alternative to evince-gtk in desktop-lxde, in case the lxde desktop is installed in parallell with the gnome desktop, where the gnome-core package depend on evince, which conflict with evince- gtk.
---
 debian/changelog   | 4 ++++
 tasks/desktop-lxde | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0534c72..976f716 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,10 @@ debian-edu (1.800~0.git.2014-09-11) unstable; urgency=low
     debian/education-menus.postinst is not removed by the clean target.
   * Extend the test script to set TMP, TMPDIR, TEMP and TEMPDIR to the
     $ADTTMP value, to ensure all scripts use the same temp directory.
+  * Add evince as alternative to evince-gtk in desktop-lxde, in case the
+    lxde desktop is installed in parallell with the gnome desktop, where
+    the gnome-core package depend on evince, which conflict with evince-
+    gtk.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 11 Sep 2014 14:17:22 +0200
 
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index 4ff9944..ee3e8bf 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:   aqualung, evince-gtk, galculator, osmo, parcellite, \
+Recommends:   aqualung, evince-gtk | evince, galculator, osmo, parcellite, \
               pidgin, xchat, mtpaint, fotoxx, gimp, \
               inkscape, gstreamer0.10-ffmpeg, gstreamer0.10-pulseaudio, \
               synaptic

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