From 9ad255f975ee9586128f068b47aa24eb51673f93 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Mon, 22 Feb 2010 17:01:34 -0700
Subject: [PATCH] maint: sort .gitignore

Fallout from the new bootstrap.

* .gitignore: Commit sorting done by bootstrap.
* build-aux/.gitignore: Likewise.
* po/.gitignore: Likewise.
---
 .gitignore           | 20 ++++++++++----------
 build-aux/.gitignore | 12 ++++++++++--
 po/.gitignore        | 27 ++++++++++++++-------------
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index d9a4aea6b0..a638e0d5f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,21 @@
+*#*#
+*.#*#
 *.a
 *.o
+*.orig
+*.rej
 *~
 .git
 .git-module-status
+/GNUmakefile
+/maint.mk
 ABOUT-NLS
 COPYING
+ChangeLog
 INSTALL
 Makefile
 Makefile.in
+NEWS
 aclocal.m4
 autom4te.cache
 config.cache
@@ -22,6 +30,7 @@ configure
 coverage
 cscope.files
 cscope.out
+gnulib/
 libtool
 libvirt-*.tar.gz
 libvirt.pc
@@ -34,14 +43,5 @@ results.log
 stamp-h
 stamp-h.in
 stamp-h1
-update.log
 tests/*.log
-/GNUmakefile
-/maint.mk
-gnulib/
-*.orig
-*.rej
-*#*#
-*.#*#
-ChangeLog
-NEWS
+update.log
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index af7a3470bb..29b1e037fc 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,7 +1,15 @@
 *
-/link-warning.h
-/mktempd
 /arg-nonnull.h
 /gitlog-to-changelog
+/link-warning.h
+/mktempd
 /useless-if-before-free
 /vc-list-files
+arg-nonnull.h
+config.rpath
+gitlog-to-changelog
+mkinstalldirs
+mktempd
+useless-if-before-free
+vc-list-files
+warn-on-use.h
diff --git a/po/.gitignore b/po/.gitignore
index 40ff7c8ecb..9f7b57f5b4 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,16 +1,17 @@
-stamp-po
-remove-potcdate.sin
-quot.sed
-insert-header.sin
 *.gmo
-en@quot.header
-en@boldquot.header
-boldquot.sed
-Rules-quot
-POTFILES
-Makevars.template
-Makefile.in.in
-Makefile.in
 Makefile
-remove-potcdate.sed
+Makefile.in
+Makefile.in.in
 Makevars
+Makevars.template
+POTFILES
+Rules-quot
+boldquot.sed
+en@boldquot.header
+en@quot.header
+insert-header.sed
+insert-header.sin
+quot.sed
+remove-potcdate.sed
+remove-potcdate.sin
+stamp-po