[linux] 01/04: 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 jessie
in repository linux.

commit ee8267330e26afdd1507163490f61d8cec757210
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Aug 11 18:07:21 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)
    
    Refresh the patch against 3.16.
---
 debian/.gitignore                     | 13 +++++++++++++
 debian/changelog                      |  2 ++
 debian/patches/debian/gitignore.patch | 14 +++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/.gitignore b/debian/.gitignore
index 29359e3..9df6faf 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,5 +1,18 @@
 !/patches
 !*.patch
 !*.diff
+*.debhelper*
+*.local
 *.pyc
+*.substvars
+*-di
+/build/
+/config.defines.dump
+/control
+/control.md5sum
+/files
+/linux-*
 /po/
+/rules.gen
+/stamps/
+/xen-linux-system-*
diff --git a/debian/changelog b/debian/changelog
index 1351a12..6bcd147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -360,6 +360,8 @@ linux (3.16.7-ckt17-1) UNRELEASED; urgency=medium
   * linux-source: Depend on xz-utils, not bzip2 (Closes: #796940)
   * [x86] i2c: i801: Use wait_event_timeout to wait for interrupts
     (Closes: #799786)
+  * Adjust for migration to git:
+    - Update .gitignore files
 
   [ Ian Campbell ]
   * [xen] xen-netback: return correct ethtool stats (Closes: #786936)
diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
index 22547ea..e554436 100644
--- a/debian/patches/debian/gitignore.patch
+++ b/debian/patches/debian/gitignore.patch
@@ -3,9 +3,11 @@ Date: Thu, 17 Jan 2013 08:55:21 +0000
 Subject: Tweak gitignore for Debian pkg-kernel using git svn.
 Forwarded: not-needed
 
+[bwh: Tweak further for pure git]
+
 --- a/.gitignore
 +++ b/.gitignore
-@@ -47,17 +47,6 @@
+@@ -47,17 +47,6 @@ Module.symvers
  /Module.markers
  
  #
@@ -23,3 +25,13 @@ Forwarded: not-needed
  # Generated include files
  #
  include/config
+@@ -95,3 +84,9 @@ x509.genkey
+ 
+ # Kconfig presets
+ all.config
++
++#
++# 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