Hi!

I'm attaching the diff for the changes uploaded in 1.64.0-1.1. I've uploaded this with a 5 days delay. I'll also prepare a merge request in salsa.

Happy hacking,
--
Saludos /\/\ /\ >< `/
diff -Nru nghttp2-1.64.0/debian/changelog nghttp2-1.64.0/debian/changelog
--- nghttp2-1.64.0/debian/changelog	2024-10-28 20:45:36.000000000 +0100
+++ nghttp2-1.64.0/debian/changelog	2025-04-11 17:50:32.000000000 +0200
@@ -1,3 +1,9 @@
+nghttp2 (1.64.0-1.1) unstable; urgency=medium
+
+  * Add patch: lp-2104171-avoid-rubydomain-namespace.patch (Closes: #1095360)
+
+ -- Maximiliano Curia <m...@debian.org>  Fri, 11 Apr 2025 17:50:32 +0200
+
 nghttp2 (1.64.0-1) unstable; urgency=medium
 
   * New upstream version 1.64.0
diff -Nru nghttp2-1.64.0/debian/patches/lp-2104171-avoid-rubydomain-namespace.patch nghttp2-1.64.0/debian/patches/lp-2104171-avoid-rubydomain-namespace.patch
--- nghttp2-1.64.0/debian/patches/lp-2104171-avoid-rubydomain-namespace.patch	1970-01-01 01:00:00.000000000 +0100
+++ nghttp2-1.64.0/debian/patches/lp-2104171-avoid-rubydomain-namespace.patch	2025-04-11 17:50:32.000000000 +0200
@@ -0,0 +1,28 @@
+Description: Fix FTBFS due to rubydomain namespace
+ Fixes FTBFS due to: "Could not import extension rubydomain.rubydomain"
+ (exception: No module named 'pkg_resources')
+
+Author: Lukas Märdian <sl...@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/2104171
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1095360
+Origin: vendor, Ubuntu
+Forwarded: https://github.com/nghttp2/nghttp2/pull/2318
+Last-Update: 2025-03-27
+
+--- nghttp2-1.64.0.orig/doc/_exts/rubydomain/__init__.py
++++ nghttp2-1.64.0/doc/_exts/rubydomain/__init__.py
+@@ -1,14 +0,0 @@
+-# -*- coding: utf-8 -*-
+-"""
+-    sphinxcontrib
+-    ~~~~~~~~~~~~~
+-
+-    This package is a namespace package that contains all extensions
+-    distributed in the ``sphinx-contrib`` distribution.
+-
+-    :copyright: Copyright 2007-2009 by the Sphinx team, see AUTHORS.
+-    :license: BSD, see LICENSE for details.
+-"""
+-
+-__import__('pkg_resources').declare_namespace(__name__)
+-
diff -Nru nghttp2-1.64.0/debian/patches/series nghttp2-1.64.0/debian/patches/series
--- nghttp2-1.64.0/debian/patches/series	2024-10-28 20:45:36.000000000 +0100
+++ nghttp2-1.64.0/debian/patches/series	2025-04-11 17:50:32.000000000 +0200
@@ -1,2 +1,3 @@
 0002-Workaround-for-963648.patch
 0002-add-munit-explicitly.patch
+lp-2104171-avoid-rubydomain-namespace.patch

Reply via email to