tMerge branch 'master' into 'master' Adapt repo headers hack See merge request !1 - 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 05758d87bfaf50395b1e9726e8481ee72582d682 (DIR) parent e977c9e07f177e8bc2b51265de1bc93475397f61 (HTM) Author: parazyd <parazyd@dyne.org> Date: Wed, 8 Nov 2017 18:45:08 +0100 Merge branch 'master' into 'master' Adapt repo headers hack See merge request !1 Diffstat: M lib/config.def.py | 36 +++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 7 deletions(-) --- (DIR) diff --git a/lib/config.def.py b/lib/config.def.py t@@ -91,18 +91,37 @@ release_aliases = { 'Codename': 'ascii', 'Version': '2.0', }, + # backports always has: + # Origin/Label: DISTRO Backports + # Suite/Codename: CODENAME-backports 'ascii-backports': { - 'Suite': 'testing-backports', + 'Origin': 'Devuan Backports', + 'Label': 'Devuan Backports', + 'Suite': 'ascii-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': { - 'Suite': 'testing-security', - 'Codename': 'ascii-security', + 'Label': 'Devuan-Security', + 'Suite': 'testing', + 'Codename': 'ascii', }, + # updates has: + # Suite: STABILITY-updates + # Codename: CODENAME-updates 'ascii-updates': { 'Suite': 'testing-updates', 'Codename': 'ascii-updates', t@@ -114,16 +133,19 @@ release_aliases = { 'Version': '1.0', }, 'jessie-backports': { - 'Suite': 'stable-backports', + 'Origin': 'Devuan Backports', + 'Label': 'Devuan Backports', + 'Suite': 'jessie-backports', 'Codename': 'jessie-backports', }, 'jessie-proposed-updates': { - 'Suite': 'stable-proposed-updates', + 'Suite': 'proposed-updates', 'Codename': 'jessie-proposed-updates' }, 'jessie-security': { - 'Suite': 'stable-security', - 'Codename': 'jessie-security', + 'Label': 'Devuan-Security', + 'Suite': 'stable', + 'Codename': 'jessie', }, 'jessie-updates': { 'Suite': 'stable-updates',