diff --git a/ChangeLog b/ChangeLog index bacc183e66..5377070861 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun May 3 20:43:27 PDT 1998 Shawn T. Amundson + + * Version number changed to 1.0.1, along with a more automatic + changing of version numbers in the Makefile.am files + Fri May 1 22:32:47 1998 Owen Taylor * gtk/gtkbutton.c (gtk_button_paint): Draw the areas diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bacc183e66..5377070861 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun May 3 20:43:27 PDT 1998 Shawn T. Amundson + + * Version number changed to 1.0.1, along with a more automatic + changing of version numbers in the Makefile.am files + Fri May 1 22:32:47 1998 Owen Taylor * gtk/gtkbutton.c (gtk_button_paint): Draw the areas diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bacc183e66..5377070861 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun May 3 20:43:27 PDT 1998 Shawn T. Amundson + + * Version number changed to 1.0.1, along with a more automatic + changing of version numbers in the Makefile.am files + Fri May 1 22:32:47 1998 Owen Taylor * gtk/gtkbutton.c (gtk_button_paint): Draw the areas diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bacc183e66..5377070861 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun May 3 20:43:27 PDT 1998 Shawn T. Amundson + + * Version number changed to 1.0.1, along with a more automatic + changing of version numbers in the Makefile.am files + Fri May 1 22:32:47 1998 Owen Taylor * gtk/gtkbutton.c (gtk_button_paint): Draw the areas diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bacc183e66..5377070861 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun May 3 20:43:27 PDT 1998 Shawn T. Amundson + + * Version number changed to 1.0.1, along with a more automatic + changing of version numbers in the Makefile.am files + Fri May 1 22:32:47 1998 Owen Taylor * gtk/gtkbutton.c (gtk_button_paint): Draw the areas diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bacc183e66..5377070861 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun May 3 20:43:27 PDT 1998 Shawn T. Amundson + + * Version number changed to 1.0.1, along with a more automatic + changing of version numbers in the Makefile.am files + Fri May 1 22:32:47 1998 Owen Taylor * gtk/gtkbutton.c (gtk_button_paint): Draw the areas diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bacc183e66..5377070861 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun May 3 20:43:27 PDT 1998 Shawn T. Amundson + + * Version number changed to 1.0.1, along with a more automatic + changing of version numbers in the Makefile.am files + Fri May 1 22:32:47 1998 Owen Taylor * gtk/gtkbutton.c (gtk_button_paint): Draw the areas diff --git a/INSTALL b/INSTALL index 066b8b9c9f..5a6be487f8 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Simple install procedure ======================== - % gzip -cd gtk+-1.0.0.tar.gz | tar xvf - # unpack the sources - % cd gtk+-1.0.0 # change to the toplevel directory + % gzip -cd gtk+-1.0.1.tar.gz | tar xvf - # unpack the sources + % cd gtk+-1.0.1 # change to the toplevel directory % ./configure # run the `configure' script % make # build GTK [ Become root if necessary ] diff --git a/README b/README index f5f4ca6e95..080e5c019e 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ General Information =================== -This is GTK+ version 1.0.0. GTK+, which stands for the Gimp ToolKit, +This is GTK+ version 1.0.1. GTK+, which stands for the Gimp ToolKit, is a library for creating graphical user interfaces for the X Window System. It is designed to be small, efficient, and flexible. GTK+ is written in C with a very object-oriented approach. diff --git a/configure.in b/configure.in index fa0d741d7b..8074eeb559 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ cflags_set=${CFLAGS+set} GTK_MAJOR_VERSION=1 GTK_MINOR_VERSION=0 -GTK_MICRO_VERSION=0 +GTK_MICRO_VERSION=1 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION # For automake. @@ -147,6 +147,9 @@ AC_SUBST(x_includes) AC_SUBST(x_ldflags) AC_SUBST(x_libs) AC_SUBST(xinput_progs) +AC_SUBST(GTK_MAJOR_VERSION) +AC_SUBST(GTK_MINOR_VERSION) +AC_SUBST(GTK_MICRO_VERSION) AC_SUBST(GTK_VERSION) CFLAGS="$saved_cflags" diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 1530d0e686..e24067a388 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -46,7 +46,7 @@ gdkinclude_HEADERS = \ gdktypes.h \ gdkx.h -libgdk_la_LDFLAGS = -version-info 1:0:0 \ +libgdk_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 \ @x_ldflags@ @x_libs@ INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ diff --git a/glib/Makefile.am b/glib/Makefile.am index 7ee39bae91..0c3ed27796 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -25,7 +25,7 @@ include_HEADERS = \ configinclude_DATA = \ glibconfig.h -libglib_la_LDFLAGS = -version-info 1:0:0 +libglib_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0 INCLUDES = -I$(top_srcdir) diff --git a/glib/configure.in b/glib/configure.in index cc78947c5d..0b2c9c5bbd 100644 --- a/glib/configure.in +++ b/glib/configure.in @@ -4,8 +4,15 @@ AC_INIT(glist.c) # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} -dnl Initialize automake stuff -AM_INIT_AUTOMAKE(glib, 1.0.0) +GLIB_MAJOR_VERSION=1 +GLIB_MINOR_VERSION=0 +GLIB_MICRO_VERSION=1 +GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION + +VERSION=$GLIB_VERSION +PACKAGE=glib + +AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) # Specify a configuration file AM_CONFIG_HEADER(glibconfig.h) @@ -166,4 +173,9 @@ if test $gtk_ok = no; then fi AC_MSG_RESULT($gtk_ok) +AC_SUBST(GLIB_MAJOR_VERSION) +AC_SUBST(GLIB_MINOR_VERSION) +AC_SUBST(GLIB_MICRO_VERSION) +AC_SUBST(GLIB_VERSION) + AC_OUTPUT(Makefile) diff --git a/gtk+.spec b/gtk+.spec index f5eee51359..26945fcdd0 100644 --- a/gtk+.spec +++ b/gtk+.spec @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 1.0.0 +%define ver 1.0.1 %define rel SNAP %define prefix /usr @@ -46,6 +46,10 @@ are in gtk+-devel. %changelog +* Sun May 3 1998 Shawn T. Amundson + +- Changed version to 1.0.1 + * Mon Apr 13 1998 Marc Ewing - Split out glib package diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d0b99fcf2a..28f66abf20 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -197,7 +197,7 @@ $(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el $(srcdir)/gtktypebuiltins.c: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el $(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el id $< $@ -libgtk_la_LDFLAGS = -version-info 1:0:0 +libgtk_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 EXTRA_DIST = \ line-arrow.xbm \