The following commit has been merged in the master branch:
commit 6d08e24e768558a45f94ab72a14904acf845b473
Author: Guillem Jover <guil...@debian.org>
Date:   Fri Jan 23 04:12:01 2009 +0200

    Cleanup .gitignore files
    
    Move common ignore matches to the top-level .gitignore.
    Force directory matching by adding a trailing /.
    Remove unused matches (enoent).
    Add missing matches (t.tmp and autom4te.cache/).

diff --git a/.gitignore b/.gitignore
index 3134a00..0c0fc20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,16 @@
-build-tree
-config
-ABOUT-NLS
-INSTALL
+# Inherited ignores
+*.a
+*.o
+.deps/
 Makefile
 Makefile.in
+
+# Top dir ignores
+autom4te.cache/
+build-tree/
+config/
+ABOUT-NLS
+INSTALL
 configure
 config.*
 aclocal.m4
diff --git a/dpkg-deb/.gitignore b/dpkg-deb/.gitignore
index fbdfcef..135d53c 100644
--- a/dpkg-deb/.gitignore
+++ b/dpkg-deb/.gitignore
@@ -1,5 +1 @@
-*.o
-.deps
-Makefile
-Makefile.in
 dpkg-deb
diff --git a/dpkg-split/.gitignore b/dpkg-split/.gitignore
index af58309..dedc3fc 100644
--- a/dpkg-split/.gitignore
+++ b/dpkg-split/.gitignore
@@ -1,6 +1,2 @@
-*.o
-.deps
-Makefile
-Makefile.in
 dpkg-split
 mksplit
diff --git a/dselect/.gitignore b/dselect/.gitignore
index d4c3975..cce16ad 100644
--- a/dselect/.gitignore
+++ b/dselect/.gitignore
@@ -1,6 +1,2 @@
-*.o
-.deps
-Makefile
-Makefile.in
 curkeys.h
 dselect
diff --git a/dselect/methods/.gitignore b/dselect/methods/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/dselect/methods/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/dselect/po/.gitignore b/dselect/po/.gitignore
index 7a60b8e..4b5aa2c 100644
--- a/dselect/po/.gitignore
+++ b/dselect/po/.gitignore
@@ -1,6 +1,4 @@
 *.gmo
 *.sed
-Makefile
-Makefile.in
 POTFILES
 stamp-po
diff --git a/lib/.gitignore b/lib/.gitignore
index b29a435..ad7739a 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,6 +1 @@
-*.a
-*.o
-.deps
-Makefile
-Makefile.in
 trigdeferred.c
diff --git a/libcompat/.gitignore b/libcompat/.gitignore
deleted file mode 100644
index 83fafd5..0000000
--- a/libcompat/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.a
-*.o
-.deps
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
index f267408..905daef 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -7,6 +7,4 @@ pl
 pt_BR
 ru
 sv
-Makefile
-Makefile.in
 man.stamp
diff --git a/origins/.gitignore b/origins/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/origins/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/po/.gitignore b/po/.gitignore
index 587f4f8..01e3875 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -2,8 +2,6 @@
 *.sin
 *.sed
 *.header
-Makefile
-Makefile.in
 Makefile.in.in
 Makevars.template
 POTFILES
diff --git a/scripts/.gitignore b/scripts/.gitignore
index ede2efb..4857018 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 dpkg-architecture
 dpkg-buildpackage
 dpkg-checkbuilddeps
@@ -20,3 +18,4 @@ install-info
 install-info-stamp
 cleanup-info
 822-date
+t.tmp
diff --git a/scripts/po/.gitignore b/scripts/po/.gitignore
index 7a60b8e..4b5aa2c 100644
--- a/scripts/po/.gitignore
+++ b/scripts/po/.gitignore
@@ -1,6 +1,4 @@
 *.gmo
 *.sed
-Makefile
-Makefile.in
 POTFILES
 stamp-po
diff --git a/src/.gitignore b/src/.gitignore
index aff0d4f..9b61029 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,7 +1,3 @@
-*.o
-.deps
-Makefile
-Makefile.in
 dpkg
 dpkg-query
 dpkg-trigger
diff --git a/utils/.gitignore b/utils/.gitignore
index e63b785..bf5714e 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -1,6 +1 @@
-*.o
-.deps
-Makefile
-Makefile.in
-enoent
 start-stop-daemon

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to