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

commit ea0978d10c9b2ddc8479e83c492e9820c98c707b
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)
---
 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 9ae99ad..d37bf31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ linux (4.1.3-2) UNRELEASED; urgency=medium
   * [x86] iio: Enable drivers for ACPI-discoverable devices as modules:
     AK8975, BMC150_ACCEL, BMG160, BMP280, INV_MPU6050_IIO, JSA1212, KMX61,
     KXCJK1013, MMA9551, MMA9553, SX9500
+  * Adjust for migration to git:
+    - Update .gitignore files
 
  -- Ian Campbell <ijc at debian.org>  Tue, 04 Aug 2015 19:31:45 +0100
 
diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
index 2dc9954..85e2740 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
-@@ -49,22 +49,11 @@ Module.symvers
+@@ -50,22 +50,11 @@ Module.symvers
  /Module.markers
  
  #
@@ -28,3 +30,13 @@ Forwarded: not-needed
  # Generated include files
  #
  include/config
+@@ -106,3 +95,9 @@ all.config
+ 
+ # Kdevelop4
+ *.kdev4
++
++#
++# 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