From 9511cd9f9831b1aa6aa35811a33700b245554fde Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sun, 5 Feb 2012 09:04:48 +0000
Subject: [PATCH] * debian/changelog: Update. * debian/rules.real: Remove
 unneeded scmversion workaround.

svn path=/dists/trunk/linux-2.6/; revision=18666
---
 debian/changelog  | 3 +++
 debian/rules.real | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 959faae90..4e819e90d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ linux-2.6 (3.2.4-1) UNRELEASED; urgency=low
   * PCI: Rework ASPM disable code (fixes power usage regression on some
     systems)
 
+  [ Bastian Blank ]
+  * Remove unneeded scmversion workaround.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 02 Feb 2012 03:18:04 +0000
 
 linux-2.6 (3.2.2-1) unstable; urgency=low
diff --git a/debian/rules.real b/debian/rules.real
index d6232aa57..726cd8ad4 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -82,8 +82,6 @@ $(STAMPS_DIR)/source:
 	mkdir -p '$(DIR)'
 	cp -al $(SOURCE_FILES) '$(DIR)'
 	$(patch_cmd)
-	# Suppress trailing '+' in utsrelease
-	touch '$(DIR)/.scmversion'
 	@$(stamp)
 
 $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source