[neon/forks/sip6/Neon/release] debian: Refresh patches for the new release.
Dmitry Shachnev
null at kde.org
Mon Jul 27 12:04:48 BST 2026
Git commit d214207a2d95980f37847f0df4811c147ef057da by Dmitry Shachnev.
Committed on 06/12/2025 at 16:58.
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 +5 -5 debian/patches/system_ply.diff
https://invent.kde.org/neon/forks/sip6/-/commit/d214207a2d95980f37847f0df4811c147ef057da
diff --git a/debian/changelog b/debian/changelog
index 792547a..64dfb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sip6 (6.15.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Build-depend on python3-pytest for the tests.
* Document the --option flag in sip-module(1).
+ * Refresh patches for the new release.
-- Dmitry Shachnev <mitya57 at debian.org> Sat, 06 Dec 2025 19:48:25 +0300
diff --git a/debian/patches/intersphinx_local.diff b/debian/patches/intersphinx_local.diff
index f85f6b9..1ba1001 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 f96dca2..75a80ae 100644
+index fbe76a5..cf38edb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -20,7 +20,7 @@ version = 'v6.14.0'
+@@ -20,7 +20,7 @@ version = 'v6.15.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 547c673..db572eb 100644
--- a/debian/patches/system_ply.diff
+++ b/debian/patches/system_ply.diff
@@ -11,19 +11,19 @@ Forwarded: not-needed
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sipbuild/generator/parser/parser_manager.py b/sipbuild/generator/parser/parser_manager.py
-index 0f1d771..202c243 100644
+index f94fca6..b014e86 100644
--- a/sipbuild/generator/parser/parser_manager.py
+++ b/sipbuild/generator/parser/parser_manager.py
-@@ -28,7 +28,7 @@ from ..utils import (argument_as_str, cached_name, find_iface_file,
+@@ -29,7 +29,7 @@ from ..utils import (argument_as_str, cached_name, find_iface_file,
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
-@@ -45,7 +45,7 @@ class ParserManager:
+@@ -47,7 +47,7 @@ class ParserManager:
self._lexer.pm = self
# Create the parser.
@@ -33,7 +33,7 @@ index 0f1d771..202c243 100644
# This is a hack to give p_error() access to the current parser object.
diff --git a/sipbuild/generator/parser/tokens.py b/sipbuild/generator/parser/tokens.py
-index ddb1aaa..282c6dd 100644
+index e7c3dc6..6a2eb1d 100644
--- a/sipbuild/generator/parser/tokens.py
+++ b/sipbuild/generator/parser/tokens.py
@@ -5,7 +5,7 @@
More information about the Neon-commits
mailing list