Le 14/06/16 à 19:09, Christian PERRIER a écrit :
Quoting Laurent Bigonville (bi...@debian.org):
reassign 827254 src:tasksel
retitle 827254 tasksel: Please switch from iceweasel-l10n-* to
firefox-esr-l10n-* | firefox-l10n-*
thanks
On Tue, 14 Jun 2016 10:46:22 +0200 Laurent Bigonville
wrote:
Could you please change the dependencies from iceweasel-l10n-fr to
firefox-esr-l10n-fr | firefox-l10n-fr ?
Actually this needs to be done for all the desktop language packages.
This is partly pending in git: iceweasel has been replaced by
firefox-esr, there.
I'm not entirely convinced that it makes sense to mention the
alternative, though (which makes a quite tedious change to 68
different tasks).
What about this?
I think it's a good idea to allow people to choose if they want the esr
version or not
The patch has been generated with the following vim command:
%s/firefox-esr-l10n-\([^,]*\),\?$/firefox-esr-l10n-\1 | firefox-l10n-\1,/g
>From e162bb422bf86c0a6f473c351b1f806fa717 Mon Sep 17 00:00:00 2001
From: Laurent Bigonville
Date: Tue, 14 Jun 2016 21:08:31 +0200
Subject: [PATCH] Add an alternative to the non esr firefox
---
debian/control | 146 -
1 file changed, 73 insertions(+), 73 deletions(-)
diff --git a/debian/control b/debian/control
index d035c67..7972b6b 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Recommends:
synaptic,
# firefox is the most popular web browser at the moment,
# although both gnome and kde offer their own too
- firefox-esr,
+ firefox-esr | firefox,
# libreoffice is the best word processor / office suite at the moment
libreoffice,
# make help menu work
@@ -127,7 +127,7 @@ Recommends:
gimp,
# firefox is the most popular web browser at the moment,
# although both gnome and kde offer their own too
- firefox-esr,
+ firefox-esr | firefox,
# libreoffice is the best word processor / office suite at the moment
libreoffice,
# make help menu work
@@ -163,7 +163,7 @@ Recommends:
synaptic,
# firefox is the most popular web browser at the moment,
# although both gnome and kde offer their own too
- firefox-esr,
+ firefox-esr | firefox,
# libreoffice is the best word processor / office suite at the moment
libreoffice,
# make help menu work
@@ -222,7 +222,7 @@ Recommends:
synaptic,
# firefox is the most popular web browser at the moment,
# although both gnome and kde offer their own too
- firefox-esr,
+ firefox-esr | firefox,
# libreoffice is the best word processor / office suite at the moment
libreoffice,
# make help menu work
@@ -267,7 +267,7 @@ Recommends:
synaptic,
# firefox) is the most popular web browser at the moment,
# although both gnome and kde offer their own too
- firefox-esr,
+ firefox-esr | firefox,
# libreoffice is the best word processor / office suite at the moment
libreoffice,
# make help menu work
@@ -343,7 +343,7 @@ Description: Albanian desktop
This task localises the desktop in Albanian.
Depends: ${misc:Depends},
Recommends:
- firefox-esr-l10n-sq
+ firefox-esr-l10n-sq | firefox-l10n-sq,
Package: task-amharic
Architecture: all
@@ -398,7 +398,7 @@ Depends: ${misc:Depends},
Recommends:
fonts-kacst,
fonts-farsiweb,
- firefox-esr-l10n-ar,
+ firefox-esr-l10n-ar | firefox-l10n-ar,
libreoffice-l10n-ar,
hunspell-ar
@@ -425,7 +425,7 @@ Description: Asturian desktop
Depends: ${misc:Depends},
Recommends:
libreoffice-l10n-ast,
- firefox-esr-l10n-ast
+ firefox-esr-l10n-ast | firefox-l10n-ast,
Package: task-basque
Architecture: all
@@ -442,7 +442,7 @@ Description: Basque desktop
This task localises the desktop in Basque.
Depends: ${misc:Depends},
Recommends:
- firefox-esr-l10n-eu,
+ firefox-esr-l10n-eu | firefox-l10n-eu,
libreoffice-l10n-eu,
libreoffice-help-eu,
hunspell-eu-es
@@ -470,7 +470,7 @@ Description: Belarusian desktop
Depends: ${misc:Depends},
Recommends:
libreoffice-l10n-be,
- firefox-esr-l10n-be,
+ firefox-esr-l10n-be | firefox-l10n-be,
hunspell-be
Package: task-belarusian-kde-desktop
@@ -497,8 +497,8 @@ Description: Bengali desktop
Depends: ${misc:Depends},
Recommends:
libreoffice-l10n-bn,
- firefox-esr-l10n-bn-in,
- firefox-esr-l10n-bn-bd,
+ firefox-esr-l10n-bn-in | firefox-l10n-bn-in,
+ firefox-esr-l10n-bn-bd | firefox-l10n-bn-bd,
fonts-lohit-beng-bengali
Package: task-bengali-kde-desktop
@@ -529,7 +529,7 @@ Description: Bosnian desktop
Depends: ${misc:Depends},
Recommends:
libreoffice-l10n-bs,
- firefox-esr-l10n-bs,
+ firefox-esr-l10n-bs | firefox-l10n-bs,
myspell-hr
Package: task-bosnian-kde-desktop
@@ -565,7 +565,7 @@ Description: Brazilian Portuguese desktop
Depends: ${misc:Depends},
Recommends:
libreoffice-l10n-pt-br,
- firefox-esr-l10n-pt-br,
+ firefox-esr-l10n-pt-br | firefox-l10n-pt-br,
myspell-pt-br
Package: task-brazilian-portuguese-kde-desktop
@@ -583,7 +583,7 @@ Description: British English desktop
XBC-Maintainer: Per