[debian-edu-commits] [Git][debian-edu/debian-edu][master] 2 commits: Adjust browser addons now that XUL support is gone.

[WolfgangSchweer]

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


Commits:
65b1b311 by Wolfgang Schweer at 2018-10-12T08:19:20Z
Adjust browser addons now that XUL support is gone.

Drop chromium-ublock-origin and xul-ext-ublock-origin.
Add webext-ublock-origin (replacing both)
Drop xul-ext-adblock-plus.

- - - - -
ff80f955 by Wolfgang Schweer at 2018-10-12T08:27:00Z
Updated after running 'make dist'.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- tasks/desktop-other


Changes:

=====================================
debian/changelog
=====================================
@@ -6,6 +6,10 @@ debian-edu (2.10.41) UNRELEASED; urgency=medium
   * tasks/desktop-kde: Recommend sddm-theme-elarun.
     This theme seems to be the only theme providing username/password input
     fields without any changes needed.
+  * Adjust browser addons now that XUL support is gone:
+    - Drop chromium-ublock-origin and xul-ext-ublock-origin.
+    - Add webext-ublock-origin (replacement for both).
+    - Drop xul-ext-adblock-plus.
   * debian/control: Updated after running 'make dist'.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 11 Oct 2018 23:39:59 +0200


=====================================
debian/control
=====================================
@@ -414,7 +414,6 @@ Recommends: alsa-utils,
             avahi-daemon,
             cheese,
             chromium,
-            chromium-ublock-origin,
             cups-bsd,
             cups-client,
             debian-edu-artwork,
@@ -535,7 +534,7 @@ Recommends: alsa-utils,
             totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer,
             unifont,
             unzip,
-            xul-ext-ublock-origin,
+            webext-ublock-origin,
             zip
 Suggests: auctex,
           avahi-autoipd,
@@ -599,8 +598,7 @@ Suggests: auctex,
           texworks,
           wine,
           xfonts-100dpi-transcoded,
-          xfonts-75dpi-transcoded,
-          xul-ext-adblock-plus
+          xfonts-75dpi-transcoded
 Description: Debian Edu common desktop applications
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.


=====================================
tasks/desktop-other
=====================================
@@ -87,13 +87,11 @@ Recommends:
 
 Recommends:
  chromium,
- chromium-ublock-origin,
 NeedConfig: yes, Cache, Printerapp, proxy server
 
 Recommends:
  firefox-esr,
- xul-ext-adblock-plus,
- xul-ext-ublock-origin,
+ webext-ublock-origin,
 NeedConfig: yes, Cache, Printerapp, proxy server
 
 Recommends:



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/269b6d795bbb427d572f82b5a13d1298844f2859...ff80f95524aa0288562df5f2b9f3224d6be08270

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu/compare/269b6d795bbb427d572f82b5a13d1298844f2859...ff80f95524aa0288562df5f2b9f3224d6be08270
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/20181012/b50471d7/attachment-0001.html>