[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 wheezy
in repository linux.

commit 74f129b8729f37a25435aac1f56a0ed485ae6eb6
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.2.
---
 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 1dc7c9e..1bc2594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -347,6 +347,8 @@ linux (3.2.70-1) UNRELEASED; urgency=medium
     - radeon: Do not directly dereference pointers to BIOS area.
   * Revert "ACPICA: Utilities: split IO address types from data type models."
     to avoid ABI change on i386
+  * Adjust for migration to git:
+    - Update .gitignore files
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 07 Aug 2015 19:47:24 +0100
 
diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch
index 2ffc788..00924e5 100644
--- a/debian/patches/debian/gitignore.patch
+++ b/debian/patches/debian/gitignore.patch
@@ -2,9 +2,11 @@ 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
-@@ -47,17 +47,6 @@
+@@ -46,17 +46,6 @@ modules.builtin
  /Module.symvers
  
  #
@@ -22,3 +24,13 @@ Subject: Tweak gitignore for Debian pkg-kernel using git svn.
  # Generated include files
  #
  include/config
+@@ -84,3 +73,9 @@ GTAGS
+ *.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