From 6a84d70439f03815080a3805fb10c81ffc8eece8 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Fri, 11 Aug 2023 14:23:08 -0700 Subject: [PATCH] pkgconf 2.0.1. Signed-off-by: Ariadne Conill --- Makefile.lite | 2 +- NEWS | 17 +++++++++++++++++ configure.ac | 2 +- libpkgconf/libpkgconf.h | 4 ++-- meson.build | 2 +- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile.lite b/Makefile.lite index ff6927f..dfdefba 100644 --- a/Makefile.lite +++ b/Makefile.lite @@ -39,7 +39,7 @@ all: pkgconf-lite libpkgconf/config.h: @echo '#define PACKAGE_NAME "pkgconf-lite"' >> $@ @echo '#define PACKAGE_BUGREPORT "https://git.dereferenced.org/pkgconf/pkgconf/issues"' >> $@ - @echo '#define PACKAGE_VERSION "2.0.0"' >> $@ + @echo '#define PACKAGE_VERSION "2.0.1"' >> $@ @echo '#define PACKAGE PACKAGE_NAME " " PACKAGE_VERSION' >> $@ @echo '#define HAVE_STRLCPY' >> $@ @echo '#define HAVE_STRLCAT' >> $@ diff --git a/NEWS b/NEWS index 8c5ce0c..a48e1c0 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,23 @@ Changes from previous version of pkgconf ======================================== +Changes from 2.0.0 to 2.0.1: +---------------------------- + +* The behavior of --modversion was largely reverted back to the traditional + pkg-config behavior, but still operates on a solved dependency graph. + + The order of --modversion output is based on the dependency resolution + queue which is passed to the solver, which itself generally maps to the + order of the constrants provided on the command line. + +* A new flag, --verbose, has been added. When used with `--modversion`, it + is possible to disambiguate which version belongs to which module: + + % pkgconf --modversion --verbose foo bar + foo: 1.2.3 + bar: 1.3 + Changes from 1.9.5 to 2.0.0: ---------------------------- diff --git a/configure.ac b/configure.ac index 17e61d1..aaecd09 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ dnl implied. In no event shall the authors be liable for any damages arising dnl from the use of this software. AC_PREREQ([2.71]) -AC_INIT([pkgconf],[2.0.0],[https://github.com/pkgconf/pkgconf/issues/new]) +AC_INIT([pkgconf],[2.0.1],[https://github.com/pkgconf/pkgconf/issues/new]) AC_CONFIG_SRCDIR([cli/main.c]) AC_CONFIG_MACRO_DIR([m4]) AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"]) diff --git a/libpkgconf/libpkgconf.h b/libpkgconf/libpkgconf.h index e5a2422..46e615b 100644 --- a/libpkgconf/libpkgconf.h +++ b/libpkgconf/libpkgconf.h @@ -80,8 +80,8 @@ typedef struct pkgconf_queue_ pkgconf_queue_t; #define PKGCONF_FOREACH_LIST_ENTRY_REVERSE(tail, value) \ for ((value) = (tail); (value) != NULL; (value) = (value)->prev) -#define LIBPKGCONF_VERSION 20000 -#define LIBPKGCONF_VERSION_STR "2.0.0" +#define LIBPKGCONF_VERSION 20001 +#define LIBPKGCONF_VERSION_STR "2.0.1" struct pkgconf_queue_ { pkgconf_node_t iter; diff --git a/meson.build b/meson.build index ce6aa90..3aabd26 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('pkgconf', 'c', - version : '2.0.0', + version : '2.0.1', license : 'ISC', meson_version : '>=0.49', default_options : ['c_std=c99'],