Merge branch 'patch-2' into 'master'

[fdroidserver.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1ae1a9b1979402d6648185384aadec1fa35fb42b..8bff77fa5120ac5896098c8889afaa31d8645cf9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,29 @@
-config.py
-repo/
-built/
-build_*/
+/config.py
+/makebs.config.py
+*~
+*.pyc
+*.class
+*.box
 
+# files generated by build
+build/
+dist/
+env/
+fdroidserver.egg-info/
+pylint.parseable
+/.testfiles/
+docs/html/
+
+# files generated by tests
+tmp/
+tests/repo/icons*
+
+# files used in manual testing
+/config.py
+/tmp/
+/logs/
+/metadata/
+makebuildserver.config.py
+/tests/config.py
+/tests/fdroid-icon.png
+/unsigned/