Control: tags 972597 + patch Control: tags 972597 + pending Dear maintainer,
I've prepared an NMU for glom (versioned as 1.30.4-6.1) and uploaded it to DELAYED/1. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru glom-1.30.4/debian/changelog glom-1.30.4/debian/changelog
--- glom-1.30.4/debian/changelog 2020-03-09 22:12:58.000000000 +0100
+++ glom-1.30.4/debian/changelog 2020-11-14 12:44:41.000000000 +0100
@@ -1,3 +1,13 @@
+glom (1.30.4-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/: Switch to default postgresql version and generate concrete
+ dependencies during the build. (Closes: #972597)
+ - Add libpq-dev to Build-Depends for a useable pg_config
+ - Use pg_config to look up postgresql's bindir and generate dependencies
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sat, 14 Nov 2020 12:44:41 +0100
+
glom (1.30.4-6) unstable; urgency=medium
* debian/rules: Fix FTBFS with python3.8 (Closes: #952416)
diff -Nru glom-1.30.4/debian/control glom-1.30.4/debian/control
--- glom-1.30.4/debian/control 2020-03-09 22:12:58.000000000 +0100
+++ glom-1.30.4/debian/control 2020-11-14 09:36:09.000000000 +0100
@@ -30,13 +30,14 @@
libgoocanvasmm-2.0-dev (>= 1.90.11),
libgtkmm-3.0-dev (>= 3.18.0),
libgtksourceviewmm-3.0-dev (>= 3.18.0),
+ libpq-dev,
libtool,
libtool-bin,
libxml++2.6-dev (>= 2.24.0),
libxml-parser-perl,
libxslt1-dev (>= 1.1.10),
mm-common,
- postgresql-12,
+ postgresql,
python-gi-dev,
python3-dev (>= 3.8),
python3-sphinx,
@@ -101,7 +102,7 @@
iso-codes,
libgda-5.0-postgres,
libglom-1.30-0 (= ${binary:Version}),
- postgresql-12
+ ${postgresql:Depends}
Recommends: glom-doc (= ${binary:Version})
Description: database designer and user interface
With Glom you can design table definitions and the relationships between
@@ -145,7 +146,7 @@
gir1.2-gda-5.0,
libgda-5.0-postgres,
libglom-1.30-0 (= ${binary:Version}),
- postgresql-12
+ ${postgresql:Depends}
Description: Command-line utilities for Glom
With Glom you can design table definitions and the relationships between
them, plus arrange the fields on the screen. You can edit and search the
diff -Nru glom-1.30.4/debian/control.in glom-1.30.4/debian/control.in
--- glom-1.30.4/debian/control.in 2020-03-09 22:12:58.000000000 +0100
+++ glom-1.30.4/debian/control.in 2020-11-14 09:59:47.000000000 +0100
@@ -26,13 +26,14 @@
libgoocanvasmm-2.0-dev (>= 1.90.11),
libgtkmm-3.0-dev (>= 3.18.0),
libgtksourceviewmm-3.0-dev (>= 3.18.0),
+ libpq-dev,
libtool,
libtool-bin,
libxml++2.6-dev (>= 2.24.0),
libxml-parser-perl,
libxslt1-dev (>= 1.1.10),
mm-common,
- postgresql-12,
+ postgresql,
python-gi-dev,
python3-dev (>= 3.8),
python3-sphinx,
@@ -97,7 +98,7 @@
iso-codes,
libgda-5.0-postgres,
libglom-1.30-0 (= ${binary:Version}),
- postgresql-12
+ ${postgresql:Depends}
Recommends: glom-doc (= ${binary:Version})
Description: database designer and user interface
With Glom you can design table definitions and the relationships between
@@ -141,7 +142,7 @@
gir1.2-gda-5.0,
libgda-5.0-postgres,
libglom-1.30-0 (= ${binary:Version}),
- postgresql-12
+ ${postgresql:Depends}
Description: Command-line utilities for Glom
With Glom you can design table definitions and the relationships between
them, plus arrange the fields on the screen. You can edit and search the
diff -Nru glom-1.30.4/debian/rules glom-1.30.4/debian/rules
--- glom-1.30.4/debian/rules 2020-03-09 22:12:58.000000000 +0100
+++ glom-1.30.4/debian/rules 2020-11-14 12:38:02.000000000 +0100
@@ -16,7 +16,7 @@
override_dh_auto_configure:
dh_auto_configure -- \
--disable-update-mime-database \
- --with-postgres-utils=/usr/lib/postgresql/12/bin \
+ --with-postgres-utils=$(shell pg_config --bindir) \
PYTHON_CPPFLAGS="$(PYTHON_CPPFLAGS_PKGCONFIG)" \
PYTHON_LIBS="-L/usr/lib/$(DEB_HOST_MULTIARCH) $(PYTHON_LIB_PKGCONFIG)" \
PYTHON=python3 PYTHON_VERSION=3
@@ -52,3 +52,6 @@
override_dh_missing:
dh_missing --list-missing
+
+override_dh_gencontrol:
+ dh_gencontrol -- -Vpostgresql:Depends=postgresql-$(shell pg_config --bindir | grep -o "[[:digit:]]*")
signature.asc
Description: PGP signature
