[debian-edu-commits] [Git][debian-edu/debian-edu][master] Updated after running 'make dist'.

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu


Commits:
b2e0c838 by Wolfgang Schweer at 2018-06-13T21:41:18+02:00
Updated after running 'make dist'.

- - - - -


2 changed files:

- debian-edu-tasks.desc
- debian/control


Changes:

=====================================
debian-edu-tasks.desc
=====================================
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -71,7 +71,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  gnome
  gnome-shell-extension-onboard
@@ -279,7 +278,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  kde-standard
  kwin-x11
@@ -504,7 +502,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  lxde
  desktop-file-utils
@@ -706,7 +703,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  lxqt
  desktop-file-utils
@@ -908,7 +904,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  mate-desktop-environment
  mate-desktop-environment-extras
@@ -919,6 +914,7 @@ Packages: list
  arctica-greeter
  arctica-greeter-theme-debian
  network-manager-gnome
+ wicd
  libreoffice-gtk3
  vlc
  ssh-askpass-gnome
@@ -1265,12 +1261,12 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  xfce4
  xfce4-goodies
  network-manager-gnome
  xfce4-notifyd
+ wicd
  system-config-printer
  tango-icon-theme
  blueman
@@ -1615,9 +1611,9 @@ Packages: list
  fonts-wqy-zenhei
  fonts-wqy-microhei
  im-config
+ ibus-chewing
  ibus-table-cangjie
  ibus-array
- ibus-chewing
 
 Task: education-laptop
 Section: debian-edu
@@ -1721,7 +1717,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  libnss-ldapd
  nslcd
@@ -1956,7 +1951,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  libnss-ldapd
  nslcd
@@ -2110,7 +2104,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  libnss-ldapd
  nslcd
@@ -2206,7 +2199,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  libnss-ldapd
  nslcd
@@ -2300,7 +2292,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  libnss-ldapd
  nslcd
@@ -2451,6 +2442,7 @@ Packages: list
  kvpm
  totem
  network-manager-gnome
+ wicd
  libpam-mklocaluser
  libpam-sss
  libnss-sss
@@ -2530,7 +2522,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  education-desktop-other
  libgl1-mesa-dri
@@ -2665,6 +2656,7 @@ Packages: list
  totem
  sudo
  network-manager-gnome
+ wicd
  isenkram
 
 Task: education-thin-client
@@ -2756,7 +2748,6 @@ Packages: list
  hpijs-ppds
  hplip
  bash-completion
- cifs-utils
  command-not-found
  libnss-ldapd
  nslcd


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,6 @@ Recommends: apt-listchanges,
  bash-completion,
  bc,
  bind9-host,
- cifs-utils,
  command-not-found,
  cups,
  cups-browsed,
@@ -381,10 +380,11 @@ Recommends: arctica-greeter,
  libreoffice-gtk3,
  mate-desktop-environment,
  mate-desktop-environment-extras,
- network-manager-gnome | cmst | wicd,
+ network-manager-gnome | cmst,
  onboard,
  ssh-askpass-gnome | ssh-askpass,
- vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer
+ vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer,
+ wicd
 Suggests: education-development,
  education-primaryschool
 Description: Debian Edu MATE desktop applications
@@ -627,10 +627,11 @@ Recommends: blueman,
  education-music,
  education-physics,
  kdeedu,
- network-manager-gnome | cmst | wicd,
+ network-manager-gnome | cmst,
  ssh-askpass,
  system-config-printer,
  tango-icon-theme,
+ wicd,
  xfce4,
  xfce4-goodies,
  xfce4-notifyd
@@ -1342,7 +1343,8 @@ Recommends: education-desktop-other,
  libnss-sss,
  libpam-mklocaluser,
  libpam-sss,
- network-manager-gnome | plasma-nm | cmst | wicd
+ network-manager-gnome | plasma-nm | cmst,
+ wicd
 Description: Debian Edu roaming workstation packages
  A metapackage containing dependencies for packages required on all
  networked workstation installations in the Debian Edu Blend where the
@@ -1357,8 +1359,9 @@ Recommends: education-common,
  education-desktop-other,
  isenkram,
  libnss-mdns,
- network-manager-gnome | plasma-nm | cmst | wicd,
- sudo
+ network-manager-gnome | plasma-nm | cmst,
+ sudo,
+ wicd
 Description: Debian Edu standalone workstation packages
  A metapackage containing dependencies for packages required on all
  small standalone workstation installations in the Debian Edu Blend.



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/commit/b2e0c838b69ce51121fc9c7cd2f1afa899c7a0a9

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/commit/b2e0c838b69ce51121fc9c7cd2f1afa899c7a0a9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20180613/69d6b168/attachment-0001.html>