[kernel] r22385 - in dists/sid/linux/debian: . patches patches/debian

[Ben Hutchings]

Author: benh
Date: Thu Feb 12 21:20:24 2015
New Revision: 22385

Log:
Revert "Try and avoid nuking people's debian dir"

The patched source is also used (via linux-source-<version>) for
building custom kernel packages, and 'make clean' definitely should
remove the debian directory there.

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/debian/no-clean.patch
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Thu Feb 12 21:16:56 2015	(r22384)
+++ dists/sid/linux/debian/changelog	Thu Feb 12 21:20:24 2015	(r22385)
@@ -2,7 +2,6 @@
 
   [ Ian Campbell ]
   * [armhf] Add DTB for Olimex A20-OLinuXino-LIME2. (Closes: #777455)
-  * Don't delete debian dir on make clean/mrproper/etc.
 
   [ Ben Hutchings ]
   * shm: add memfd.h to UAPI export list, so kdbus will build

Modified: dists/sid/linux/debian/patches/debian/no-clean.patch
==============================================================================
--- dists/sid/linux/debian/patches/debian/no-clean.patch	Thu Feb 12 21:16:56 2015	(r22384)
+++ dists/sid/linux/debian/patches/debian/no-clean.patch	Thu Feb 12 21:20:24 2015	(r22385)
@@ -1,19 +0,0 @@
-From: Ian Campbell <ijc at debian.org>
-Subject: Do not clean (remove) /debian/ dir
-Date: Tue, 10 Feb 2015 03:51:27 +0000
-Forwarded: not-needed
-
-When running "make clean" in the root of an actual Debian source package we
-don't want to remove the debian dir.
-
---- a/scripts/package/Makefile
-+++ b/scripts/package/Makefile
-@@ -90,8 +90,6 @@
- 	$(MAKE) KBUILD_SRC=
- 	$(call cmd,builddeb)
- 
--clean-dirs += $(objtree)/debian/
--
- 
- # tarball targets
- # ---------------------------------------------------------------------------

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Thu Feb 12 21:16:56 2015	(r22384)
+++ dists/sid/linux/debian/patches/series	Thu Feb 12 21:20:24 2015	(r22385)
@@ -6,7 +6,6 @@
 debian/mips-disable-werror.patch
 debian/arch-sh4-fix-uimage-build.patch
 debian/powerpcspe-omit-uimage.patch
-debian/no-clean.patch
 features/all/Kbuild-kconfig-Verbose-version-of-listnewconfig.patch
 
 # Fixes/improvements to firmware loading