summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-10 11:59:14 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-10 17:38:00 +0100
commit9f22c3e1e86e68500ead0cc664869da2b4af7c12 (patch)
treeabc074e153b9c6d2f5de7f0ca87b20c44a4ef454
parentdfaca060844b6e99353a1f11406a9afd0726b84f (diff)
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.
-rw-r--r--.gitignore9
-rw-r--r--bus/.gitignore4
-rw-r--r--test/data/invalid-service-files-system/.gitignore1
-rw-r--r--test/data/valid-config-files-system/.gitignore1
-rw-r--r--test/data/valid-service-files-system/.gitignore1
-rw-r--r--test/data/valid-service-files/.gitignore7
-rw-r--r--test/name-test/.gitignore2
7 files changed, 19 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index f36c2ddf..b7d368cc 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 21817b8e..0b67447d 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 00000000..0e3ad1b0
--- /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 00000000..fee92170
--- /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 00000000..0e3ad1b0
--- /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 b6f2adcf..0e3ad1b0 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 91eb1830..09930f11 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