summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-07-02 08:32:34 +0200
committerMichael Vogt <mvo@debian.org>2013-07-02 08:32:34 +0200
commit8e4c3f0a42664b8c37cc2e0de285849fbf118e11 (patch)
tree059b76fef1c1636a7e1ad16e5a4ce06304271718 /.gitignore
parent25a4d2049fb79bc2c86cd45e977b4a071e5300ac (diff)
parente3c62328abbd548bb0da42fdbad954b3ce4f7102 (diff)
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts: debian/changelog
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore67
1 files changed, 37 insertions, 30 deletions
diff --git a/.gitignore b/.gitignore
index bcdb18914..3e07e241b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,37 @@
-aclocal.m4
-autom4te.cache/
-build/
-buildlib/config.guess
-buildlib/config.sub
-configure
-debian/copyright
-doc/de/
-doc/es/
-doc/fr/
-doc/it/
-doc/ja/
-doc/pl/
-doc/pt/
-doc/pt_BR/
-doc/examples/sources.list
-marks.bzr
-marks.git
-debian/*.log
-debian/*.substvars
-debian/*.debhelper
-debian/apt-doc
-debian/apt
-debian/apt-utils
-debian/libapt-pkg4.12
-debian/libapt-inst1.5
-debian/libapt-pkg-dev
-debian/libapt-pkg-doc
-debian/apt-transport-https
-debian/files
+# build artifacts
+/aclocal.m4
+/autom4te.cache/
+/build/
+/buildlib/config.guess
+/buildlib/config.sub
+/configure
+
+# copy of COPYING
+/debian/copyright
+
+# generated files in the process to build all
+# apt man pages and other documentation
+/doc/*/
+!/doc/examples/
+!/doc/po/
+!/doc/en/makefile
+
+# package building artifacts
+/debian/*.log
+/debian/*.substvars
+/debian/*.debhelper
+/debian/files
+/debian/apt/
+/debian/apt-doc/
+/debian/apt-utils/
+/debian/libapt-pkg*/
+/debian/libapt-inst*/
+/debian/libapt-pkg-dev/
+/debian/libapt-pkg-doc/
+/debian/apt-transport-https/
+
+# generated from *.in files
+/doc/examples/sources.list
+/debian/libapt-pkg*.install
+/debian/libapt-inst*.install
+/debian/libapt-pkg-dev.install