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 9ae99ad50..d37bf31f7 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 Tue, 04 Aug 2015 19:31:45 +0100 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 ++# ++/*