Merge branch 'master' into next

NEWS

@@ -1,4 +1,4 @@
-New in spot 2.12.1.dev  (not yet released)
+New in spot 2.12.2.dev  (not yet released)
 
   Command-line tools:
 
@@ -117,12 +117,21 @@ New in spot 2.12.1.dev  (not yet released)
     status and the AIG circuit; it now does the job silently as
     requested.
 
+New in spot 2.12.2  (2025-01-18)
+
+  Bug fixes:
+
   - to_finite() was dealing incorrectly with edges that were
     both alive and dead.  (Issue #596.)
 
   - LaTeX output of the X[!] operator with broken in both
     LaTeX and self-contained LaTeX mode.  (Issue #597)
 
+  - Fix a bug in the AIGER encoding with certain forms of
+    global-equivalence.
+
+  - Work around a spurious test failure with Python 3.13.
+
 New in spot 2.12.1  (2024-09-23)
 
   Bug fixes:

bin/common_setup.cc

@@ -35,7 +35,7 @@ display_version(FILE *stream, struct argp_state*)
   fputs(program_name, stream);
   fputs(" (" PACKAGE_NAME ") " PACKAGE_VERSION "\n\
 \n\
-Copyright (C) 2024 by the Spot authors, see the AUTHORS File for details.\n\
+Copyright (C) 2025 by the Spot authors, see the AUTHORS File for details.\n\
 License GPLv3+: \
 GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n\
 This is free software: you are free to change and redistribute it.\n\

configure.ac

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.69])
-AC_INIT([spot], [2.12.1.dev], [spot@lrde.epita.fr])
+AC_INIT([spot], [2.12.2.dev], [spot@lrde.epita.fr])
 AC_CONFIG_AUX_DIR([tools])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.11 gnu tar-ustar color-tests parallel-tests])

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: spot
 Source: http://www.lrde.epita.fr/dload/spot/
 
 Files: *
-Copyright: 2003-2024 the Spot authors
+Copyright: 2003-2025 the Spot authors
 License: GPL-3+
  Spot is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by

doc/org/setup.org

@@ -1,11 +1,11 @@
 #+OPTIONS: H:2 num:nil toc:t html-postamble:nil ^:nil
 #+EMAIL: spot@lrde.epita.fr
 #+HTML_LINK_HOME: index.html
-#+MACRO: LASTDATE 2024-09-23
+#+MACRO: LASTDATE 2025-01-18
 
 #+NAME: SPOT_VERSION
 #+BEGIN_SRC python :exports none :results value :wrap org
-return "2.12.1"
+return "2.12.2"
 #+END_SRC
 
 #+NAME: TARBALL_LINK

tests/core/ltlsynt.test

@@ -1332,7 +1332,6 @@ ltlsynt -f "$f2" --polarity=before-decom --verbose 2>out 1>&2
 sed 's/ [0-9.e-]* seconds/ X seconds/g;s/ -> /->/g;' out > outx
 diff outx exp
 
-
 genltl --lily-patterns | ltlsynt --realizability > out && exit 2
 cat >expected <<EOF
 UNREALIZABLE
@@ -1363,13 +1362,8 @@ diff out expected
 
 # Additional test for global equivalences
 # Specifically if the output is set to the negation of another output
-
 ltlsynt -f "((G((p0)<->(!(p1))))&&(((F(a))||(G(b)))<->(G(F(p0)))))" \
         --outs "p1, p0" \
         --verify --aiger | tail -n 1 > out
-
-cat > expected <<EOF
-Circuit was verified
-EOF
+echo 'Circuit was verified' >expected
 diff out expected
-