Release 0.11

Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in: Release 0.11

	* pango.spec.in: Add missing make command.

	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.

	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h

11 files changed, 76 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ff832b77..b48c5a92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Release 0.11
+
+	* pango.spec.in: Add missing make command.
+
+	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.
+
+	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h
+
 Tue May 30 14:30:24 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/fonts.c (pango_font_description_from_string): Use g_strtod().
@@ -99,7 +109,6 @@ Thu May 18 17:30:00 2000  Robert Brady  <rwb197@zepler.org>
 
 	* fonts/devnag18.bdf: Fix advance widths of some glyphs.
 
->>>>>>> 1.65
 Tue May  9 22:09:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-types.h (PANGO_SCALE): Change PANGO_SCALE
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index ff832b77..b48c5a92 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,13 @@
+Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Release 0.11
+
+	* pango.spec.in: Add missing make command.
+
+	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.
+
+	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h
+
 Tue May 30 14:30:24 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/fonts.c (pango_font_description_from_string): Use g_strtod().
@@ -99,7 +109,6 @@ Thu May 18 17:30:00 2000  Robert Brady  <rwb197@zepler.org>
 
 	* fonts/devnag18.bdf: Fix advance widths of some glyphs.
 
->>>>>>> 1.65
 Tue May  9 22:09:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-types.h (PANGO_SCALE): Change PANGO_SCALE
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index ff832b77..b48c5a92 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Release 0.11
+
+	* pango.spec.in: Add missing make command.
+
+	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.
+
+	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h
+
 Tue May 30 14:30:24 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/fonts.c (pango_font_description_from_string): Use g_strtod().
@@ -99,7 +109,6 @@ Thu May 18 17:30:00 2000  Robert Brady  <rwb197@zepler.org>
 
 	* fonts/devnag18.bdf: Fix advance widths of some glyphs.
 
->>>>>>> 1.65
 Tue May  9 22:09:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-types.h (PANGO_SCALE): Change PANGO_SCALE
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index ff832b77..b48c5a92 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,13 @@
+Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Release 0.11
+
+	* pango.spec.in: Add missing make command.
+
+	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.
+
+	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h
+
 Tue May 30 14:30:24 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/fonts.c (pango_font_description_from_string): Use g_strtod().
@@ -99,7 +109,6 @@ Thu May 18 17:30:00 2000  Robert Brady  <rwb197@zepler.org>
 
 	* fonts/devnag18.bdf: Fix advance widths of some glyphs.
 
->>>>>>> 1.65
 Tue May  9 22:09:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-types.h (PANGO_SCALE): Change PANGO_SCALE
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index ff832b77..b48c5a92 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,13 @@
+Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Release 0.11
+
+	* pango.spec.in: Add missing make command.
+
+	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.
+
+	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h
+
 Tue May 30 14:30:24 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/fonts.c (pango_font_description_from_string): Use g_strtod().
@@ -99,7 +109,6 @@ Thu May 18 17:30:00 2000  Robert Brady  <rwb197@zepler.org>
 
 	* fonts/devnag18.bdf: Fix advance widths of some glyphs.
 
->>>>>>> 1.65
 Tue May  9 22:09:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-types.h (PANGO_SCALE): Change PANGO_SCALE
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index ff832b77..b48c5a92 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,13 @@
+Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Release 0.11
+
+	* pango.spec.in: Add missing make command.
+
+	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.
+
+	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h
+
 Tue May 30 14:30:24 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/fonts.c (pango_font_description_from_string): Use g_strtod().
@@ -99,7 +109,6 @@ Thu May 18 17:30:00 2000  Robert Brady  <rwb197@zepler.org>
 
 	* fonts/devnag18.bdf: Fix advance widths of some glyphs.
 
->>>>>>> 1.65
 Tue May  9 22:09:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-types.h (PANGO_SCALE): Change PANGO_SCALE
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index ff832b77..b48c5a92 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Wed May 31 10:46:53 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Release 0.11
+
+	* pango.spec.in: Add missing make command.
+
+	* modules/basic/Makefile.am (EXTRA_DIST): Fix up extra-dist.
+
+	* pango/Makefile.am (libpangox_la_SOURCES): Add pangox-private.h
+
 Tue May 30 14:30:24 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/fonts.c (pango_font_description_from_string): Use g_strtod().
@@ -99,7 +109,6 @@ Thu May 18 17:30:00 2000  Robert Brady  <rwb197@zepler.org>
 
 	* fonts/devnag18.bdf: Fix advance widths of some glyphs.
 
->>>>>>> 1.65
 Tue May  9 22:09:42 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/pango-types.h (PANGO_SCALE): Change PANGO_SCALE
diff --git a/configure.in b/configure.in
index 4fb3eb18..5dd55b56 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to create configure.
 
 AC_INIT(ChangeLog)
-AM_INIT_AUTOMAKE(pango, 0.10)
+AM_INIT_AUTOMAKE(pango, 0.11)
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index d618444e..b69b6671 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -18,3 +18,6 @@ pango_basic_la_SOURCES = $(sources)
 
 libpango_basic_la_SOURCES = $(sources)
 
+EXTRA_DIST =		\
+	tables-big.i	\
+	tables-small.i
\ No newline at end of file
diff --git a/pango.spec.in b/pango.spec.in
index 087c3371..dccdaca0 100644
--- a/pango.spec.in
+++ b/pango.spec.in
@@ -36,6 +36,7 @@ pango.
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --sysconfdir=/etc --localstatedir=/var
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/pango/Makefile.am b/pango/Makefile.am
index b865ae58..076e183e 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -26,6 +26,7 @@ libpango_la_SOURCES = 	   \
 
 libpangox_la_SOURCES = 	   \
 	pangox.c	   \
+	pangox-private.h   \
 	pangox-fontcache.c \
 	pangox-fontmap.c