[debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: Replace webext-ublock-origin with webext-ublock-origin-{firefox, chromium}
Wolfgang Schweer
gitlab at salsa.debian.org
Thu Sep 10 09:03:25 BST 2020
Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu
Commits:
d4824fb3 by Wolfgang Schweer at 2020-09-10T09:56:30+02:00
Replace webext-ublock-origin with webext-ublock-origin-{firefox,chromium}
webext-ublock-origin has been split into two packages.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
247f79e8 by Wolfgang Schweer at 2020-09-10T10:02:18+02:00
Update debian/control after running 'make dist'
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
3 changed files:
- debian/changelog
- debian/control
- tasks/desktop-other
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+debian-edu (2.11.21) UNRELEASED; urgency=medium
+
+ * tasks/desktop-other: webext-ublock-origin has been split into two; replace
+ it with webext-ublock-origin-{firefox,chromium}.
+ * debian/control: Update after running 'make dist'.
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Thu, 10 Sep 2020 09:48:20 +0200
+
debian-edu (2.11.20) unstable; urgency=medium
[ Wolfgang Schweer ]
=====================================
debian/control
=====================================
@@ -66,16 +66,16 @@ Architecture: any
Depends: ${misc:Depends},
education-tasks (= ${binary:Version})
Recommends: avogadro,
- chemtool,
easychem,
education-menus,
- gdis,
gperiodic,
kalzium,
- pymol,
- viewmol
-Suggests: gchempaint,
- rasmol
+ pymol
+Suggests: chemtool,
+ gchempaint,
+ gdis,
+ rasmol,
+ viewmol
Description: Debian Edu chemistry related applications
This metapackage depends on various applications that can be used to
teach chemistry.
@@ -176,13 +176,13 @@ Recommends: education-astronomy,
education-physics,
kdeedu,
lightdm,
- mtpaint,
osmo,
task-cinnamon-desktop
Suggests: education-development,
education-primaryschool,
education-video,
- fotoxx
+ fotoxx,
+ mtpaint
Description: Debian Edu Cinnamon desktop applications
This metapackage depends on various Cinnanon components and desktop
applications that are useful for teachers and their students.
@@ -268,7 +268,6 @@ Recommends: blueman,
education-physics,
hexchat,
kdeedu,
- mtpaint,
network-manager-gnome,
osmo,
pidgin,
@@ -277,7 +276,8 @@ Recommends: blueman,
Suggests: education-development,
education-primaryschool,
education-video,
- fotoxx
+ fotoxx,
+ mtpaint
Description: Debian Edu LXDE desktop applications
This metapackage depends on various LXDE components and lightweight
desktop applications that are useful for teachers and their students.
@@ -303,14 +303,14 @@ Recommends: blueman,
galculator,
kdeedu,
lightdm,
- mtpaint,
osmo,
pidgin,
task-lxqt-desktop
Suggests: education-development,
education-primaryschool,
education-video,
- fotoxx
+ fotoxx,
+ mtpaint
Description: Debian Edu LXQt desktop applications
This metapackage depends on various LXQt components and lightweight
desktop applications that are useful for teachers and their students.
@@ -368,7 +368,6 @@ Recommends: cheese,
sane-utils,
standardskriver,
thunderbird,
- webext-ublock-origin,
xsane
Suggests: auctex,
avahi-discover,
@@ -429,6 +428,8 @@ Suggests: auctex,
texworks,
vlc,
vlc-plugin-bittorent,
+ webext-ublock-origin-chromium,
+ webext-ublock-origin-firefox,
wine
Description: Debian Edu common desktop applications
This metapackage depends on various office and desktop applications
@@ -471,6 +472,7 @@ Depends: ${misc:Depends},
Recommends: anjuta,
arduino,
autoconf,
+ bluefish,
build-essential,
bwbasic,
codeblocks,
@@ -505,8 +507,7 @@ Recommends: anjuta,
subversion,
thonny,
umbrello
-Suggests: bluefish,
- swi-prolog,
+Suggests: swi-prolog,
swi-prolog-doc,
tcl8.6-dev,
tk8.6-dev
@@ -593,7 +594,6 @@ Depends: ${misc:Depends},
education-tasks (= ${binary:Version})
Recommends: calibre,
cantor,
- chemtool,
education-menus,
fritzing,
inkscape,
@@ -608,6 +608,7 @@ Recommends: calibre,
rocs,
step,
yorick
+Suggests: chemtool
Description: Debian Edu applications for high school level
This metapackage depends on various applications that are recommended
for teaching students at high school level.
@@ -860,11 +861,11 @@ Recommends: audacious,
denemo,
education-menus,
fluidsynth,
- freebirth,
gtick,
lingot,
lmms,
mcp-plugins,
+ musescore,
nted,
pianobooster,
qsynth,
@@ -875,9 +876,9 @@ Recommends: audacious,
timgm6mb-soundfont,
tuxguitar
Suggests: festival,
+ freebirth,
hydrogen,
- lilypond,
- musescore
+ lilypond
Description: Debian Edu music and sound applications
This metapackage depends on various applications that can be used to
teach music.
@@ -1001,10 +1002,10 @@ Recommends: education-menus,
parley,
ri-li,
step,
- tuxmath,
- tuxpaint,
- tuxtype
-Suggests: childsplay
+ tuxpaint
+Suggests: childsplay,
+ tuxmath,
+ tuxtype
Description: Debian Edu applications for primary school level
This metapackage depends on various applications that are recommended
for teaching students at primary school level.
@@ -1037,7 +1038,6 @@ Architecture: any
Depends: ${misc:Depends},
education-tasks (= ${binary:Version})
Recommends: calibre,
- chemtool,
education-menus,
einstein,
fritzing,
@@ -1060,6 +1060,7 @@ Recommends: calibre,
pencil2d,
ri-li,
step
+Suggests: chemtool
Description: Debian Edu applications for secondary school level
This metapackage depends on various applications that are recommended
for teaching students at secondary school level.
=====================================
tasks/desktop-other
=====================================
@@ -20,7 +20,8 @@ NeedConfig: yes, Cache, Printerapp, proxy server
Recommends:
firefox-esr,
- webext-ublock-origin,
+ webext-ublock-origin-chromium,
+ webext-ublock-origin-firefox,
NeedConfig: yes, Cache, Printerapp, proxy server
Recommends:
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/6106fc9b42620ab5c93937acbed33ddc08136d5c...247f79e84aacc17c93866f5cb37784d92cb652ba
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/-/compare/6106fc9b42620ab5c93937acbed33ddc08136d5c...247f79e84aacc17c93866f5cb37784d92cb652ba
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/20200910/19fa7883/attachment-0001.html>
More information about the debian-edu-commits
mailing list