1.17.11.17.1

4 files changed, 25 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 5ecd79b..f6665ba 100755
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,23 @@
-1.17.0 (unstable) or 1.18.0 (stable): <<<Not released yet>>>
+1.17.1 (unstable):
 
 * Add SaveGuard save/restore object
-  (Jason Rhinelander, Kjell Ahlstedt) Issue #9
+  (Jason Rhinelander, Kjell Ahlstedt) Issue #9 (Ian Britten)
 * Add Surface::set/get_device_scale()
   (Thomas Holder) Merge request !22
+* ScaledFont: Add get_text_extents() and get_glyph_extents()
+  (Vitaly Dyachkov) Issue #30
+* Use callback functions with C linkage
+  (Kjell Ahlstedt) Issue glibmm#1 (Murray Cumming)
 
 Documentation:
 * Surface: Use cairomm names where possible
   (Kjell Ahlstedt)
+* Context: Fix some typos
+  (Daniel Boles) Merge request !26
+* Update Visual Studio build docs
+  (Chun-wei Fan) Merge request !28
+* Remove AUTHORS and MAINTAINERS; add info to README.md
+  (Kjell Ahlstedt) Issue gtkmm#140
 
 Build:
 * Meson build: Re-organize warnings-related compiler flags for MSVC
@@ -16,6 +26,12 @@ Build:
   (Kjell Ahlstedt) Issue #29 (bbhtt)
 * Require cairo >= 1.14.0
   (Kjell Ahlstedt)
+* Meson build: Detect if we build from a git subtree
+  (William Roy) Merge request gtkmm!72
+* Meson build: Don't copy files with configure_file()
+  (Kjell Ahlstedt)
+* Meson build: Fix the evaluation of is_git_build on Windows
+  (Kjell Ahlstedt) Issue gtkmm#131 (William Roy)
 
 
 1.16.2 (stable):
diff --git a/README.md b/README.md
index 264fd64..98374c5 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@ This library provides a C++ interface to cairo.
 
 # General information
 
+cairomm-1.0 and cairomm-1.16 are different parallel-installable ABIs.
+This file describes cairomm-1.16.
+
 Web site
  - https://www.cairographics.org/cairomm/
 
@@ -43,7 +46,7 @@ configure.ac file.
 
 ## Building on Windows
 
-See [MSVC-Builds.md](MSVC_NMake/MSVC-Builds.md)
+See [MSVC-Builds](MSVC_NMake/MSVC-Builds.md)
 
 ## Building from a release tarball
 
diff --git a/configure.ac b/configure.ac
index 5c86219..bbc153d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([cairomm], [1.16.2],
+AC_INIT([cairomm], [1.17.1],
         [https://gitlab.freedesktop.org/cairo/cairomm/-/issues],
         [cairomm], [http://www.cairographics.org/cairomm/])
 AC_PREREQ([2.62])
diff --git a/meson.build b/meson.build
index ece167e..b8c2191 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 # This file is part of cairomm.
 
 project('cairomm', 'cpp',
-  version: '1.16.2',
+  version: '1.17.1',
   license: 'LGPLv2+',
   default_options: [
     'cpp_std=c++17',
@@ -316,6 +316,7 @@ if can_add_dist_script
   dont_distribute = [
     'tools',
     '.gitlab-ci.yml',
+    'examples/Makefile.am_fragment',
   ]
 
   # Add build scripts to the distribution directory, and delete .gitignore