[neon/forks/sip6/Neon/release] debian: Refresh patches for the new release.
Dmitry Shachnev
null at kde.org
Sun Aug 17 07:48:50 BST 2025
Git commit 58f662e49bb5bb87488db32f536ca3badf0cc34a by Dmitry Shachnev.
Committed on 02/02/2025 at 18:16.
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 +4 -4 debian/patches/system_ply.diff
https://invent.kde.org/neon/forks/sip6/-/commit/58f662e49bb5bb87488db32f536ca3badf0cc34a
diff --git a/debian/changelog b/debian/changelog
index 5ff09b2..28c68dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
sip6 (6.10.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches for the new release.
* Pass write_tables=False to yacc to fix runtime warnings.
-- Dmitry Shachnev <mitya57 at debian.org> Fri, 13 Dec 2024 12:18:51 +0300
diff --git a/debian/patches/intersphinx_local.diff b/debian/patches/intersphinx_local.diff
index 1765f54..aaeda9c 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 8c7412c..7a65c71 100644
+index 4c56130..561e690 100644
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -20,7 +20,7 @@ version = 'v6.9.1'
+@@ -20,7 +20,7 @@ version = 'v6.10.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 22ab9f6..547c673 100644
--- a/debian/patches/system_ply.diff
+++ b/debian/patches/system_ply.diff
@@ -11,10 +11,10 @@ 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 d50f0f6..00bbf3d 100644
+index 0f1d771..202c243 100644
--- a/sipbuild/generator/parser/parser_manager.py
+++ b/sipbuild/generator/parser/parser_manager.py
-@@ -27,7 +27,7 @@ from ..utils import (abi_has_deprecated_message, argument_as_str, cached_name,
+@@ -28,7 +28,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
@@ -23,7 +23,7 @@ index d50f0f6..00bbf3d 100644
class ParserManager:
""" This object manages the actual lexer and parser objects providing them
-@@ -44,7 +44,7 @@ class ParserManager:
+@@ -45,7 +45,7 @@ class ParserManager:
self._lexer.pm = self
# Create the parser.
@@ -33,7 +33,7 @@ index d50f0f6..00bbf3d 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 81bc941..725c881 100644
+index ddb1aaa..282c6dd 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