[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 NEWS            |   10 ++++++++++
 configure.ac    |    4 ++--
 src/Makefile.am |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 260442346a5756c3538ee8fcbf157d1cddcf6f36
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Jul 26 23:39:10 2015 +0200

    1.0.0

diff --git a/NEWS b/NEWS
index d079877..70e1088 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Overview of changes leading to 1.0.0
+Thursday, July 26, 2015
+====================================
+
+- Implement Universal Shaping Engine:
+  https://www.microsoft.com/typography/OpenTypeDev/USE/intro.htm
+  http://blogs.windows.com/bloggingwindows/2015/02/23/windows-shapes-the-worlds-languages/
+- Bump version to 1.0.0.  The soname was NOT bumped.
+
+
 Overview of changes leading to 0.9.42
 Thursday, July 26, 2015
 =====================================
diff --git a/configure.ac b/configure.ac
index ff61c95..c6aa7ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([HarfBuzz],
-        [0.9.42],
+        [1.0.0],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
@@ -51,7 +51,7 @@ m4_if(m4_eval(hb_version_minor % 2), [1],
 m4_define([hb_libtool_age],
 	  m4_eval(hb_version_int - hb_libtool_revision))
 m4_define([hb_libtool_current],
-	  m4_eval(hb_version_major + hb_libtool_age))
+	  m4_eval(hb_libtool_age))
 HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age
 AC_SUBST(HB_LIBTOOL_VERSION_INFO)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a528c9d..753b930 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -371,7 +371,7 @@ TESTS_ENVIRONMENT = \
 if HAVE_INTROSPECTION
 
 -include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS = HarfBuzz-$(HB_VERSION_MAJOR).0.gir # What does the 0 mean anyway?!
+INTROSPECTION_GIRS = HarfBuzz-0.0.gir # What does the 0 mean anyway?!
 INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ --warn-all
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 INTROSPECTION_SCANNER_ENV = CC="$(CC)"