diff --git a/debian/changelog b/debian/changelog index 0d6f38bdcc9e09d5ae4824607e33d98d738997ae..c98b6b201b58a272de58175b4cf40dc610b46cad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-bytecode (0.14.2-1) unstable; urgency=medium + + * New upstream version + + -- Julian Gilbey <jdg@debian.org> Fri, 23 Jun 2023 06:30:22 +0100 + python-bytecode (0.14.0-2) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0002-doc-Fix-path-for-local-module.patch b/debian/patches/0002-doc-Fix-path-for-local-module.patch deleted file mode 100644 index cd7e290ccd2b9d69f3c4e1f9a9fa6a2589203897..0000000000000000000000000000000000000000 --- a/debian/patches/0002-doc-Fix-path-for-local-module.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Jochen Sprickerhof <jspricke@debian.org> -Date: Wed, 14 Dec 2022 20:59:06 +0100 -Subject: doc: Fix path for local module - ---- - doc/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/conf.py b/doc/conf.py -index 59550ac..8ff64fd 100644 ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -18,7 +18,7 @@ import os - # If extensions (or modules to document with autodoc) are in another directory, - # add these directories to sys.path here. If the directory is relative to the - # documentation root, use os.path.abspath to make it absolute, like shown here. --sys.path.insert(0, os.path.abspath('.')) -+sys.path.insert(0, os.path.abspath('../src')) - - from bytecode import __version__ - diff --git a/debian/patches/pydevd-add-offset-to-instructions.patch b/debian/patches/pydevd-add-offset-to-instructions.patch index ef7ebf7d4ffd04e59238948780aff15be39c48e1..e810d88a2397f1cbcdbfdeee31d06fccf116d795 100644 --- a/debian/patches/pydevd-add-offset-to-instructions.patch +++ b/debian/patches/pydevd-add-offset-to-instructions.patch @@ -13,11 +13,9 @@ Forwarded: not-needed src/bytecode/instr.py | 6 ++++-- 2 files changed, 15 insertions(+), 6 deletions(-) -diff --git a/src/bytecode/concrete.py b/src/bytecode/concrete.py -index edba7d1..8ad01e7 100644 --- a/src/bytecode/concrete.py +++ b/src/bytecode/concrete.py -@@ -72,7 +72,7 @@ class ConcreteInstr(BaseInstr[int]): +@@ -72,7 +72,7 @@ # For ConcreteInstr the argument is always an integer _arg: int @@ -26,7 +24,7 @@ index edba7d1..8ad01e7 100644 def __init__( self, -@@ -82,12 +82,14 @@ class ConcreteInstr(BaseInstr[int]): +@@ -82,12 +82,14 @@ lineno: Union[int, None, _UNSET] = UNSET, location: Optional[InstrLocation] = None, extended_args: Optional[int] = None, @@ -42,7 +40,7 @@ index edba7d1..8ad01e7 100644 def _check_arg(self, name: str, opcode: int, arg: int) -> None: if opcode >= _opcode.HAVE_ARGUMENT: -@@ -161,7 +163,11 @@ class ConcreteInstr(BaseInstr[int]): +@@ -161,7 +163,11 @@ else: arg = UNSET name = _opcode.opname[op] @@ -55,7 +53,7 @@ index edba7d1..8ad01e7 100644 class ExceptionTableEntry: -@@ -751,6 +757,7 @@ class ConcreteBytecode(_bytecode._BaseBytecodeList[Union[ConcreteInstr, SetLinen +@@ -747,6 +753,7 @@ arg, location=instr.location, extended_args=nb_extended_args, @@ -63,7 +61,7 @@ index edba7d1..8ad01e7 100644 ) instructions[index] = instr nb_extended_args = 0 -@@ -1030,7 +1037,7 @@ class ConcreteBytecode(_bytecode._BaseBytecodeList[Union[ConcreteInstr, SetLinen +@@ -1026,7 +1033,7 @@ instr_index = len(instructions) jumps.append((instr_index, jump_target)) @@ -72,11 +70,9 @@ index edba7d1..8ad01e7 100644 # We now insert the TryEnd entries if current_instr_offset in ex_end: -diff --git a/src/bytecode/instr.py b/src/bytecode/instr.py -index eaa0289..19c1855 100644 --- a/src/bytecode/instr.py +++ b/src/bytecode/instr.py -@@ -434,7 +434,7 @@ A = TypeVar("A", bound=object) +@@ -433,7 +433,7 @@ class BaseInstr(Generic[A]): """Abstract instruction.""" @@ -85,7 +81,7 @@ index eaa0289..19c1855 100644 # Work around an issue with the default value of arg def __init__( -@@ -444,8 +444,10 @@ class BaseInstr(Generic[A]): +@@ -443,8 +443,10 @@ *, lineno: Union[int, None, _UNSET] = UNSET, location: Optional[InstrLocation] = None, @@ -96,7 +92,7 @@ index eaa0289..19c1855 100644 if location: self._location = location elif lineno is UNSET: -@@ -565,7 +567,7 @@ class BaseInstr(Generic[A]): +@@ -564,7 +566,7 @@ return (_effect, 0) def copy(self: T) -> T: diff --git a/debian/patches/series b/debian/patches/series index 3aab4a8201bf08fd05d4d7e177c7a53a9c8b42cb..787f5a3ee56537fb51b029dad029c45bf3e04e6a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ pydevd-add-offset-to-instructions.patch -0002-doc-Fix-path-for-local-module.patch