diff options
| author | Remko van der Vossen | 2019-05-11 13:43:44 +0200 |
|---|---|---|
| committer | Remko van der Vossen | 2019-05-11 13:43:44 +0200 |
| commit | 0d002dbd5622f442fd23135699b6904386f7e64d (patch) | |
| tree | 6e44416a2edb545f295236c8b30eee23b3e2e0ff /smgl | |
| parent | 96bdce10da7f1a70c83ea3671835acc1e007c1db (diff) | |
basesystem: removed CONFLICTS
removed CONFLICS, only deinstall gnupg when installing an alternative,
this prevents breakage of sorcery which relies on the presence of a
gpg binary to do both hash and signature verification
Diffstat (limited to 'smgl')
| -rwxr-xr-x | smgl/basesystem/CONFLICTS | 1 | ||||
| -rw-r--r-- | smgl/basesystem/HISTORY | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/smgl/basesystem/CONFLICTS b/smgl/basesystem/CONFLICTS deleted file mode 100755 index 8de899b135..0000000000 --- a/smgl/basesystem/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts gnupg y diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY index af647e8a21..19ccbbbf8a 100644 --- a/smgl/basesystem/HISTORY +++ b/smgl/basesystem/HISTORY @@ -1,3 +1,6 @@ +2019-05-11 Remko van der Vossen <wich@sourcemage.org> + * CONFLICTS: removed, only deinstall gnupg when installing an alternative + 2019-01-25 Pavel Vinogradov <public@sourcemage.org> * FINAL: dropped, not needed, GNUPG handles transition |