--- Begin Message ---
--- freeciv-1.4.3.orig/common/registry.c
+++ freeciv-1.4.3/common/registry.c
@@ -187,7 +187,8 @@
}
}
- fclose(fs);
+ if (ferror(fs) || fclose(fs) == EOF)
+ return 0;
return 1;
}
--- freeciv-1.4.3.orig/debian/changelog
+++ freeciv-1.4.3/debian/changelog
@@ -0,0 +1,77 @@
+freeciv (1.4.3-1) unstable; urgency=low
+
+ * New upstream source (BETA).
+ * Renamed README.debian to README.Debian.
+ * Recommend at least version 0.10 of xaw-wrappers.
+ * Don't make clean target depend on configure target.
+
+ -- Richard Braakman <dark@xs4all.nl> Thu, 4 Dec 1997 17:52:15 +0100
+
+freeciv (1.0k-4) unstable; urgency=low
+
+ * Added entries for (libc5) xaw3d and nextaw to xaw-wrappers file,
+ to avoid coredumps.
+ * Added entry for compat xaw95 and libc6 xaw95g even though they
+ do not exist yet.
+ * Oops, when I made freeciv recommend xaw-wrappers I accidentally
+ made it recommend (rather than depend on) its shared libraries too.
+ Fixed.
+
+ -- Richard Braakman <dark@xs4all.nl> Mon, 17 Nov 1997 13:07:25 +0100
+
+freeciv (1.0k-3) unstable; urgency=low
+
+ * Added note by upstream author to README.debian.
+ * Patched save-game routine to check for write errors. (#11521)
+
+ -- Richard Braakman <dark@xs4all.nl> Mon, 17 Nov 1997 11:53:25 +0100
+
+freeciv (1.0k-2) unstable; urgency=low
+
+ * Installed config entry for xaw-wrappers, because freeciv requires
+ the original Xaw library.
+ * Recommend xaw-wrappers for that reason.
+ * Previous changelog was incorrect: I decided not to install menu
+ entries after all, because the programs are not very useful when
+ run without flags.
+
+ -- Richard Braakman <dark@xs4all.nl> Sun, 9 Nov 1997 12:01:12 +0100
+
+freeciv (1.0k-1) unstable; urgency=low
+
+ * New maintainer.
+ * New upstream release.
+ * Use pristine upstream source.
+ * Application defaults file no longer a conffile. (fixes bug #11230)
+ * Changed debian/rules layout.
+ * Use debian-specific civ script, changed $* to ${1+"$@"}. (fixes bug #10157)
+ * Removed "ser" script; it just called civserver and polluted the namespace.
+ * Recompiled for libc6. (fixes bug #12953)
+ * Installed menu entries for server and client.
+
+ -- Richard Braakman <dark@xs4all.nl> Thu, 6 Nov 1997 21:46:14 +0100
+
+freeciv (1.0j-2) unstable; urgency=low
+
+ * Imakefile: set XAWLIB to use libXaw.
+
+ -- Karl Sackett <krs@debian.org> Thu, 5 Jun 1997 09:47:47 -0500
+
+freeciv (1.0j-1) unstable; urgency=low
+
+ * New upstream release.
+ * freeciv library files moved to /usr/lib/games/freeciv, FREECIV_
+ DATADIR changed accordingly.
+
+ -- Karl Sackett <krs@debian.org> Mon, 26 May 1997 11:26:48 -0500
+
+freeciv (1.0i-1) unstable; urgency=low
+
+ * First Debian release.
+ * civ: FREECIV_DATADIR set to /usr/games/freeciv/data.
+
+ -- Karl Sackett <krs@debian.org> Tue, 1 Apr 1997 10:37:50 -0600
+
+Local variables:
+mode: debian-changelog
+End:
--- freeciv-1.4.3.orig/debian/control
+++ freeciv-1.4.3/debian/control
@@ -0,0 +1,20 @@
+Source: freeciv
+Section: games
+Priority: optional
+Maintainer: Richard Braakman <dark@xs4all.nl>
+Standards-Version: 2.3.0.1
+
+Package: freeciv
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: xaw-wrappers (>= 0.10)
+Description: A free Civilization clone for Unix and X.
+ FreeCiv is a clone of Civilization, distributed under the GPL and
+ implemented for X. Freeciv is a turn-based strategy game, in which
+ each player becomes leader of a civilization, fighting to obtain
+ the ultimate goal: The extinction of all other civilizations.
+ .
+ FreeCiv recommends xaw-wrappers because it requires the original
+ Xaw library and cannot work with replacements like xaw3d and nextaw.
+ The xaw-wrappers package is necessary if you have such replacement
+ libraries installed.
--- freeciv-1.4.3.orig/debian/copyright
+++ freeciv-1.4.3/debian/copyright
@@ -0,0 +1,28 @@
+This is the Debian GNU/Linux prepackaged version of freeciv.
+
+This package was put together by Karl Sackett <krs@debian.org>.
+Maintenance was taken over by Richard Braakman <dark@xs4all.nl>.
+
+The sources were obtained from:
+
+ ftp://ftp.daimi.aau.dk/pub/stud/pjunold/freeciv/freecivdec4.tgz
+
+For more information see:
+
+ http://www.daimi.aau.dk/~allan/freeciv.html
+
+Freeciv is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+Freeciv is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License with
+your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
+Debian GNU/Linux freeciv source package as the file COPYING. If not,
+write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+MA 02139, USA.
--- freeciv-1.4.3.orig/debian/rules
+++ freeciv-1.4.3/debian/rules
@@ -0,0 +1,77 @@
+#! /usr/bin/make -f
+
+DEBDIR = debian/tmp/DEBIAN
+BINDIR = debian/tmp/usr/games
+LIBDIR = debian/tmp/usr/lib/games/freeciv
+APPDIR = debian/tmp/usr/X11R6/lib/X11/app-defaults
+DOCDIR = debian/tmp/usr/doc/freeciv
+XAWDIR = debian/tmp/usr/lib/xaw-wrappers/conf
+
+config:
+ $(checkdir)
+ # xmkmf is hard to find if you're root.
+ PATH=$${PATH}:/usr/bin/X11 xmkmf
+ touch config
+
+build: config
+ $(checkdir)
+ make CDEBUGFLAGS="-O2 -g -Wall"
+ touch build
+
+clean:
+ $(checkdir)
+ -rm -f config build
+# Assume that if the makefile doesn't exist, it was deleted by a previous
+# "make clean" so there's no need to repeat it.
+ -make clean
+ -rm -f debian/*~ Makefile Makefile.bak core
+ -rm -rf debian/tmp* debian/files debian/substvars
+
+binary-indep:
+
+binary-arch: checkroot build
+ $(checkdir)
+ -rm -rf debian/tmp*
+# debian/tmp
+ install -d ${DEBDIR}
+ install -m 755 debian/postinst ${DEBDIR}
+ install -m 755 debian/postrm ${DEBDIR}
+# binaries
+ install -d ${BINDIR}
+ install -m 755 debian/civ ${BINDIR}
+ install -s -m 755 civclient ${BINDIR}
+ install -s -m 755 civserver ${BINDIR}
+# xaw-wrappers config entry
+ install -d ${XAWDIR}
+ install -m 644 debian/xaw-wrappers ${XAWDIR}/freeciv
+# data
+ install -d ${LIBDIR}/data
+ install -m 644 data/*.xpm ${LIBDIR}/data
+# app-defaults
+ install -d ${APPDIR}
+ install -m 644 data/Freeciv ${APPDIR}
+# documentation
+ install -d ${DOCDIR}
+ install -m 644 debian/copyright ${DOCDIR}
+ install -m 644 debian/changelog ${DOCDIR}/changelog.Debian
+ gzip -9v ${DOCDIR}/changelog.Debian
+ install -m 644 CHANGES ${DOCDIR}/changelog
+ gzip -9v ${DOCDIR}/changelog
+ install -m 644 README ${DOCDIR}
+ install -m 644 CREDITS ${DOCDIR}
+ install -m 644 debian/README.Debian ${DOCDIR}
+#
+ dpkg-shlibdeps civclient civserver
+ dpkg-gencontrol -pfreeciv -Pdebian/tmp
+ dpkg --build debian/tmp ..
+
+define checkdir
+ test -f server/civserver.c -a -f debian/rules
+endef
+
+binary: binary-indep binary-arch
+
+checkroot:
+ test root = "`whoami`"
+
+.PHONY: clean binary binary-arch binary-indep checkroot
--- freeciv-1.4.3.orig/debian/postinst
+++ freeciv-1.4.3/debian/postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+if [ -x /usr/bin/update-xaw-wrappers ] ; then update-xaw-wrappers ; fi
--- freeciv-1.4.3.orig/debian/README.Debian
+++ freeciv-1.4.3/debian/README.Debian
@@ -0,0 +1,41 @@
+Use the shell script /usr/games/civ to start the FreeCiv client program.
+It automatically sets the path for FreeCiv's data directories.
+
+Freeciv does not work with replacement libraries for the Athena widget
+sets, such as Xaw3D and neXtaw. (Debian packages xaw3dg and nextawg).
+
+If you install the Debian package xaw-wrappers, freeciv will use it to
+run with the original Xaw library even if you have the replacement
+libraries installed.
+
+Richard Braakman
+
+One of the authors, Peter Joachim Unold, said this about the xaw problem:
+
+> Anyway there's no simple fix, because the problem is that I've subclassed
+> the Command widget, to produce something that also can hold a pixmap(instead
+> of just a b/w bitmap or a text). However it's not possible to subclass in a
+> way, which works under all incarnations of libxaw:
+>
+> This is class of the pixcomm widget:
+>
+> typedef struct _PixcommandClassRec {
+> CoreClassPart core_class;
+> SimpleClassPart simple_class;
+> LabelClassPart label_class;
+> CommandClassPart command_class;
+> PixcommClassPart pixcomm_class;
+> } PixcommClassRec;
+>
+> A version which ran under libxaw3d, would need other fields, as xaw3d's
+> Label widget is "derived" from different "subclasses". The xaw3d author
+> mentions this too.
+>
+> Anyway I first realised this after I had made and used the widget all
+> over the program. Now afterwards, I'm just disappointed by Intrinsics
+> programming. Any Intrinsics manual will tell you how powerful subclassing
+> is but in reality it's useless, unless you subclass from Core direct.
+> One day I'll fix it.
+>
+> best regards
+> Peter
--- freeciv-1.4.3.orig/debian/civ
+++ freeciv-1.4.3/debian/civ
@@ -0,0 +1,3 @@
+#!/bin/sh
+export FREECIV_DATADIR=/usr/lib/games/freeciv/data
+exec civclient ${1+"$@"}
--- freeciv-1.4.3.orig/debian/postrm
+++ freeciv-1.4.3/debian/postrm
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+if [ -x /usr/bin/update-xaw-wrappers ] ; then update-xaw-wrappers ; fi
--- freeciv-1.4.3.orig/debian/xaw-wrappers
+++ freeciv-1.4.3/debian/xaw-wrappers
@@ -0,0 +1,6 @@
+/usr/games/civclient,/usr/X11R6/lib/Xaw3d
+/usr/games/civclient,/usr/X11R6/lib/Xaw95
+/usr/games/civclient,/usr/X11R6/lib/neXtaw
+/usr/games/civclient,/usr/lib/libc5-compat/Xaw3d
+/usr/games/civclient,/usr/lib/libc5-compat/neXtaw
+/usr/games/civclient,/usr/lib/libc5-compat/Xaw95
--
edd@rosebud.ml.org According to the latest official figures,
http://rosebud.ml.org/~edd 43% of all statistics are totally worthless.
--- End Message ---