diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | glib/Makefile.am | 4 |
11 files changed, 71 insertions, 9 deletions
@@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ac1dbeb84..dc41e2dc0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ac1dbeb84..dc41e2dc0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ac1dbeb84..dc41e2dc0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ac1dbeb84..dc41e2dc0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ac1dbeb84..dc41e2dc0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ac1dbeb84..dc41e2dc0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ac1dbeb84..dc41e2dc0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Thu Jul 6 15:35:28 2000 Owen Taylor <otaylor@redhat.com> + + * Release 1.3.1 + + * Makefile.am (EXTRA_DIST): Dist fixes. + + * configure.in: Moderate the warnings just a little bit. + 2000-07-05 Tor Lillqvist <tml@iki.fi> * README.win32: Update. diff --git a/Makefile.am b/Makefile.am index 2a7b67def..f47fff298 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,12 +10,14 @@ glib-config: glib-config.in INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -EXTRA_DIST = \ +EXTRA_DIST = \ + ChangeLog.pre-1-2 \ glib.m4 \ glib.spec.in \ acglib.m4 \ sanity_check \ README.win32 \ + TODO.xml \ glib.def \ makefile.msc \ makefile.msc.in \ diff --git a/configure.in b/configure.in index d834e596f..f5e08c3a8 100644 --- a/configure.in +++ b/configure.in @@ -1516,7 +1516,7 @@ case $host in *-*-cygwin*) glib_os="#define G_OS_UNIX #define G_WITH_CYGWIN" - ;; +v ;; *) glib_os="#define G_OS_UNIX" ;; @@ -1547,12 +1547,6 @@ echo "" echo " * You should not base stable software on this version of GLib." echo " * GNOME developers should use a stable version of GLib." echo "" -echo "Distributions should *NOT* ship a development package of this GLib." -echo "Do not ship the headers and do not ship the glib-config script. These" -echo "things will conflict with the stable 1.2 series. Package only enough" -echo "to satisfy the requirements of some other package. Package only the" -echo "library itself. Doing otherwise will do no favors to the community." -echo "" echo "If you install this version of GLib, we strongly recommend that you" echo "install it in a different prefix than GLib 1.2. Use --prefix as an" echo "argument to configure to do this. Otherwise, you will not be able to" diff --git a/glib/Makefile.am b/glib/Makefile.am index 2a7b67def..f47fff298 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -10,12 +10,14 @@ glib-config: glib-config.in INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ -EXTRA_DIST = \ +EXTRA_DIST = \ + ChangeLog.pre-1-2 \ glib.m4 \ glib.spec.in \ acglib.m4 \ sanity_check \ README.win32 \ + TODO.xml \ glib.def \ makefile.msc \ makefile.msc.in \ |