[linux] 04/08: Update .gitignore files based on svn:ignore properties

[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 d0dee6b2e637ccb6e6e88feea265415a1c24a05f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Aug 22 21:23:27 2015 +0200

    Update .gitignore files based on svn:ignore properties
    
    For the top-level .gitignore, do this via the existing patch.
    
    (cherry picked from commit 55cf50555a83206dc3e3676a0e6daf00be218a4a)
    
    Rebase onto 2.6.32.
---
 debian/.gitignore                     | 13 +++++++++++++
 debian/changelog                      |  2 ++
 debian/patches/debian/gitignore.patch | 12 ++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/debian/.gitignore b/debian/.gitignore
index 91c6278..fe005fd 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,4 +1,17 @@
 !/patches
 !*.patch
 !*.diff
+*.debhelper*
+*.local
 *.pyc
+*.substvars
+*-di
+/build/
+/config.defines.dump
+/control
+/control.md5sum
+/files
+/linux-*
+/rules.gen
+/stamps/
+/xen-linux-system-*
diff --git a/debian/changelog b/debian/changelog
index 4ede241..b0dc21c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ linux-2.6 (2.6.32-48squeeze14) UNRELEASED; urgency=medium
   * crypto: testmgr - update LZO compression test vectors
     (regression in 2.6.32.64)
   * md: use kzalloc() when bitmap is disabled (CVE-2015-5697)
+  * Adjust for migration to git:
+    - Update .gitignore files
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 28 Jun 2015 23:23:19 +0100
 
diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
index 7cbbf26..7e843ce 100644
--- a/debian/patches/debian/gitignore.patch
+++ b/debian/patches/debian/gitignore.patch
@@ -2,6 +2,8 @@ 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.
 
+[bwh: Tweak further for pure git]
+
 --- a/.gitignore
 +++ b/.gitignore
 @@ -39,8 +39,6 @@
@@ -13,3 +15,13 @@ Subject: Tweak gitignore for Debian pkg-kernel using git svn.
  
  #
  # Generated include files
+@@ -75,3 +73,9 @@ all.config
+ *.orig
+ *~
+ \#*#
++
++#
++# Debian packaging: ignore everything at the top level, since it isn't
++# included in our repository
++#
++/*

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