From 81da7be357f554166e20ce57ad6f9e28d3e6e4aa Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Thu, 24 Nov 2011 18:05:57 +0000
Subject: [PATCH] Sync up .gitignore and MANIFEST* with recent changes.

---
 .gitignore    | 37 ++++++++++++++++++-------------------
 MANIFEST      | 10 +++++-----
 MANIFEST.SKIP |  8 ++++++--
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7bc03f1..ced8a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,29 +1,28 @@
 .dirstamp
-Build
-ChangeLog
-MYMETA.json
-MYMETA.yml
-Makefile
-Makefile.in
+/Build
+/ChangeLog
+/MYMETA.json
+/MYMETA.yml
+/Makefile
+/Makefile.in
+/bin/chkstow
+/bin/stow
+/doc/stow.info
+/doc/version.texi
+/tmp-testing-trees/
 _build/
 autom4te.cache/
 blib/
-chkstow
 config.log
 config.status
 configure
-doc/manual.html
-doc/manual.pdf
-doc/manual.texi
-doc/stow.8
-doc/stow.html
-doc/stow.pdf
-lib/Stow.pm
+/doc/ChangeLog.OLD
+/doc/manual.html
+/doc/manual.pdf
+/doc/manual.texi
+/doc/stow.pdf
+/doc/stow.8
+/lib/Stow.pm
 stamp-vti
-stamp-vti
-stow
 stow-[0-9].[0-9].[0-9].tar.*
 stow-[0-9].[0-9].[0-9]/
-stow.info
-tmp-testing-trees/
-version.texi
diff --git a/MANIFEST b/MANIFEST
index c063667..6454cf4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,9 +1,4 @@
-aclocal.m4
 AUTHORS
-automake/install-sh
-automake/mdate-sh
-automake/missing
-automake/stamp-vti
 bin/chkstow
 bin/chkstow.in
 bin/stow
@@ -13,6 +8,10 @@ ChangeLog
 configure
 configure.ac
 COPYING
+default-ignore-list
+doc/ChangeLog.OLD
+doc/manual.html
+doc/manual.pdf
 doc/stow.8
 doc/stow.info
 doc/stow.texi
@@ -33,6 +32,7 @@ t/defer.t
 t/examples.t
 t/find_stowed_path.t
 t/foldable.t
+t/ignore.t
 t/join_paths.t
 t/parent.t
 t/stow.t
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index c8beef8..fa9f287 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -66,13 +66,17 @@
 ^MANIFEST\.SKIP
 
 # Avoid archives of this distribution
-\bStow-[\d\.\_]+
+\b[sS]tow-[\d\.\_]+
 
 # Avoid autotools stuff
+^aclocal.m4$
+^automake/
 ^autom4te\.cache/.+$
 ^config\.(log|status)$
 ^doc/\.dirstamp$
 ^doc/stamp-vti$
+^doc/manual.texi
+^doc/stow.pdf
 
 # Avoid test files
-^t/(stow|target)/.+$
+^tmp-testing-trees