2 files changed, 38 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index 3d1eb874..00000000
--- a/.bzrignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.git
-freeipa2-dev-doc
diff --git a/.gitignore b/.gitignore
index 7ed6c41d..bfd7eae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,40 @@
 *.pyc
-.bzr
-freeipa2-dev-doc
+*.in
+*.m4
+*.log
+*.status
+*.sub
+*.cache
+*.guess
+
+# Generated spec files
+*.spec
+!contrib/RHEL4/ipa-client.spec
+
+# Vim swap files
+*.swp
+.swp
+
+# Miscellaneous generated files
 build
+config.h
+configure
+COPYING
+cscope.out
+depcomp
+.deps
+dist
+freeipa2-dev-doc
+INSTALL
+install-sh
+libtool
+ltmain.sh
+Makefile
+missing
+mkinstalldirs
+py-compile
+RELEASE
+setup.py
+stamp-h1
+tags
+version.py