Control: tags 1028794 + pending Dear maintainer,
I've prepared an NMU for oregano (versioned as 0.84.41+dfsg.1-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru oregano-0.84.41+dfsg.1/debian/changelog oregano-0.84.41+dfsg.1/debian/changelog --- oregano-0.84.41+dfsg.1/debian/changelog 2019-01-29 17:36:16.000000000 +0200 +++ oregano-0.84.41+dfsg.1/debian/changelog 2023-02-12 13:17:30.000000000 +0200 @@ -1,3 +1,11 @@ +oregano (0.84.41+dfsg.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch from Bas Couwenberg to fix FTBFS with Python 3.11. + (Closes: #1028794) + + -- Adrian Bunk <b...@debian.org> Sun, 12 Feb 2023 13:17:30 +0200 + oregano (0.84.41+dfsg.1-1) unstable; urgency=medium * New upstream release diff -Nru oregano-0.84.41+dfsg.1/debian/patches/python3.11.patch oregano-0.84.41+dfsg.1/debian/patches/python3.11.patch --- oregano-0.84.41+dfsg.1/debian/patches/python3.11.patch 1970-01-01 02:00:00.000000000 +0200 +++ oregano-0.84.41+dfsg.1/debian/patches/python3.11.patch 2023-02-12 13:17:25.000000000 +0200 @@ -0,0 +1,35 @@ +Description: Don't use U mode, removed in python3.11. +Author: Bas Couwenberg <sebas...@debian.org> +Bug-Debian: https://bugs.debian.org/1028794 + +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -146,7 +146,7 @@ class ConfigSet(object): + Utils.writef(filename,''.join(buf)) + def load(self,filename): + tbl=self.table +- code=Utils.readf(filename,m='rU') ++ code=Utils.readf(filename,m='r') + for m in re_imp.finditer(code): + g=m.group + tbl[g(2)]=eval(g(3)) +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -106,7 +106,7 @@ class Context(ctx): + cache[node]=True + self.pre_recurse(node) + try: +- function_code=node.read('rU',encoding) ++ function_code=node.read('r',encoding) + exec(compile(function_code,node.abspath(),'exec'),self.exec_dict) + finally: + self.post_recurse(node) +@@ -346,7 +346,7 @@ def load_module(path,encoding=None): + pass + module=imp.new_module(WSCRIPT_FILE) + try: +- code=Utils.readf(path,m='rU',encoding=encoding) ++ code=Utils.readf(path,m='r',encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r'%path) + module_dir=os.path.dirname(path) diff -Nru oregano-0.84.41+dfsg.1/debian/patches/series oregano-0.84.41+dfsg.1/debian/patches/series --- oregano-0.84.41+dfsg.1/debian/patches/series 2019-01-29 17:36:16.000000000 +0200 +++ oregano-0.84.41+dfsg.1/debian/patches/series 2023-02-12 13:17:25.000000000 +0200 @@ -2,3 +2,4 @@ 0007-Update-russian-translation.patch 0003-Remove-Encoding-field-in-desktop-file.patch 0004-Spelling-fixes.patch +python3.11.patch
