[linux] 03/08: Do ignore /.gitignore and /.mailmap in the context of pkg-kernel via git svn

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch squeeze-security
in repository linux.

commit 20e72708c6349b131c3d08b42f49411bf3a9393e
Author: Ian Campbell <ijc at debian.org>
Date:   Mon Jan 12 14:27:37 2015 +0000

    Do ignore /.gitignore and /.mailmap in the context of pkg-kernel via git svn
    
    (cherry picked from commit c3a49aefa1e0e9d63920de8e83eae892ed8c2724)
    
    [bwh: Rebase onto 2.6.32.  Apply the patch in the 'orig' rule rather
     than a patch series, as those are only applied to subdirectories of
     debian/build.]
---
 debian/patches/debian/gitignore.patch | 15 +++++++++++++++
 debian/rules                          |  1 +
 2 files changed, 16 insertions(+)

diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
new file mode 100644
index 0000000..7cbbf26
--- /dev/null
+++ b/debian/patches/debian/gitignore.patch
@@ -0,0 +1,15 @@
+From: Ian Campbell <ijc at hellion.org.uk>
+Date: Thu, 17 Jan 2013 08:55:21 +0000
+Subject: Tweak gitignore for Debian pkg-kernel using git svn.
+
+--- a/.gitignore
++++ b/.gitignore
+@@ -39,8 +39,6 @@
+ System.map
+ Module.markers
+ Module.symvers
+-!.gitignore
+-!.mailmap
+ 
+ #
+ # Generated include files
diff --git a/debian/rules b/debian/rules
index 06dc5b6..8a50088 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_
 
 orig: $(DIR_ORIG)
 	rsync --delete --exclude debian --exclude .svk --exclude .svn --exclude .git --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
+	patch -p1 < debian/patches/debian/gitignore.patch
 
 $(DIR_ORIG):
 ifeq ($(TAR_ORIG),)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git