tconform to debian Release headers - 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 12f35378ba14e19232f1ba1899b5f4d8f437f6fb
 (DIR) parent 39cf04135a3efcb3030b557d583ad7921b5ed862
 (HTM) Author: parazyd <parazyd@dyne.org>
       Date:   Thu, 29 Jun 2017 16:01:07 +0200
       
       conform to debian Release headers
       
       Diffstat:
         M lib/config.def.py                   |       3 ++-
         M lib/release.py                      |       6 ++++--
       
       2 files changed, 6 insertions(+), 3 deletions(-)
       ---
 (DIR) diff --git a/lib/config.def.py b/lib/config.def.py
       t@@ -20,6 +20,7 @@ checksums = [
            {'name': 'SHA256', 'f': sha256},
        ]
        
       +distrolabel = 'Devuan'
        repo_order = ['devuan', 'debian-security', 'debian']
        
        repos = {
       t@@ -142,7 +143,7 @@ srcfiles = [
        ]
        
        release_keys = [
       -    'Origin',
       +    # 'Origin',
            'Label',
            'Suite',
            'Version',
 (DIR) diff --git a/lib/release.py b/lib/release.py
       t@@ -8,8 +8,8 @@ from datetime import datetime, timedelta
        from os.path import getsize, isfile
        import gnupg
        
       -from lib.config import (checksums, gpgdir, release_aliases, release_keys,
       -                        signingkey)
       +from lib.config import (checksums, distrolabel, gpgdir, release_aliases,
       +                        release_keys, signingkey)
        from lib.parse import parse_release_head
        
        
       t@@ -41,6 +41,8 @@ def write_release(oldrel, newrel, filelist, r, sign=True):
            # rewrite Suite to allow for being on stable/testing rather than
            # jessie/ascii/...
            if rel_cont['Suite'] in release_aliases:
       +        rel_cont['Label'] = distrolabel
       +        rel_cont['Codename'] = rel_cont['Suite']
                rel_cont['Suite'] = release_aliases[rel_cont['Suite']]
        
            for k in release_keys: