[Freeciv-Dev] Re: patch: add diff exclude file to cvs/dist (PR#343)

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

Some minor changes:
- added '#*#', as suggested by Thue (for Emacs auto-save files);
- adjusted freeciv_hackers_guide.txt, as suggested by jjm;
- changed filename from 'exclude' to 'diff_ignore' -- somewhat clearer?

-- David

diff -u -r --exclude-from exclude_auto -N freeciv-cvs/Makefile.am 
fc-adv/Makefile.am
--- freeciv-cvs/Makefile.am     Thu Dec 23 16:48:23 1999
+++ fc-adv/Makefile.am  Mon May  1 00:05:26 2000
@@ -23,4 +23,4 @@
 
 EXTRA_DIST=    PEOPLE BUGS HOWTOPLAY freeciv_hackers_guide.txt \
                README.AI README.rulesets README.graphics \
-               civ ser config.mac.h
+               civ ser config.mac.h diff_ignore
diff -u -r --exclude-from exclude_auto -N freeciv-cvs/diff_ignore 
fc-adv/diff_ignore
--- freeciv-cvs/diff_ignore     Thu Jan  1 10:00:00 1970
+++ fc-adv/diff_ignore  Mon May  1 00:07:06 2000
@@ -0,0 +1,40 @@
+#*#
+*.a
+*.bak
+*.gmo
+*.o
+*.orig
+*.pot
+*.rej
+*~
+.#*
+.deps
+CVS
+Freeciv.h
+Makefile
+Makefile.in
+POTFILES
+TAGS
+aclocal.m4
+cat-id-tbl.c
+civclient
+civgame*.sav
+civgame.log
+civserver
+config.cache
+config.h
+config.h.in
+config.log
+config.status
+configure
+core
+freeciv-*.tar.gz
+install-sh
+libintl.h
+missing
+mkinstalldirs
+po2tbl.sed
+stamp-cat-id
+stamp-h
+stamp-h.in
+undep.sh
diff -u -r --exclude-from exclude_auto -N freeciv-cvs/freeciv_hackers_guide.txt 
fc-adv/freeciv_hackers_guide.txt
--- freeciv-cvs/freeciv_hackers_guide.txt       Sun Apr  9 14:03:13 2000
+++ fc-adv/freeciv_hackers_guide.txt    Mon May  1 00:08:23 2000
@@ -504,44 +504,8 @@
 - When doing a "diff" for a patch, be sure to exclude unnecessary files
   by using the "-X" argument to "diff".  E.g.:
 
-    % diff -ruN -Xno.freeciv freeciv_cvs freeciv >/tmp/fix-foo-bug-0.diff
+    % diff -ruN -Xdiff_ignore freeciv_cvs freeciv >/tmp/fix-foo-bug-0.diff
 
-  Here is a useful no.freeciv file:
-
-*~
-.#*
-*.o
-*.a
-*.deps
-*.rej
-*.orig
-*.bak
-core
-aclocal.m4
-configure
-config.log
-config.h
-config.h.in
-config.cache
-config.status
-undep.sh
-CVS
-TAGS
-Makefile
-Makefile.in
-Freeciv.h
-civclient
-civserver
-stamp-h
-stamp-h.in
-civgame.log
-civgame*.sav
-*.pot
-*.gmo
-libintl.h
-po2tbl.sed
-POTFILES
-cat-id-tbl.c
-stamp-cat-id
+  A suggested "diff_ignore" file is included in the Freeciv distribution.
 
 ===========================================================================