From 55cf50555a83206dc3e3676a0e6daf00be218a4a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Aug 2015 18:07:21 +0200 Subject: [PATCH] Update .gitignore files based on svn:ignore properties For the top-level .gitignore, do this via the existing patch. --- debian/.gitignore | 13 +++++++++++++ debian/changelog | 4 ++++ debian/patches/debian/gitignore.patch | 14 +++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/debian/.gitignore b/debian/.gitignore index 29359e31f..9df6faf1e 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 711ce162c..4c67d15a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ linux (4.2~rc5-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate + [ Ben Hutchings ] + * Adjust for migration to git: + - Update .gitignore files + -- Ben Hutchings Tue, 04 Aug 2015 01:47:47 +0100 linux (4.1.3-1) unstable; urgency=medium diff --git a/debian/patches/debian/gitignore.patch b/debian/patches/debian/gitignore.patch index 2dc995449..85e2740ea 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 ++# ++/*