* debian/changelog: Update.

* debian/rules.real: Use dh_prep instead of the deprecated dh_clean -k.

svn path=/dists/trunk/linux-2.6/; revision=12916

debian/changelog

@@ -19,6 +19,7 @@ linux-2.6 (2.6.29~rc5-1~experimental.1) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
   * Use external source directory for all builds.
+  * Use dh_prep.
 
   [ Martin Michlmayr ]
   * [mips/r4k-ip22] Build in RTC_DRV_DS1286.

debian/rules.real

@@ -150,7 +150,7 @@ install-doc: PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-doc: OUT_DIR = $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)
 install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-doc: $(STAMPS_DIR)/build-doc
-	dh_clean -d -k
+	dh_prep
 	mkdir -p $(OUT_DIR)
 	cp -a $(addprefix $(SOURCE_DIR)/, COPYING CREDITS MAINTAINERS README REPORTING-BUGS Documentation) $(OUT_DIR)
 	rm -rf $(OUT_DIR)/Documentation/DocBook
@@ -169,14 +169,14 @@ install-manual: PACKAGE_NAME = linux-manual-$(VERSION)
 install-manual: DIR=$(BUILD_DIR)/build-doc
 install-manual: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-manual: $(STAMPS_DIR)/build-doc
-	dh_clean -d -k
+	dh_prep
 	find $(DIR)/Documentation/DocBook/man/ -name '*.9' | xargs dh_installman
 	+$(MAKE_SELF) install-base
 
 install-dummy:
 	dh_testdir
 	dh_testroot
-	dh_clean -d -k
+	dh_prep
 	+$(MAKE_SELF) install-base
 
 install-headers_$(ARCH): PACKAGE_NAMES = linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)
@@ -195,7 +195,7 @@ install-headers_$(ARCH)_$(FEATURESET): DIR = debian/$(PACKAGE_NAME)/$(BASE_DIR)
 install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET)
 	dh_testdir
 	dh_testroot
-	dh_clean -k -d
+	dh_prep
 
 	cd $(SOURCE_DIR); \
 	( \
@@ -227,7 +227,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(PACKAGE_DIR)/$(BASE_DI
 install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 	dh_testdir
 	dh_testroot
-	dh_clean -k -d
+	dh_prep
 
 	mkdir -p $(DIR)/arch/$(KERNEL_ARCH)/kernel
 	cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include} $(DIR)
@@ -269,7 +269,7 @@ install-libc-dev_$(ARCH): OUT_DIR = debian/$(PACKAGE_NAME)/usr
 install-libc-dev_$(ARCH):
 	dh_testdir
 	dh_testroot
-	dh_clean -d -k
+	dh_prep
 	rm -rf '$(DIR)'
 	mkdir $(DIR)
 	+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(LIBC_DEV_ARCH)
@@ -283,7 +283,7 @@ install-support: PACKAGE_ROOT = /usr/src/$(PACKAGE_NAME)
 install-support:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -d
+	dh_prep
 	dh_installdirs $(PACKAGE_ROOT)/lib/python/debian_linux $(PACKAGE_ROOT)/modules
 	cp debian/config.defines.dump $(PACKAGE_DIR)$(PACKAGE_ROOT)
 	cp debian/lib/python/debian_linux/*.py $(PACKAGE_DIR)$(PACKAGE_ROOT)/lib/python/debian_linux
@@ -303,7 +303,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/build_$(AR
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain:
 	dh_testdir
 	dh_testroot
-	dh_clean -d -k
+	dh_prep
 	dh_installdirs 'boot'
 	+$(MAKE_SELF) \
 	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image \
@@ -400,7 +400,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug:
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape:
 	dh_testdir
 	dh_testroot
-	dh_clean -d -k
+	dh_prep
 	dh_installdirs 'boot'
 	install -m644 '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
 	+$(MAKE_SELF) install-base
@@ -411,7 +411,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: DH_OPTIONS =
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
 	dh_testdir
 	dh_testroot
-	dh_clean -d -k
+	dh_prep
 	dh_installdirs -p$(PACKAGE_NAME) boot 'var/lib/$(PACKAGE_NAME)'
 	dh_installdirs -p$(MODULES_PACKAGE_NAME) boot
 	cp '$(DIR)'/arch/$(KERNEL_ARCH)/boot/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
@@ -432,7 +432,7 @@ install-patch: DH_OPTIONS = -p$(PACKAGE)
 install-patch:
 	dh_testdir
 	dh_testroot
-	dh_clean -d -k $(DH_OPTIONS)
+	dh_prep
 	dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
 	dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian'
 	install debian/bin/patch.apply '$(pfull)/apply/debian'