Merge branch '1.5' into 'master'

Release v1.5

See merge request GNOME/gcab!13

2 files changed, 22 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index f592b83..cbc8252 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+v1.5
+====
+
+New Features:
+ - New gcab_file_set_bytes() API (!8)
+ - meson: Register the gcab executable with meson (!10)
+
+Bugfixes:
+ - Fixed MSZIP compression when deflate algorithm would expand (#16)
+
+   Previous versions of gcab can produce "incorrect" archives (when a compressed
+   block is larger than its input). They are however supported by gcab itself,
+   and we will keep support for it for the foreseeble future.
+
+ - gcab: avoid runtime warnings (!7)
+ - Fix coverity warnings (!9)
+
+Translation updates
+
 v1.4
 ====
 
diff --git a/meson.build b/meson.build
index 8eb4127..d1bd3da 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gcab', 'c',
-  version : '1.4',
+  version : '1.5',
   license : 'LGPL-2.1+',
   meson_version : '>=0.50.0',
   default_options : ['warning_level=2', 'c_std=c99'],
@@ -12,9 +12,9 @@ if git.found()
 endif
 
 # libtool versioning
-lt_current = 1
+lt_current = 2
 lt_revision = 0
-lt_age = 1
+lt_age = 2
 lt_version = '@0@.@1@.@2@'.format(lt_current - lt_age, lt_age, lt_revision)
 darwin_versions = [lt_current + 1, '@0@.@1@.0'.format(lt_current + 1, lt_revision)]