[game-data-packager] 01/03: debian/.gitignore: take over /debian/ entries from .gitignore

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit ff5d7d22743904b99804d35063852fb6a643be62
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Dec 6 10:51:15 2016 +0000

    debian/.gitignore: take over /debian/ entries from .gitignore
---
 .gitignore        |  7 -------
 debian/.gitignore | 29 ++++++++++++++++-------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e59c8e..e6102e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,13 +3,6 @@
 /config.status
 /configure.mk
 /configure-stamp
-/debian/files
-/debian/debhelper-build-stamp
-/debian/*.debhelper
-/debian/*.debhelper.log
-/debian/*.substvars
-/debian/game-data-packager/
-/debian/doom2-masterlevels/
 /out/
 __pycache__/
 *.deb
diff --git a/debian/.gitignore b/debian/.gitignore
index 7ed0b95..943f927 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,16 +1,19 @@
+/*.debhelper
 /*.debhelper.log
-/*.post*.debhelper
-/*.pre*.debhelper
 /*.substvars
-/files
 /changelog.dch
-/quake
-/quake-server
-/quake2
-/quake2-server
-/quake3
-/quake3-server
-/quake4
-/quake4-server
-/etqw
-/etqw-server
+/debhelper-build-stamp
+/doom2-masterlevels/
+/etqw/
+/etqw-server/
+/game-data-packager/
+/files
+/quake/
+/quake-server/
+/quake2/
+/quake2-server/
+/quake3/
+/quake3-server/
+/quake4/
+/quake4-server/
+/tmp/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git