From c1468cb47e25d2e4c09431c6bcab7595816d02a6 Mon Sep 17 00:00:00 2001
From: Steve Chaplin <>
Date: Tue, 14 Sep 2010 17:51:47 +0800
Subject: Move most exclude file patterns into top-level .gitignore, and remove
 the other .gitignore files.

---
 .gitignore                                  |  14 +++++++++++---
 AUTHORS                                     |   4 ++--
 examples/.gitignore                         |   7 -------
 examples/cairo_snippets/data/.gitignore     |   1 +
 examples/cairo_snippets/data/romedalen.png  | Bin 0 -> 80944 bytes
 examples/cairo_snippets/snippets/.gitignore |   5 -----
 src/.gitignore                              |   8 --------
 test/.gitignore                             |   5 -----
 8 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 examples/.gitignore
 create mode 100644 examples/cairo_snippets/data/.gitignore
 create mode 100644 examples/cairo_snippets/data/romedalen.png
 delete mode 100644 examples/cairo_snippets/snippets/.gitignore
 delete mode 100644 src/.gitignore
 delete mode 100644 test/.gitignore

diff --git a/.gitignore b/.gitignore
index 0975ff1..e07de19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-#
-#
+# top-level .gitignore
 *~
 .*.sw?
 .deps
@@ -11,8 +10,17 @@
 *.lo
 *.orig
 *.rej
+*.pyc
+*.pyo
+
+# image files
+*.pdf
+*.png
+*.ps
+*.svg
+
 *-uninstalled.pc
-#
+
 aclocal.m4
 autom4te.cache
 autoscan.log
diff --git a/AUTHORS b/AUTHORS
index 30f0383..a1cff13 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,10 @@
 Original Author
 ---------------
-James Henstridge <james@daa.com.au>
+James Henstridge
 
 Maintainer
 ----------
-Steve Chaplin <stevech1097 # yahoo.com.au>
+Steve Chaplin
 
 Contributors
 ------------
diff --git a/examples/.gitignore b/examples/.gitignore
deleted file mode 100644
index f54b062..0000000
--- a/examples/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-*.pdf
-*.pyc
-*.pyo
-*.png
-*.ps
diff --git a/examples/cairo_snippets/data/.gitignore b/examples/cairo_snippets/data/.gitignore
new file mode 100644
index 0000000..9622ba3
--- /dev/null
+++ b/examples/cairo_snippets/data/.gitignore
@@ -0,0 +1 @@
+!romedalen.png
diff --git a/examples/cairo_snippets/data/romedalen.png b/examples/cairo_snippets/data/romedalen.png
new file mode 100644
index 0000000..0c41eb0
Binary files /dev/null and b/examples/cairo_snippets/data/romedalen.png differ
diff --git a/examples/cairo_snippets/snippets/.gitignore b/examples/cairo_snippets/snippets/.gitignore
deleted file mode 100644
index 6be9629..0000000
--- a/examples/cairo_snippets/snippets/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.pdf
-*.png
-*.ps
-*.pyc
-*.svg
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 0a7d55e..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
-*.pyc
-*.pyo
diff --git a/test/.gitignore b/test/.gitignore
deleted file mode 100644
index 39ca8f9..0000000
--- a/test/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-*.png
-*.pyc
-*.pyo
-- 
cgit v1.2.3