From 9b6ce8885f1a1163f4db4d905462d0c7891e0fab Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 17 Dec 2014 10:57:47 +0100 Subject: debian/control: allow installation of geogebra5. * debian/control: + Assure that we pull-in latest itzks-systems-common version, + Prefer geogebra5 in diskless workstations. + Pull-in geogebra5 on terminal servers, as well. --- debian/changelog | 9 ++++++--- debian/control | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index da91e0f..64f46de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ itzks-systems (2014.07.02.1+deb6u6) UNRELEASED; urgency=medium - * debian/control: Assure that we pull-in latest itzks-systems-common version, - always if we install any of the system packages. + * debian/control: + + Assure that we pull-in latest itzks-systems-common version, + always if we install any of the system packages. + + Prefer geogebra5 in diskless workstations. + + Pull-in geogebra5 on terminal servers, as well. * master.conf.dirvish: Fix typos in line for vault contentserver.intern_srv. - -- Mike Gabriel Fri, 22 Aug 2014 10:24:41 +0200 + -- Mike Gabriel Wed, 17 Dec 2014 10:57:01 +0100 itzks-systems (2014.07.02.1+deb6u5) squeeze-backports; urgency=medium diff --git a/debian/control b/debian/control index 9d83722..15c77e3 100644 --- a/debian/control +++ b/debian/control @@ -309,7 +309,7 @@ Depends: flashplugin-nonfree, gcalctool, gdm, - geogebra44, + geogebra5 | geogebra44, gnome-colors-common, gnome-screensaver, git, @@ -494,6 +494,7 @@ Depends: firmware-realtek, flashplugin-nonfree, gcalctool, + geogebra5 | geogebra44, gdm, git, gnome-screensaver, -- cgit v1.2.3