Import changes from master:.gitignore

2 files changed, 42 insertions, 110 deletions

diff --git a/.gitignore b/.gitignore
index e0853cb0..cd3cbc5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ po/remove-potcdate.sed
 
 # Distributed tar files.
 aptitude-*.tar.gz
+aptitude-*.tar.xz
 
 # autoconf-related files
 configure
@@ -39,107 +40,11 @@ depcomp
 
 .deps/
 
-doc/Makefile
-doc/Makefile.in
-doc/cs/Makefile
-doc/cs/Makefile.in
-doc/cs/README.cs
-doc/cs/aptitude.cs.8
-doc/cs/doc-css-stamp
-doc/cs/doc-html-stamp
-doc/cs/doc-stamp
-doc/cs/images/Makefile
-doc/cs/images/Makefile.in
-doc/cs/output-html/
-doc/cs/output-man/
-doc/cs/output-txt/
-doc/de/Makefile
-doc/de/Makefile.in
-doc/de/aptitude.de.8
-doc/de/aptitude.xml
-doc/de/doc-stamp
-doc/de/manpage.xml
-doc/de/output-man/
-doc/en/Makefile
-doc/en/Makefile.in
-doc/en/README.en
-doc/en/aptitude-create-state-bundle.1
-doc/en/aptitude-run-state-bundle.1
-doc/en/aptitude.8
-doc/en/doc-css-stamp
-doc/en/doc-fo-stamp
-doc/en/doc-html-stamp
-doc/en/doc-stamp
-doc/en/images/Makefile
-doc/en/images/Makefile.in
-doc/en/man-stamp
-doc/en/output-fo/
-doc/en/output-html/
-doc/en/output-txt/
-doc/es/Makefile
-doc/es/Makefile.in
-doc/es/README.es
-doc/es/aptitude.es.8
-doc/es/aptitude.xml
-doc/es/doc-css-stamp
-doc/es/doc-html-stamp
-doc/es/doc-stamp
-doc/es/images/Makefile
-doc/es/images/Makefile.in
-doc/es/manpage.xml
-doc/es/output-html/
-doc/es/output-man/
-doc/es/output-txt/
-doc/fi/Makefile
-doc/fi/Makefile.in
-doc/fi/README.fi
-doc/fi/aptitude.fi.8
-doc/fi/doc-css-stamp
-doc/fi/doc-html-stamp
-doc/fi/doc-stamp
-doc/fi/images/Makefile
-doc/fi/images/Makefile.in
-doc/fi/output-html/
-doc/fi/output-txt/
-doc/fr/Makefile
-doc/fr/Makefile.in
-doc/fr/README.fr
-doc/fr/aptitude.fr.8
-doc/fr/aptitude.fr.8.tmp
-doc/fr/aptitude.xml
-doc/fr/doc-css-stamp
-doc/fr/doc-html-stamp
-doc/fr/doc-stamp
-doc/fr/images/Makefile
-doc/fr/images/Makefile.in
-doc/fr/manpage.xml
-doc/fr/output-html/
-doc/fr/output-man/
-doc/fr/output-txt/
-doc/ja/Makefile
-doc/ja/Makefile.in
-doc/ja/README.ja
-doc/ja/aptitude.ja.8
-doc/ja/aptitude.xml
-doc/ja/doc-css-stamp
-doc/ja/doc-html-stamp
-doc/ja/doc-stamp
-doc/ja/images/Makefile
-doc/ja/images/Makefile.in
-doc/ja/manpage.xml
-doc/ja/output-html/
-doc/ja/output-man/
-doc/ja/output-txt/
-doc/po4a/Makefile
-doc/po4a/Makefile.in
-doc/po4a/add_de/Makefile
-doc/po4a/add_de/Makefile.in
-doc/po4a/add_es/Makefile
-doc/po4a/add_es/Makefile.in
-doc/po4a/add_fr/Makefile
-doc/po4a/add_fr/Makefile.in
-doc/po4a/po/Makefile
-doc/po4a/po/Makefile.in
+buildlib/Makefile
+buildlib/Makefile.in
+
+# The doc subtree has it's out .gitignore
+
 install-sh
 m4/Makefile
 m4/Makefile.in
@@ -233,14 +138,6 @@ tests/cppunit_test
 tests/gtest_test
 tests/interactive_set_test
 
-
-# SCons-related files:
-.sconf_temp/
-.sconsign.dblite
-build/
-config.log
-
 # Things related to the Debian build:
 .pc/
-build-curses/
-build-gtk/
+build/
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000..83ba9795
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,35 @@
+Makefile
+Makefile.in
+
+# Ignore po4a translations ...
+/??/aptitude.xml
+/??/manpage.xml
+/??/images/safety-cost-level-diagram.svg
+
+# ... but not the originals or manual translations
+!/en/aptitude.xml
+!/en/manpage.xml
+!/en/images/safety-cost-level-diagram.svg
+!/cs/aptitude.xml
+!/fi/aptitude.xml
+!/fi/manpage.xml
+
+# docbook.mk generates these
+docbook-stamp
+docbook-man-stamp
+docbook-html-stamp
+docbook-css-stamp
+docbook-html-images-stamp
+docbook-readme-stamp
+docbook-fo-stamp
+docbook-pdf-stamp
+/??/output-man/
+/??/output-html/
+/??/output-readme/
+/??/output-fo/
+/??/aptitude.8
+/??/aptitude-create-state-bundle.1
+/??/aptitude-run-state-bundle.1
+/en/README
+/??/README.??
+/??/aptitude.??.pdf