Hi,
I've took the liberty to upload a NMU to delayed 5, diff is attached:
* If you're ok with the diff, I would be happy to cancel it and upload
directly to unstable.
* If you're not ok with the diff, I'm happy to cancel the upload and
let you do it.
Regards,
Danieldiff -Naurp psycopg3-3.0.1-1/debian/changelog psycopg3-3.1.3-0.1/debian/changelog
--- psycopg3-3.0.1-1/debian/changelog 2022-04-19 18:24:23.000000000 +0000
+++ psycopg3-3.1.3-0.1/debian/changelog 2022-10-05 13:04:30.264758092 +0000
@@ -1,3 +1,13 @@
+psycopg3 (3.1.3-0.1) unstable; urgency=medium
+
+ * Non-maintainer source-only upload (Closes: #1014833).
+ * Updating to current upstream as needed by pgcli (Closes: #1021249):
+ - rediffing change-Sphinx-theme.patch.
+ - rediffing use-local-documentation.patch.
+ - adding newly required python3-typing-extensions to build-depends.
+
+ -- Daniel Baumann <daniel.baum...@progress-linux.org> Wed, 05 Oct 2022 10:48:22 +0200
+
psycopg3 (3.0.1-1) unstable; urgency=medium
* Initial release (Closes: #995447).
diff -Naurp psycopg3-3.0.1-1/debian/control psycopg3-3.1.3-0.1/debian/control
--- psycopg3-3.0.1-1/debian/control 2021-10-26 19:12:58.000000000 +0000
+++ psycopg3-3.1.3-0.1/debian/control 2022-10-05 13:05:14.024726666 +0000
@@ -12,7 +12,8 @@ Build-Depends:
python3-pytest <!nocheck>,
python3-dnspython <!nocheck>,
python3-shapely <!nocheck>,
- python3-tenacity <!nocheck>
+ python3-tenacity <!nocheck>,
+ python3-typing-extensions,
Build-Depends-Indep:
python3-doc <!nodoc>,
python-psycopg2-doc <!nodoc>,
diff -Naurp psycopg3-3.0.1-1/debian/patches/change-Sphinx-theme.patch psycopg3-3.1.3-0.1/debian/patches/change-Sphinx-theme.patch
--- psycopg3-3.0.1-1/debian/patches/change-Sphinx-theme.patch 2021-10-26 19:12:58.000000000 +0000
+++ psycopg3-3.1.3-0.1/debian/patches/change-Sphinx-theme.patch 2022-10-05 11:20:31.833502894 +0000
@@ -3,17 +3,18 @@ Description: Change generated Sphinx doc
Forwarded: not-needed
Author: Tomasz Rybak <serp...@debian.org>
Last-Update: 2021-10-17
-Index: psycopg3-3.0.1/docs/conf.py
-===================================================================
---- psycopg3-3.0.1.orig/docs/conf.py
-+++ psycopg3-3.0.1/docs/conf.py
-@@ -75,17 +75,17 @@ pygments_style = "tango"
+
+diff -Naurp psycopg3.orig/docs/conf.py psycopg3/docs/conf.py
+--- psycopg3.orig/docs/conf.py
++++ psycopg3/docs/conf.py
+@@ -75,18 +75,18 @@ pygments_style = "tango"
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = "furo"
+html_theme = "alabaster"
- html_show_sphinx = False
+ html_show_sphinx = True
+ html_show_sourcelink = False
-html_theme_options = {
- "announcement": announcement,
- "sidebar_hide_name": False,
diff -Naurp psycopg3-3.0.1-1/debian/patches/use-local-documentation.patch psycopg3-3.1.3-0.1/debian/patches/use-local-documentation.patch
--- psycopg3-3.0.1-1/debian/patches/use-local-documentation.patch 2021-10-26 19:12:58.000000000 +0000
+++ psycopg3-3.1.3-0.1/debian/patches/use-local-documentation.patch 2022-10-05 13:02:03.724863329 +0000
@@ -3,11 +3,11 @@ Description: Ensure reproducible documen
Forwarded: not-needed
Author: Tomasz Rybak <serp...@debian.org>
Last-Update: 2021-10-17
-Index: psycopg3-3.0.1/docs/conf.py
-===================================================================
---- psycopg3-3.0.1.orig/docs/conf.py
-+++ psycopg3-3.0.1/docs/conf.py
-@@ -96,8 +96,10 @@ html_static_path = ["_static"]
+
+diff -Naurp psycopg3.orig/docs/conf.py psycopg3/docs/conf.py
+--- psycopg3.orig/docs/conf.py
++++ psycopg3/docs/conf.py
+@@ -97,8 +97,10 @@ html_static_path = ["_static"]
default_role = "obj"
intersphinx_mapping = {
@@ -20,25 +20,26 @@ Index: psycopg3-3.0.1/docs/conf.py
}
autodoc_member_order = "bysource"
-Index: psycopg3-3.0.1/docs/lib/libpq_docs.py
-===================================================================
---- psycopg3-3.0.1.orig/docs/lib/libpq_docs.py
-+++ psycopg3-3.0.1/docs/lib/libpq_docs.py
-@@ -7,6 +7,8 @@ Add the ``:pq:`` role, to create a link
+diff -Naurp psycopg3.orig/docs/lib/libpq_docs.py psycopg3/docs/lib/libpq_docs.py
+--- psycopg3.orig/docs/lib/libpq_docs.py
++++ psycopg3/docs/lib/libpq_docs.py
+@@ -6,7 +6,8 @@ Add the ``:pq:`` role, to create a link
+ :pq:`PQlibVersion()`
will link to::
-
+-
+ file:///usr/share/doc/postgresql-doc-13/html/libpq-misc.html #LIBPQ-PQLIBVERSION
+previously to:
https://www.postgresql.org/docs/current/libpq-misc.html #LIBPQ-PQLIBVERSION
"""
-@@ -81,7 +83,7 @@ class LibpqParser(HTMLParser):
- )
+@@ -89,8 +90,7 @@ class LibpqReader:
+ app = None
_url_pattern = (
-- "https://www.postgresql.org/docs/{version}/{section}.html#{func_id}";
+- "https://raw.githubusercontent.com/postgres/postgres/REL_{ver}_STABLE";
+- "/doc/src/sgml/libpq.sgml"
+ "file:///usr/share/doc/postgresql-doc-{version}/html/{section}.html#{func_id}"
)
-
+ data = None
