* .bzrignore: Move to ...

* .gitignore: ... here, adjusting for differences between bzr and
  git.
* Makefile.am (EXTRA_DIST): Replace .bzrignore with .gitignore.
* gnulib: Add --no-vc-files.

7 files changed, 26 insertions, 13 deletions

diff --git a/.bzrignore b/.gitignore
index 03da7faf..38990c2b 100644
--- a/.bzrignore
+++ b/.gitignore
@@ -1,14 +1,18 @@
+**/*.a
 **/*.la
 **/*.lo
+**/*.o
+**/*.so
+**/*~
 **/.libs
-./Makefile
-./autom4te.cache
-./config.h
-./config.log
-./config.status
-./config.status.lineno
-./libtool
-./stamp-h*
+/Makefile
+/autom4te.cache
+/config.h
+/config.log
+/config.status
+/config.status.lineno
+/libtool
+/stamp-h*
 docs/Makefile
 gnulib/lib/.deps
 gnulib/lib/Makefile
diff --git a/ChangeLog b/ChangeLog
index 7d940789..1a5b00df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Dec  9 00:49:22 GMT 2013  Colin Watson  <cjwatson@debian.org>
+
+	* .bzrignore: Move to ...
+	* .gitignore: ... here, adjusting for differences between bzr and
+	  git.
+	* Makefile.am (EXTRA_DIST): Replace .bzrignore with .gitignore.
+	* gnulib: Add --no-vc-files.
+
 Wed Nov 27 11:54:17 GMT 2013  Colin Watson  <cjwatson@debian.org>
 
 	* configure.ac: Only call AC_PROG_AR if it is defined, to restore
diff --git a/Makefile.am b/Makefile.am
index 6f3ec397..07d8fb78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ SUBDIRS = docs gnulib/lib gnulib/po lib libdb src man manual po tools
 dist_noinst_DATA = FAQ NEWS README include/README
 
 EXTRA_DIST = \
-	.bzrignore \
+	.gitignore \
 	autogen.sh \
 	gnulib/m4/gnulib-cache.m4 \
 	gnulib/m4/gnulib-tool.m4 \
diff --git a/Makefile.in b/Makefile.in
index 8bf7eaca..6aec5bbb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1314,7 +1314,7 @@ dist_noinst_DATA = FAQ NEWS README include/README
 
 # These macro files are imported by gnulib-tool, but at present not used. We
 # include them in the distribution anyway for maximum consistency.
-EXTRA_DIST = .bzrignore autogen.sh gnulib/m4/gnulib-cache.m4 \
+EXTRA_DIST = .gitignore autogen.sh gnulib/m4/gnulib-cache.m4 \
 	gnulib/m4/gnulib-tool.m4 release.sh gnulib/m4/glibc2.m4 \
 	gnulib/m4/intdiv0.m4 gnulib/m4/intl.m4 gnulib/m4/intldir.m4 \
 	gnulib/m4/intmax.m4 gnulib/m4/inttypes-pri.m4 \
diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index 03b53281..8c95ee23 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize closedir dirname error flock fnmatch-gnu fstat getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp opendir regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db --no-vc-files argp canonicalize closedir dirname error flock fnmatch-gnu fstat getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp opendir regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf
 
 AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
 
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
index 5ff919a9..65021c8b 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -35,7 +35,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize closedir dirname error flock fnmatch-gnu fstat getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp opendir regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db --no-vc-files argp canonicalize closedir dirname error flock fnmatch-gnu fstat getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp opendir regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf
 
 
 
diff --git a/gnulib/m4/gnulib-cache.m4 b/gnulib/m4/gnulib-cache.m4
index 2fceeb79..d85265ed 100644
--- a/gnulib/m4/gnulib-cache.m4
+++ b/gnulib/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db argp canonicalize closedir dirname error flock fnmatch-gnu fstat getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp opendir regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --po-base=gnulib/po --doc-base=doc --tests-base=tests --aux-dir=tools --no-conditional-dependencies --libtool --macro-prefix=gl --po-domain=man-db --no-vc-files argp canonicalize closedir dirname error flock fnmatch-gnu fstat getline getopt-gnu gettext glob idpriv-drop idpriv-droptemp lib-ignore localcharset lock minmax mkdtemp mkstemp opendir regex rename setenv sigaction signal sigprocmask strerror strsep unsetenv warnings xalloc xgetcwd xstrndup xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -80,3 +80,4 @@ gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([man-db])
 gl_WITNESS_C_MACRO([])
+gl_VC_FILES([false])