[Git][debian-edu/debian-edu-config][master] debian/control: Add 'Conflicts: firefox-esr-mobile-config'.
"Mike Gabriel (@sunweaver)" <[email protected]> Fri, 22 May 2026 22:30:21 +0000
| Newsgroups | gmane.linux.skolelinux.cvs |
|---|---|
| Message-ID | <[email protected]> |
--===============2948997972822255278==
Content-Type: multipart/alternative;
boundary="--==_mimepart_6a10d8fcd8b44_54fa5b14e02049858";
charset=UTF-8
Content-Transfer-Encoding: 7bit
----==_mimepart_6a10d8fcd8b44_54fa5b14e02049858
Content-Type: text/plain;
charset=UTF-8
Content-Transfer-Encoding: 7bit
Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config
Commits:
17c18602 by Daniel Teichmann at 2026-05-22T22:30:02+00:00
debian/control: Add 'Conflicts: firefox-esr-mobile-config'.
This ensures that /usr/share/firefox-esr/distribution/policies.json
will not be overwritten by the other package.
Closes: #1126881
- - - - -
1 changed file:
- debian/control
Changes:
=====================================
debian/control
=====================================
@@ -18,6 +18,7 @@ Vcs-Git: https://salsa.debian.org/debian-edu/debian-edu-config.git
Package: debian-edu-config
Architecture: all
+Conflicts: firefox-esr-mobile-config,
Depends: ${misc:Depends},
adduser,
bind9-host,
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/17c18602e912b344863a826cbaa9136dc42e0b22
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/17c18602e912b344863a826cbaa9136dc42e0b22
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
----==_mimepart_6a10d8fcd8b44_54fa5b14e02049858
Content-Type: text/html;
charset=UTF-8
Content-Transfer-Encoding: quoted-printable
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www=
.w3.org/TR/REC-html40/loose.dtd">
<html lang=3D"en" style=3D'--code-editor-font: var(--default-mono-font, "=
GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, =
Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospac=
e;'>
<head>
<meta content=3D"text/html; charset=3Dutf-8" http-equiv=3D"Content-Type">=
<title>
GitLab
</title>
<style data-premailer=3D"ignore" type=3D"text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: hsla(0,0%,100%,.01) 0 0 1px;
}
body {
font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Ro=
boto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Colo=
r Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size=
: inherit;
}
</style>
</head>
<body style=3D'font-size: inherit; -webkit-text-shadow: hsla(0,0%,100%,.0=
1) 0 0 1px; font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"=
Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif=
,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji=
";'>
<div class=3D"content">
<h3 style=3D"margin-top: 20px; margin-bottom: 10px;">
Mike Gabriel pushed to branch master at <a href=3D"https://salsa.debian.o=
rg/debian-edu/debian-edu-config">Debian Edu / debian-edu-config</a>
</h3>
<h4 style=3D"margin-top: 10px; margin-bottom: 10px;">
Commits:
</h4>
<ul>
<li>
<strong style=3D"font-weight: 600;"><a href=3D"https://salsa.debian.org/d=
ebian-edu/debian-edu-config/-/commit/17c18602e912b344863a826cbaa9136dc42e=
0b22">17c18602</a></strong>
<div>
<span> by Daniel Teichmann </span> <i> at 2026-05-22T22:30:02+00:00 </i>
</div>
<pre class=3D"commit-message" style=3D'white-space: pre-wrap; display: bl=
ock; font-size: 14px; color: #3a383f; position: relative; font-family: "G=
itLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liberation M=
ono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida co=
nsole", monospace; font-variant-ligatures: none; word-break: break-all; w=
ord-wrap: break-word; background-color: #fbfafd; border-radius: 2px; marg=
in: 0; padding: 8px 12px; border: 1px solid #dcdcde;'>debian/control: Add=
'Conflicts: firefox-esr-mobile-config'.
This ensures that /usr/share/firefox-esr/distribution/policies.json
will not be overwritten by the other package.
Closes: #1126881
</pre>
</li>
</ul>
<h4 style=3D"margin-top: 10px; margin-bottom: 10px;">
1 changed file:
</h4>
<ul>
<li class=3D"file-stats">
<a href=3D"#58ef006ab62b83b4bec5d81fe5b32c3b4c2d1cc2">
debian/control
</a>
</li>
</ul>
<h4 style=3D"margin-top: 10px; margin-bottom: 10px;">
Changes:
</h4>
<li id=3D"58ef006ab62b83b4bec5d81fe5b32c3b4c2d1cc2">
<a href=3D"https://salsa.debian.org/debian-edu/debian-edu-config/-/commit=
/17c18602e912b344863a826cbaa9136dc42e0b22#58ef006ab62b83b4bec5d81fe5b32c3=
b4c2d1cc2"><strong style=3D"font-weight: 600;">debian/control</strong></a=
>
<hr style=3D"overflow: hidden; border: 1px solid #dcdcde;">
<table class=3D"code white" style=3D"border-spacing: 0; border-collapse: =
collapse; width: auto; font-family: monospace; font-size: 90%;" bgcolor=3D=
"#ffffff" width=3D"100%" cellpadding=3D"0" cellspacing=3D"0">
<tr class=3D"line_holder match" style=3D"line-height: 1.6;">
<td class=3D"diff-line-num unfold js-unfold old_line" data-linenumber=3D"=
18" style=3D"width: 35px; color: rgba(5,5,6,.24); border-right-width: 1px=
; border-right-color: #ececef; border-right-style: solid; padding: inheri=
t;" align=3D"right" bgcolor=3D"#fbfafd">...</td>
<td class=3D"diff-line-num unfold js-unfold new_line" data-linenumber=3D"=
18" style=3D"width: 35px; color: rgba(5,5,6,.24); border-right-width: 1px=
; border-right-color: #ececef; border-right-style: solid; padding: inheri=
t;" align=3D"right" bgcolor=3D"#fbfafd">...</td>
<td class=3D"line_content match" style=3D"color: rgba(5,5,6,.24); padding=
: inherit;" bgcolor=3D"#fbfafd">@@ -18,6 +18,7 @@ Vcs-Git: https://salsa.=
debian.org/debian-edu/debian-edu-config.git</td>
</tr>
<tr class=3D"line_holder" style=3D"line-height: 1.6;">
<td class=3D"old_line diff-line-num" data-linenumber=3D"18" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
18
</td>
<td class=3D"new_line diff-line-num" data-linenumber=3D"18" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
18
</td>
<td class=3D"line_content" style=3D"padding: inherit;"><pre style=3D'disp=
lay: block; font-size: 14px; color: #3a383f; position: relative; font-fam=
ily: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liber=
ation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lu=
cida console", monospace; font-variant-ligatures: none; word-break: break=
-all; word-wrap: break-word; background-color: inherit; border-radius: 2p=
x; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span class=3D=
"line" data-lang=3D"plaintext"></span>
</pre></td>
</tr>
<tr class=3D"line_holder" style=3D"line-height: 1.6;">
<td class=3D"old_line diff-line-num" data-linenumber=3D"19" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
19
</td>
<td class=3D"new_line diff-line-num" data-linenumber=3D"19" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
19
</td>
<td class=3D"line_content" style=3D"padding: inherit;"><pre style=3D'disp=
lay: block; font-size: 14px; color: #3a383f; position: relative; font-fam=
ily: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liber=
ation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lu=
cida console", monospace; font-variant-ligatures: none; word-break: break=
-all; word-wrap: break-word; background-color: inherit; border-radius: 2p=
x; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span class=3D=
"line" data-lang=3D"plaintext">Package: debian-edu-config</span>
</pre></td>
</tr>
<tr class=3D"line_holder" style=3D"line-height: 1.6;">
<td class=3D"old_line diff-line-num" data-linenumber=3D"20" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
20
</td>
<td class=3D"new_line diff-line-num" data-linenumber=3D"20" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
20
</td>
<td class=3D"line_content" style=3D"padding: inherit;"><pre style=3D'disp=
lay: block; font-size: 14px; color: #3a383f; position: relative; font-fam=
ily: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liber=
ation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lu=
cida console", monospace; font-variant-ligatures: none; word-break: break=
-all; word-wrap: break-word; background-color: inherit; border-radius: 2p=
x; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span class=3D=
"line" data-lang=3D"plaintext">Architecture: all</span>
</pre></td>
</tr>
<tr class=3D"line_holder new" style=3D"line-height: 1.6;">
<td class=3D"old_line diff-line-num new" data-linenumber=3D"21" style=3D"=
width: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-righ=
t-color: #c7f0d2; border-right-style: solid; padding: inherit;" align=3D"=
right" bgcolor=3D"#ddfbe6">
=
</td>
<td class=3D"new_line diff-line-num new" data-linenumber=3D"21" style=3D"=
width: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-righ=
t-color: #c7f0d2; border-right-style: solid; padding: inherit;" align=3D"=
right" bgcolor=3D"#ddfbe6">
21
</td>
<td class=3D"line_content new" style=3D"padding: inherit;" bgcolor=3D"#ec=
fdf0"><pre style=3D'display: block; font-size: 14px; color: #3a383f; posi=
tion: relative; font-family: "GitLab Mono", "JetBrains Mono", "Menlo", "D=
ejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier =
New", "andale mono", "lucida console", monospace; font-variant-ligatures:=
none; word-break: break-all; word-wrap: break-word; background-color: in=
herit; border-radius: 2px; margin: 0; padding: 0; border: inherit solid #=
dcdcde;'>+<span class=3D"line" data-lang=3D"plaintext">Conflicts: firefox=
-esr-mobile-config,</span>
</pre></td>
</tr>
<tr class=3D"line_holder" style=3D"line-height: 1.6;">
<td class=3D"old_line diff-line-num" data-linenumber=3D"21" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
21
</td>
<td class=3D"new_line diff-line-num" data-linenumber=3D"22" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
22
</td>
<td class=3D"line_content" style=3D"padding: inherit;"><pre style=3D'disp=
lay: block; font-size: 14px; color: #3a383f; position: relative; font-fam=
ily: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liber=
ation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lu=
cida console", monospace; font-variant-ligatures: none; word-break: break=
-all; word-wrap: break-word; background-color: inherit; border-radius: 2p=
x; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span class=3D=
"line" data-lang=3D"plaintext">Depends: ${misc:Depends},</span>
</pre></td>
</tr>
<tr class=3D"line_holder" style=3D"line-height: 1.6;">
<td class=3D"old_line diff-line-num" data-linenumber=3D"22" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
22
</td>
<td class=3D"new_line diff-line-num" data-linenumber=3D"23" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
23
</td>
<td class=3D"line_content" style=3D"padding: inherit;"><pre style=3D'disp=
lay: block; font-size: 14px; color: #3a383f; position: relative; font-fam=
ily: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liber=
ation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lu=
cida console", monospace; font-variant-ligatures: none; word-break: break=
-all; word-wrap: break-word; background-color: inherit; border-radius: 2p=
x; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span class=3D=
"line" data-lang=3D"plaintext"> adduser,</span>
</pre></td>
</tr>
<tr class=3D"line_holder" style=3D"line-height: 1.6;">
<td class=3D"old_line diff-line-num" data-linenumber=3D"23" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
23
</td>
<td class=3D"new_line diff-line-num" data-linenumber=3D"24" style=3D"widt=
h: 35px; color: rgba(5,5,6,.24); border-right-width: 1px; border-right-co=
lor: #ececef; border-right-style: solid; padding: inherit;" align=3D"righ=
t" bgcolor=3D"#fbfafd">
24
</td>
<td class=3D"line_content" style=3D"padding: inherit;"><pre style=3D'disp=
lay: block; font-size: 14px; color: #3a383f; position: relative; font-fam=
ily: "GitLab Mono", "JetBrains Mono", "Menlo", "DejaVu Sans Mono", "Liber=
ation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lu=
cida console", monospace; font-variant-ligatures: none; word-break: break=
-all; word-wrap: break-word; background-color: inherit; border-radius: 2p=
x; margin: 0; padding: 0; border: inherit solid #dcdcde;'> <span class=3D=
"line" data-lang=3D"plaintext"> bind9-host,</span>
</pre></td>
</tr>
</table>
<br>
</li>
</div>
<div class=3D"footer" style=3D"margin-top: 10px;">
<p style=3D"font-size: small; color: #626168;">
=E2=80=94
<br>
<a href=3D"https://salsa.debian.org/debian-edu/debian-edu-config/-/commit=
/17c18602e912b344863a826cbaa9136dc42e0b22">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target=3D"_blan=
k" rel=3D"noopener noreferrer" href=3D"https://salsa.debian.org">salsa.de=
bian.org</a>. <a href=3D"https://salsa.debian.org/-/profile/notifications=
" target=3D"_blank" rel=3D"noopener noreferrer" class=3D"mng-notif-link">=
Manage all notifications</a> =C2=B7 <a href=3D"https://salsa.debian.org/h=
elp" target=3D"_blank" rel=3D"noopener noreferrer" class=3D"help-link">He=
lp</a>
<span style=3D"color: transparent; font-size: 0; display: none; overflow:=
hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0;">
Notification message regarding https://salsa.debian.org/debian-edu/debian=
-edu-config/-/commit/17c18602e912b344863a826cbaa9136dc42e0b22 at 17794890=
20
</span>
<script type=3D"application/ld+json">{"@context":"http://schema.org","@ty=
pe":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","u=
rl":"https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/17c18=
602e912b344863a826cbaa9136dc42e0b22"}}</script>
</p>
</div>
</body>
</html>
----==_mimepart_6a10d8fcd8b44_54fa5b14e02049858--
--===============2948997972822255278==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
debian-edu-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-edu-commits
--===============2948997972822255278==--