[neon/forks/sip6/Neon/release] debian: Refresh patches for the new release.

[Dmitry Shachnev]

Git commit 4e4e620f1e57024b88c094ccc6feefc70b408151 by Dmitry Shachnev.
Committed on 08/12/2024 at 14:20.
Pushed by carlosdem into branch 'Neon/release'.

Refresh patches for the new release.

M  +1    -0    debian/changelog
M  +2    -2    debian/patches/intersphinx_local.diff
M  +3    -3    debian/patches/system_ply.diff

https://invent.kde.org/neon/forks/sip6/-/commit/4e4e620f1e57024b88c094ccc6feefc70b408151

diff --git a/debian/changelog b/debian/changelog
index dcd92e5..a26f015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sip6 (6.9.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches for the new release.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 08 Dec 2024 17:15:55 +0300
 
diff --git a/debian/patches/intersphinx_local.diff b/debian/patches/intersphinx_local.diff
index 2d4ba1a..5ecc71b 100644
--- a/debian/patches/intersphinx_local.diff
+++ b/debian/patches/intersphinx_local.diff
@@ -7,10 +7,10 @@ Subject: Use local intersphinx inventory.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/docs/conf.py b/docs/conf.py
-index 799d047..ff6c23c 100644
+index c10b11b..5a737e7 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -20,7 +20,7 @@ version = 'v6.8.6'
+@@ -20,7 +20,7 @@ version = 'v6.9.0'
  # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
  
  extensions = ['myst_parser', 'sphinx.ext.intersphinx']
diff --git a/debian/patches/system_ply.diff b/debian/patches/system_ply.diff
index a8d4fea..db21e5b 100644
--- a/debian/patches/system_ply.diff
+++ b/debian/patches/system_ply.diff
@@ -9,18 +9,18 @@ Forwarded: not-needed
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/sipbuild/generator/parser/parser_manager.py b/sipbuild/generator/parser/parser_manager.py
-index 8d3cb13..5c2c9c8 100644
+index d50f0f6..3d4ecb7 100644
 --- a/sipbuild/generator/parser/parser_manager.py
 +++ b/sipbuild/generator/parser/parser_manager.py
-@@ -27,7 +27,7 @@ from ..utils import (argument_as_str, cached_name, find_iface_file,
+@@ -27,7 +27,7 @@ from ..utils import (abi_has_deprecated_message, argument_as_str, cached_name,
  from . import rules
  from . import tokens
  from .annotations import InvalidAnnotation, validate_annotation_value
 -from .ply import lex, yacc
 +from ply import lex, yacc
  
- 
  class ParserManager:
+     """ This object manages the actual lexer and parser objects providing them
 diff --git a/sipbuild/generator/parser/tokens.py b/sipbuild/generator/parser/tokens.py
 index 81bc941..725c881 100644
 --- a/sipbuild/generator/parser/tokens.py