New Upstream Release - mrgingham
Ready changes
Summary
Merged new upstream version: 1.22.1 (was: 1.22).
Resulting package
Built on 2022-12-14T17:30 (took 6m41s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-releases libmrgingham-devapt install -t fresh-releases libmrgingham2-dbgsymapt install -t fresh-releases libmrgingham2apt install -t fresh-releases mrgingham-dbgsymapt install -t fresh-releases mrginghamapt install -t fresh-releases python3-mrgingham-dbgsymapt install -t fresh-releases python3-mrgingham
Lintian Result
- libmrgingham-dev_1.22.1-1~jan+nur1_amd64.deb
- libmrgingham2-dbgsym_1.22.1-1~jan+nur1_amd64.deb
- libmrgingham2_1.22.1-1~jan+nur1_amd64.deb
- mrgingham-dbgsym_1.22.1-1~jan+nur1_amd64.deb
- mrgingham_1.22.1-1~jan+nur1.dsc
- mrgingham_1.22.1-1~jan+nur1_amd64.buildinfo
- mrgingham_1.22.1-1~jan+nur1_amd64.deb
- python3-mrgingham-dbgsym_1.22.1-1~jan+nur1_amd64.deb
- python3-mrgingham_1.22.1-1~jan+nur1_amd64.deb
- mrgingham_1.22.1-1~jan+nur1_amd64.changes
Diff
diff --git a/debian/changelog b/debian/changelog
index 801f3dd..9af9df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mrgingham (1.22.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk> Wed, 14 Dec 2022 17:24:09 -0000
+
mrgingham (1.22-1) unstable; urgency=medium
* New upstream release: mrgingham-rotate-corners tool
diff --git a/mrbuild/Makefile.common.header b/mrbuild/Makefile.common.header
index 3799d07..b0d62a7 100644
--- a/mrbuild/Makefile.common.header
+++ b/mrbuild/Makefile.common.header
@@ -82,9 +82,11 @@ ifneq ($(DEB_HOST_MULTIARCH),)
import ast
import sys
-for d in sys.path:
+prefixes = ("_sysconfigdata_", "_sysconfigdata_m_linux")
+sysconfig_paths = [d + "/" + prefix + "_$(DEB_HOST_MULTIARCH).py" for d in sys.path for prefix in prefixes]
+for filename in sysconfig_paths:
try:
- f = open(d + "/_sysconfigdata__$(DEB_HOST_MULTIARCH).py")
+ f = open(filename)
except:
continue
@@ -94,7 +96,7 @@ for d in sys.path:
conf = ast.literal_eval(s)
break
else:
- raise Exception("Could not find \"_sysconfigdata__$(DEB_HOST_MULTIARCH).py\" in any sys.path directories")
+ raise Exception("Could not find sysconfig file in any sys.path directories. Tried: {}".format(sysconfig_paths))
endef
else
diff --git a/mrbuild/README.org b/mrbuild/README.org
index 8de6dcd..e1269d4 100644
--- a/mrbuild/README.org
+++ b/mrbuild/README.org
@@ -1,3 +1,3 @@
This is the build system. It's a copy of https://github.com/dkogan/mrbuild at
-0ec51fc (2022/04). Some day this might become a package, but until that point I
+eb52e4b (2022/09). Some day this might become a package, but until that point I
don't want to introduce a dependency
diff --git a/packaging/mrgingham.spec b/packaging/mrgingham.spec
index 274a5e1..d5e8d74 100644
--- a/packaging/mrgingham.spec
+++ b/packaging/mrgingham.spec
@@ -1,5 +1,5 @@
Name: mrgingham
-Version: 1.20
+Version: 1.22
Release: 1%{?dist}
Summary: Chessboard corner finder for camera calibrations
@@ -11,7 +11,9 @@ Source0: https://github.com/dkogan/mrgingham/archive/%{version}.tar.gz#/%
BuildRequires: opencv-devel >= 3.2
BuildRequires: boost-devel
BuildRequires: chrpath
-
+# for test--mrgingham-rotate-corners
+BuildRequires: zsh
+BuildRequires: vnlog
# to build the manpages I need to run 'mrgingham-observe-pixel-uncertainty
# --help'
@@ -24,6 +26,9 @@ BuildRequires: python36-libs
Conflicts: mrgingham-tools <= 1.10
+# for mrgingham-rotate-corners
+Requires: vnlog
+
%description
Library to find a grid of points; used for calibration routines
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/95/93aac59621696fa61ec7040e6de0403a7cd75a.debug -rw-r--r-- root/root /usr/lib/debug/.dwz/x86_64-linux-gnu/python3-mrgingham.debug -rw-r--r-- root/root /usr/lib/python3/dist-packages/mrgingham.cpython-311-x86_64-linux-gnu.so
No differences were encountered between the control files of package libmrgingham-dev
No differences were encountered between the control files of package libmrgingham2
No differences were encountered between the control files of package libmrgingham2-dbgsym
No differences were encountered between the control files of package mrgingham
No differences were encountered between the control files of package mrgingham-dbgsym
Control files of package python3-mrgingham: lines which differ (wdiff format)
Depends: libc6 (>= 2.4), libgcc-s1 (>= 3.0), libmrgingham2 (= python3-numpy (>= 1:1.22.0), python3-numpy-abi9, python3 (<< 3.12), 3.11), python3 (>= 3.10~)
Control files of package python3-mrgingham-dbgsym: lines which differ (wdiff format)
Build-Ids: 9593aac59621696fa61ec7040e6de0403a7cd75a b16daca6059a94297beed60c456818a36e0d27af