Document 0.4.3 changes. Fix automake 1.7 warnings.

diff --git a/ChangeLog b/ChangeLog
index c0d923a444ded0215c4d3fdf5b85bb12ca48ccf2..08d49c10ddcb6ca34932a0b488f70b9510d68a6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-20  Jordi Mallach  <jordi@sindominio.net>
+
+       * NEWS: update for 0.4.3.
+
+       * doc/gtetrinet.6: document the keybind changes.
+
+       * src/Makefile.am: use AM_CPPFLAGS, not CPPFLAGS.
+
 2002-10-20  Jordi Mallach  <jordi@sindominio.net>
 
        * Patches from James Antill with the following fixes.

diff --git a/NEWS b/NEWS
index e3623fbdf145d0d480d5a6334fc90c79122d2016..aa977fee858eb48bd08223a7bbc80c53e7e3c595 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+GTetrinet 0.4.3 - Unreleased
+- IPv6 support!
+- Add missing includes so i18n works correctly.
+- Minimize the space used by attacks/defenses.
+- Add different colours to attacks/defenses, depending on their type
+  and who they affect.
+- Fix the random ordering of special blocks.
+- Change keybindings for page switching to Alt-1, Alt-2 and Alt-3.
+  See the manpage.
+
 GTetrinet 0.4.2 - 2002-10-17
 - Pages can now be detached (configure with --enable-detach).
 - TetriFast support.

diff --git a/doc/gtetrinet.6 b/doc/gtetrinet.6
index 4b7bbcf4c2ae3052bdc9dcfa08c8128e15e1cb84..545d77260f912a7b80bdc9d8c9c817f3efb89794 100644 (file)
--- a/doc/gtetrinet.6
+++ b/doc/gtetrinet.6
@@ -63,7 +63,8 @@ this package).
 Once inside a server, you'll be able to communicate with other players
 using the \fBPartyLine\fP tab, see the server's highscores in the
 \fBWinlist\fP tab and the actual game in the \fBPlaying Fields\fP tab.
-You can switch between the three tabs using the F1, F2 and F3 shortcuts.
+You can switch between the three tabs using the Alt+1, Alt+2 and Alt+3
+shortcuts.
 .br
 Tetrinet is like Tetris, but multiplayer and with some additions. The goal of
 the game is to remain alive, by filling up other player's fields. There are

diff --git a/src/Makefile.am b/src/Makefile.am
index 212aa9a8aec69a235bc99c5441aad56b1c8c5b0e..28db9ebed0247e813a6f44bce268fa082a1fad43 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = images
 localedir = $(datadir)/locale
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" $(GTK_CFLAGS) $(GNOME_INCLUDEDIR)
 LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GTK_LIBS)
-CPPFLAGS = -DGTETRINET_DATA=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -DGTETRINET_DATA=\"$(pkgdatadir)\"
 
 gamesdir = $(prefix)/games
 games_PROGRAMS = gtetrinet