From 9f22c3e1e86e68500ead0cc664869da2b4af7c12 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 10 Oct 2007 11:59:14 +0100
Subject: [PATCH] Bring .gitignore files up to date; add *.o, *~ etc. to
 top-level .gitignore CVS ignores these automatically, so they weren't in the
 .cvsignore when Ryan converted the repository.

---
 .gitignore                                        | 9 +++++++++
 bus/.gitignore                                    | 4 ++++
 test/data/invalid-service-files-system/.gitignore | 1 +
 test/data/valid-config-files-system/.gitignore    | 1 +
 test/data/valid-service-files-system/.gitignore   | 1 +
 test/data/valid-service-files/.gitignore          | 7 +------
 test/name-test/.gitignore                         | 2 ++
 7 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 test/data/invalid-service-files-system/.gitignore
 create mode 100644 test/data/valid-config-files-system/.gitignore
 create mode 100644 test/data/valid-service-files-system/.gitignore

diff --git a/.gitignore b/.gitignore
index f36c2dd..b7d368c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,19 @@
+*.orig
+*.rej
+*.o
+*~
+compile
+config.cache
 config.log
 config.status
 config.sub
 configure
+depcomp
 *.pc
+install-sh
 libtool
 ltmain.sh
+missing
 stamp-h1
 stamp-h
 stamp-h.in
diff --git a/bus/.gitignore b/bus/.gitignore
index 21817b8..0b67447 100644
--- a/bus/.gitignore
+++ b/bus/.gitignore
@@ -7,6 +7,8 @@ Makefile.in
 dbus-daemon
 dbus-daemon-activation-helper
 dbus-daemon-activation-helper-test
+dbus-daemon-launch-helper
+dbus-daemon-launch-helper-test
 *.bb
 *.bbg
 *.da
@@ -17,3 +19,5 @@ messagebus
 session.conf
 system.conf
 dbus-daemon.1
+bus-test-launch-helper
+bus-test-system
diff --git a/test/data/invalid-service-files-system/.gitignore b/test/data/invalid-service-files-system/.gitignore
new file mode 100644
index 0000000..0e3ad1b
--- /dev/null
+++ b/test/data/invalid-service-files-system/.gitignore
@@ -0,0 +1 @@
+*.service
diff --git a/test/data/valid-config-files-system/.gitignore b/test/data/valid-config-files-system/.gitignore
new file mode 100644
index 0000000..fee9217
--- /dev/null
+++ b/test/data/valid-config-files-system/.gitignore
@@ -0,0 +1 @@
+*.conf
diff --git a/test/data/valid-service-files-system/.gitignore b/test/data/valid-service-files-system/.gitignore
new file mode 100644
index 0000000..0e3ad1b
--- /dev/null
+++ b/test/data/valid-service-files-system/.gitignore
@@ -0,0 +1 @@
+*.service
diff --git a/test/data/valid-service-files/.gitignore b/test/data/valid-service-files/.gitignore
index b6f2adc..0e3ad1b 100644
--- a/test/data/valid-service-files/.gitignore
+++ b/test/data/valid-service-files/.gitignore
@@ -1,6 +1 @@
-debug-echo.service
-debug-glib.service
-debug-python.service
-debug-segfault.service
-debug-shell-echo-fail.service
-debug-shell-echo-success.service
+*.service
diff --git a/test/name-test/.gitignore b/test/name-test/.gitignore
index 91eb183..09930f1 100644
--- a/test/name-test/.gitignore
+++ b/test/name-test/.gitignore
@@ -5,3 +5,5 @@ Makefile.in
 test-names
 test-pending-call-dispatch
 test-threads-init
+test-ids
+run-with-tmp-session-bus.conf
-- 
2.7.4