[Hardy linux-ubuntu-modules-2.6.24][PATCH 1/1] UBUNTU: SAUCE: Fix full name and address in changelog

[Luis Henriques]

This patch normalises the way full name and email address are obtained in
debian/rules for new changelog entries in target startnewrelease.

Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 debian/rules.d/1-maintainer.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index b3795dc..3724ca2 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -8,8 +8,6 @@ insertchanges:
 startnewrelease:
 	dh_testdir
 	@nextminor=$(shell expr `echo $(revision) | awk -F. '{print $$2}'` + 1); \
-	user=$(shell whoami); \
-	memyselfandirene="$$(getent passwd $$user | cut -d ":" -f 5 | cut -d "," -f 1)"; \
 	now="$(shell date -R)"; \
 	echo "Creating new changelog set for $(release)-$(abinum).$$nextminor..."; \
 	echo -e "linux-ubuntu-modules-$(release) ($(release)-$(abinum).$$nextminor) UNRELEASED; urgency=low\n" > debian/changelog.new; \
@@ -19,8 +17,7 @@ startnewrelease:
 		>> debian/changelog.new; \
 	echo "  CHANGELOG: Use the insertchanges target to create the final log." \
 		>> debian/changelog.new; \
-	echo -e "\n -- $$memyselfandirene <$$user at ubuntu.com>  $$now\n" >> \
-		debian/changelog.new ; \
+	echo -e "\n -- $$DEBFULLNAME <$$DEBEMAIL>  $$now\n" >>debian/changelog.new; \
 	cat debian/changelog >> debian/changelog.new; \
 	mv debian/changelog.new debian/changelog
 
-- 
1.7.9.5