tRevert "Adapt repo headers hack" - amprolla - devuan's apt repo merger (HTM) git clone git://parazyd.org/amprolla.git (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 098f00a32b084d654b164f40adb0389009c8f5fc (DIR) parent 05758d87bfaf50395b1e9726e8481ee72582d682 (HTM) Author: parazyd <parazyd@dyne.org> Date: Wed, 8 Nov 2017 19:22:33 +0100 Revert "Adapt repo headers hack" This reverts commit f1504467d91a9758fb999dcd500d5aaf0e35b148. Diffstat: M lib/config.def.py | 36 ++++++------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) --- (DIR) diff --git a/lib/config.def.py b/lib/config.def.py t@@ -91,37 +91,18 @@ release_aliases = { 'Codename': 'ascii', 'Version': '2.0', }, - # backports always has: - # Origin/Label: DISTRO Backports - # Suite/Codename: CODENAME-backports 'ascii-backports': { - 'Origin': 'Devuan Backports', - 'Label': 'Devuan Backports', - 'Suite': 'ascii-backports', + 'Suite': 'testing-backports', 'Codename': 'ascii-backports', }, - # proposed-updates has: - # Suite: STABILITY-proposed-updates - # Codename: CODENAME-proposed-updates - # Except in stable where: - # Suite: proposed-updates - # Codename: CODENAME-proposed-updates 'ascii-proposed-updates': { 'Suite': 'testing-proposed-updates', 'Codename': 'ascii-proposed-updates', }, - # security always has: - # Label: DISTRO-Security - # Suite: STABILITY - # Codename: CODENAME 'ascii-security': { - 'Label': 'Devuan-Security', - 'Suite': 'testing', - 'Codename': 'ascii', + 'Suite': 'testing-security', + 'Codename': 'ascii-security', }, - # updates has: - # Suite: STABILITY-updates - # Codename: CODENAME-updates 'ascii-updates': { 'Suite': 'testing-updates', 'Codename': 'ascii-updates', t@@ -133,19 +114,16 @@ release_aliases = { 'Version': '1.0', }, 'jessie-backports': { - 'Origin': 'Devuan Backports', - 'Label': 'Devuan Backports', - 'Suite': 'jessie-backports', + 'Suite': 'stable-backports', 'Codename': 'jessie-backports', }, 'jessie-proposed-updates': { - 'Suite': 'proposed-updates', + 'Suite': 'stable-proposed-updates', 'Codename': 'jessie-proposed-updates' }, 'jessie-security': { - 'Label': 'Devuan-Security', - 'Suite': 'stable', - 'Codename': 'jessie', + 'Suite': 'stable-security', + 'Codename': 'jessie-security', }, 'jessie-updates': { 'Suite': 'stable-updates',